Changeset 348 in PSPA

Timestamp:

Feb 27, 2013, 4:05:41 PM (11 years ago)

Author:

garnier

Message:

beam2moments. Bug fix sur une boucle infinie, introduite par laurent le 26 février

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• sources/controler/src/beam2Moments.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/History

@@ -5 +5 @@
      PSPA - Plateforme de simulation en physique des accélérateurs
      =========================================================
+
+27 février 2013 Laurent Garnier
+- beam2moments. Bug fix sur une boucle infinie, introduite par laurent le 26 février
 
 26 février 2013 Laurent Garnier

Interface_Web/trunk/pspaWT/sources/controler/src/beam2Moments.cc

@@ -4 +4 @@
 
 beam2Moments::beam2Moments() {
-  initializeMoments();
+    initializeMoments();
 }
 
@@ -10 +10 @@
 
 beam2Moments::beam2Moments( beam2Moments& tm) {
-  rij_secondOrderMoments_ = tm.rij_secondOrderMoments_;
+    rij_secondOrderMoments_ = tm.rij_secondOrderMoments_;
 }
 
 beam2Moments::beam2Moments( const beam2Moments& tm) {
-  rij_secondOrderMoments_ = tm.rij_secondOrderMoments_;
+    rij_secondOrderMoments_ = tm.rij_secondOrderMoments_;
 }
 
 beam2Moments::beam2Moments(double x, double xp, double y, double yp, double dl, double del) {
-  initializeMoments();
-  ( rij_secondOrderMoments_.at(0) ).at(0) = x;
-  ( rij_secondOrderMoments_.at(1) ).at(1) = xp;
-  ( rij_secondOrderMoments_.at(2) ).at(2) = y;
-  ( rij_secondOrderMoments_.at(3) ).at(3) = yp;
-  ( rij_secondOrderMoments_.at(4) ).at(4) = dl;
-  ( rij_secondOrderMoments_.at(5) ).at(5) = del;
-
+    initializeMoments();
+    ( rij_secondOrderMoments_.at(0) ).at(0) = x;
+    ( rij_secondOrderMoments_.at(1) ).at(1) = xp;
+    ( rij_secondOrderMoments_.at(2) ).at(2) = y;
+    ( rij_secondOrderMoments_.at(3) ).at(3) = yp;
+    ( rij_secondOrderMoments_.at(4) ).at(4) = dl;
+    ( rij_secondOrderMoments_.at(5) ).at(5) = del;
+    
 }
 
 void beam2Moments::initializeMoments() {
-  rij_secondOrderMoments_.clear();
-  rij_secondOrderMoments_.resize(6);
-  unsigned dim=0;
-  unsigned k;
-  for ( k=0; k < 6; k++){
-    rij_secondOrderMoments_.at(k).resize(++dim, 0.0); 
-  }
+    rij_secondOrderMoments_.clear();
+    rij_secondOrderMoments_.resize(6);
+    unsigned dim=0;
+    unsigned k;
+    for ( k=0; k < 6; k++){
+        rij_secondOrderMoments_.at(k).resize(++dim, 0.0);
+    }
 }
 
 
- // const vector< vector<double> >& transportMoments::getMoments() const
- // {
- //   return rij_transportMoments_;
- // }
+// const vector< vector<double> >& transportMoments::getMoments() const
+// {
+//   return rij_transportMoments_;
+// }
 
- vector< vector<double> >& beam2Moments::getMatrix() 
- {
-   return rij_secondOrderMoments_;
- }
+vector< vector<double> >& beam2Moments::getMatrix()
+{
+    return rij_secondOrderMoments_;
+}
 
 
 void beam2Moments::impression() const {
-  unsigned j,m;
-  cout << " impression des moments " << endl;
-  for ( j = 0; j < 6; j++)
+    unsigned j,m;
+    cout << " impression des moments " << endl;
+    for ( j = 0; j < 6; j++)
     {
-      for (m=0; m <= j; m++) 
-        {
-          cout  << ( rij_secondOrderMoments_.at(j) ).at(m) << " ";
-        }
-      cout << endl;
+        for (m=0; m <= j; m++)
+        {
+            cout  << ( rij_secondOrderMoments_.at(j) ).at(m) << " ";
+        }
+        cout << endl;
     }
 }
 
 void beam2Moments::raz() {
-  // initialisation des moments
-  unsigned j,m;
-  for ( j = 0; j < rij_secondOrderMoments_.size(); j++)
+    // initialisation des moments
+    unsigned j,m;
+    for ( j = 0; j < rij_secondOrderMoments_.size(); j++)
     {
-      for (m=0; m <= j; m++) 
-        {
-          ( rij_secondOrderMoments_.at(j) ).at(m) = 0.0; // element r_jm
-        }
+        for (m=0; m <= j; m++)
+        {
+            ( rij_secondOrderMoments_.at(j) ).at(m) = 0.0; // element r_jm
+        }
     }
 }
@@ -79 +79 @@
 // suppose qu'on est bien positionné dans le stream (a revoir)
 void beam2Moments::readFromTransportOutput(stringstream& inp) {
-  string  bidString;
-  double bidon;
-
-  // initialisation des moments
-  raz();
-  bool test = false;
-  string buf;
-  // sauter les eventuels 'VARY'
-  while ( !test ) {
-    getline(inp, buf);
-    stringstream str(buf);
-      if (!(str >> bidon >>  bidString >>  bidon >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString)) {
-          test = false;
-      }
-    cout << " beam2Moments::readFromTransportOutput TEST= " << test << endl;
-  }
-  //    test = inp >> bidon >>  bidString >>  bidon >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString;
+    string  bidString;
+    double bidon;
+    
+    // initialisation des moments
+    raz();
+    bool test = false;
+    string buf;
+    // sauter les eventuels 'VARY'
+    while ( !test ) {
+        getline(inp, buf);
+        stringstream str(buf);
+        
+        if (!(str >> bidon >>  bidString >>  bidon >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString)) {
+            test = true;
+        }
+        
+        cout << " beam2Moments::readFromTransportOutput TEST= " << test << endl;
+    }
+    //    test = inp >> bidon >>  bidString >>  bidon >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString;
     // }
-  inp >> bidon >> ( rij_secondOrderMoments_.at(1) ).at(1) >>  bidString >> ( rij_secondOrderMoments_.at(1) ).at(0);
-  inp >> bidon >> ( rij_secondOrderMoments_.at(2) ).at(2) >>  bidString >> ( rij_secondOrderMoments_.at(2) ).at(0)  >> ( rij_secondOrderMoments_.at(2) ).at(1);
-  inp >> bidon >> ( rij_secondOrderMoments_.at(3) ).at(3) >>  bidString >> ( rij_secondOrderMoments_.at(3) ).at(0)  >> ( rij_secondOrderMoments_.at(3) ).at(1) >> ( rij_secondOrderMoments_.at(3) ).at(2);
-
-  inp >> bidon >> ( rij_secondOrderMoments_.at(4) ).at(4) >>  bidString >> ( rij_secondOrderMoments_.at(4) ).at(0)  >> ( rij_secondOrderMoments_.at(4) ).at(1) >> ( rij_secondOrderMoments_.at(4) ).at(2) >> ( rij_secondOrderMoments_.at(4) ).at(3);
-
-  inp >> bidon >> ( rij_secondOrderMoments_.at(5) ).at(5) >>  bidString >> ( rij_secondOrderMoments_.at(5) ).at(0)  >> ( rij_secondOrderMoments_.at(5) ).at(1) >> ( rij_secondOrderMoments_.at(5) ).at(2) >> ( rij_secondOrderMoments_.at(5) ).at(3) >> ( rij_secondOrderMoments_.at(5) ).at(4);
-
+    inp >> bidon >> ( rij_secondOrderMoments_.at(1) ).at(1) >>  bidString >> ( rij_secondOrderMoments_.at(1) ).at(0);
+    inp >> bidon >> ( rij_secondOrderMoments_.at(2) ).at(2) >>  bidString >> ( rij_secondOrderMoments_.at(2) ).at(0)  >> ( rij_secondOrderMoments_.at(2) ).at(1);
+    inp >> bidon >> ( rij_secondOrderMoments_.at(3) ).at(3) >>  bidString >> ( rij_secondOrderMoments_.at(3) ).at(0)  >> ( rij_secondOrderMoments_.at(3) ).at(1) >> ( rij_secondOrderMoments_.at(3) ).at(2);
+    
+    inp >> bidon >> ( rij_secondOrderMoments_.at(4) ).at(4) >>  bidString >> ( rij_secondOrderMoments_.at(4) ).at(0)  >> ( rij_secondOrderMoments_.at(4) ).at(1) >> ( rij_secondOrderMoments_.at(4) ).at(2) >> ( rij_secondOrderMoments_.at(4) ).at(3);
+    
+    inp >> bidon >> ( rij_secondOrderMoments_.at(5) ).at(5) >>  bidString >> ( rij_secondOrderMoments_.at(5) ).at(0)  >> ( rij_secondOrderMoments_.at(5) ).at(1) >> ( rij_secondOrderMoments_.at(5) ).at(2) >> ( rij_secondOrderMoments_.at(5) ).at(3) >> ( rij_secondOrderMoments_.at(5) ).at(4);
+    
 }
 
 
 string beam2Moments::writeToTransportInput(double P0) const {
-  ostringstream sortie;
-   sortie << " BEAM, X=" << (rij_secondOrderMoments_.at(0)).at(0) << ", XP="<< (rij_secondOrderMoments_.at(1)).at(1) << ", Y=" << (rij_secondOrderMoments_.at(2)).at(2)<< ", YP=" << (rij_secondOrderMoments_.at(3)).at(3) << ", & " << endl;
-
-   sortie << " DL=" << (rij_secondOrderMoments_.at(4)).at(4) << ", DEL="<< (rij_secondOrderMoments_.at(5)).at(5) << ", P0=" << P0 << " ; " << endl;
-
-   sortie << " CORR, C21=" << (rij_secondOrderMoments_.at(1)).at(0) << ", C31="<< (rij_secondOrderMoments_.at(2)).at(0) << ", C32=" << (rij_secondOrderMoments_.at(2)).at(1) << ", & " << endl;
-
-   sortie << " C41=" << (rij_secondOrderMoments_.at(3)).at(0) << ", C42="<< (rij_secondOrderMoments_.at(3)).at(1) << ", C43=" << (rij_secondOrderMoments_.at(3)).at(2) << ", C51=" << (rij_secondOrderMoments_.at(4)).at(0) << ", & " << endl;
-
-   sortie << " C52=" << (rij_secondOrderMoments_.at(4)).at(1) << ", C53="<< (rij_secondOrderMoments_.at(4)).at(2) << ", C54=" << (rij_secondOrderMoments_.at(4)).at(3) << ", C61=" << (rij_secondOrderMoments_.at(5)).at(0) << ", & " << endl;
-
-   sortie << " C62=" << (rij_secondOrderMoments_.at(5)).at(1) << ", C63="<< (rij_secondOrderMoments_.at(5)).at(2) << ", C64=" << (rij_secondOrderMoments_.at(5)).at(3) << ", C65=" << (rij_secondOrderMoments_.at(5)).at(4) << " ; " << endl;
+    ostringstream sortie;
+    sortie << " BEAM, X=" << (rij_secondOrderMoments_.at(0)).at(0) << ", XP="<< (rij_secondOrderMoments_.at(1)).at(1) << ", Y=" << (rij_secondOrderMoments_.at(2)).at(2)<< ", YP=" << (rij_secondOrderMoments_.at(3)).at(3) << ", & " << endl;
+    
+    sortie << " DL=" << (rij_secondOrderMoments_.at(4)).at(4) << ", DEL="<< (rij_secondOrderMoments_.at(5)).at(5) << ", P0=" << P0 << " ; " << endl;
+    
+    sortie << " CORR, C21=" << (rij_secondOrderMoments_.at(1)).at(0) << ", C31="<< (rij_secondOrderMoments_.at(2)).at(0) << ", C32=" << (rij_secondOrderMoments_.at(2)).at(1) << ", & " << endl;
+    
+    sortie << " C41=" << (rij_secondOrderMoments_.at(3)).at(0) << ", C42="<< (rij_secondOrderMoments_.at(3)).at(1) << ", C43=" << (rij_secondOrderMoments_.at(3)).at(2) << ", C51=" << (rij_secondOrderMoments_.at(4)).at(0) << ", & " << endl;
+    
+    sortie << " C52=" << (rij_secondOrderMoments_.at(4)).at(1) << ", C53="<< (rij_secondOrderMoments_.at(4)).at(2) << ", C54=" << (rij_secondOrderMoments_.at(4)).at(3) << ", C61=" << (rij_secondOrderMoments_.at(5)).at(0) << ", & " << endl;
+    
+    sortie << " C62=" << (rij_secondOrderMoments_.at(5)).at(1) << ", C63="<< (rij_secondOrderMoments_.at(5)).at(2) << ", C64=" << (rij_secondOrderMoments_.at(5)).at(3) << ", C65=" << (rij_secondOrderMoments_.at(5)).at(4) << " ; " << endl;
     return sortie.str();
 }
 
 beam2Moments& beam2Moments::operator= (const beam2Moments& tpm) {
-  rij_secondOrderMoments_ = tpm.rij_secondOrderMoments_;
-  return *this;
+    rij_secondOrderMoments_ = tpm.rij_secondOrderMoments_;
+    return *this;
 }