Changeset 355 in PSPA for Interface_Web

Timestamp:

Mar 1, 2013, 9:10:43 PM (11 years ago)

Author:

lemeur

Message:

correction de correction de bug (beam2Moments::readFromTransportOutput)

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/dataManager.h (modified) (4 diffs)
• controler/src/beam2Moments.cc (modified) (1 diff)
• controler/src/dataManager.cc (modified) (2 diffs)
• controler/src/particleBeam.cc (modified) (1 diff)
• controler/src/softwareParmela.cc (modified) (1 diff)
• controler/src/softwareTransport.cc (modified) (2 diffs)
• userInterface/src/GWt_pspaApplication.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/sources/controler/include/dataManager.h

@@ -52 +52 @@
   trivaluedBool checkElementsForExec(nomDeLogiciel logiciel, unsigned indexDeb, unsigned indexFin, string& diagnostic);
   bool executeAll();
-  void donneesRmsEnveloppe(string type,unsigned int lineSize,vector<double>& xcor,vector<double>& ycor);
  
+   void donneesRmsEnveloppe(string type,vector<double>& xcor,vector<double>& ycor);
+
   /**
    Save a configuration file on the server
@@ -62 +63 @@
     
     bool restoreElements(string inputFileName);
+
+
     
     private :
     
 
-    void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);
+    //    void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);
     /* inline void setWorkingDir(string wd) { */
     /*     workingDir_ = wd; */
@@ -74 +77 @@
     globalParameters globParam_;
     particleBeam* currentBeam_;
+  PspaApplication* pspa_;
     
     vector<particleBeam> diagnosticBeam_;
@@ -81 +85 @@
     void removeFile(string nameOfFile);
     void clearSectionToExecute();
-
-  PspaApplication* pspa_;
+ 
   };
 #endif

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

@@ -79 +79 @@
 // suppose qu'on est bien positionné dans le stream (a revoir)
 void beam2Moments::readFromTransportOutput(stringstream& inp) {
-    string  bidString;
-    double bidon;
+  string bidString, bidString1, bidString2;
+  double bidon, bidon1, bidon2;
     
-    // 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;
+  // initialisation des moments
+  raz();
+  bool notFound = true;
+  string buf;
+  // sauter les eventuels 'VARY'
+  while ( notFound ) {
+    getline(inp, buf);
+    stringstream str(buf);        
+    if ( str >> bidon1 >>  bidString1 >>  bidon2 >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString2 )  {
+       notFound = false;
     }
-    //    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);
+  }
+  //     test = inp >> bidon >>  bidString >>  bidon >>  ( rij_secondOrderMoments_.at(0) ).at(0) >> bidString;
+  //   cout << " beam2Moments::readFromTransportOutput TEST= " << test << endl;
+  //  }
+  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(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(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);
     
 }

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

@@ -298 +298 @@
 }
 
-void dataManager::donneesRmsEnveloppe(string type,unsigned int numeroDeb,unsigned int numeroFin, vector<double>& xcor,vector<double>& ycor)
-{
-  unsigned k;
-  if ( numeroDeb < 1 ) numeroDeb = 1;
-  if ( numeroFin > diagnosticBeam_.size() ) numeroFin = diagnosticBeam_.size();
+// void dataManager::donneesRmsEnveloppe(string type,unsigned int numeroDeb,unsigned int numeroFin, vector<double>& xcor,vector<double>& ycor)
+// {
+//   unsigned k;
+//   if ( numeroDeb < 1 ) numeroDeb = 1;
+//   if ( numeroFin > diagnosticBeam_.size() ) numeroFin = diagnosticBeam_.size();
         
+//   double longueur = 0.0;
+//   double valeur = 0.0;
+//   xcor.clear();
+//   ycor.clear();
+//   if ( type == "x" )
+//     {
+//       for (k= numeroDeb; k <= numeroFin; k++)
+//         {
+//        if ( !diagnosticBeam_.at(k-1).momentRepresentationOk() ) diagnosticBeam_.at(k-1).buildMomentRepresentation();
+//        longueur += pspa_->getBeamLine()->getAbstractElement(k-1)->getLenghtOfElement();
+//        valeur = diagnosticBeam_.at(k-1).getXmaxRms();
+//        cout << " dataManager::donneesRmsEnveloppe longueur = " << longueur << " enveleloppe : " << valeur << endl;
+//        xcor.push_back(longueur);
+//        ycor.push_back(valeur);
+//         }
+//     }
+//   else
+//     {
+//       cerr << " dataManager::donneesRmsEnveloppe type " << type << " not programmed " << endl;
+//       return;
+//     }
+// }
+
+// on ne tient pas compte des elements "snapshot" presents dans la beamLine
+void dataManager::donneesRmsEnveloppe(string type,vector<double>& xcor,vector<double>& ycor)
+{
   double longueur = 0.0;
   double valeur = 0.0;
   xcor.clear();
   ycor.clear();
-  if ( type == "x" )
-    {
-      for (k= numeroDeb; k <= numeroFin; k++)
-        {
-          if ( !diagnosticBeam_.at(k-1).momentRepresentationOk() ) diagnosticBeam_.at(k-1).buildMomentRepresentation();
-          longueur += pspa_->getBeamLine()->getAbstractElement(k-1)->getLenghtOfElement();
-          valeur = diagnosticBeam_.at(k-1).getXmaxRms();
-          xcor.push_back(longueur);
-          ycor.push_back(valeur);
-        }
-    }
-  else
-    {
-      cerr << " dataManager::donneesRmsEnveloppe type " << type << " not programmed " << endl;
-      return;
-    }
-}
-
-// on ne tient pas compte des elements "snapshot" presents dans la beamLine
-void dataManager::donneesRmsEnveloppe(string type,unsigned int lineSize,vector<double>& xcor,vector<double>& ycor)
-{
-  double longueur = 0.0;
-  double valeur = 0.0;
-  xcor.clear();
-  ycor.clear();
 
   if ( type == "x" ) {
     unsigned i = 0;
-    for (unsigned k = 0; k < lineSize; k++) {
+    cout << " dataManager::donneesRmsEnveloppe BeamLineSize = " << getBeamLineSize() << endl;
+    for (unsigned k = 0; k < getBeamLineSize(); k++) {
       abstractElement* elPtr = pspa_->getBeamLine()->getAbstractElement(k);
       if(elPtr->getNomdElement().getElementType() == snapshot) continue;
@@ -347 +349 @@
       longueur += elPtr->getLenghtOfElement();
       valeur = diagnosticBeam_.at(i).getXmaxRms();
+      cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveleloppe : " << valeur << endl;
       xcor.push_back(longueur);
       ycor.push_back(valeur);

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

@@ -333 +333 @@
 }
 
-// void particleBeam::donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor) {
-//   int k;
-//   double x,y;
-
-//   if ( !momentRepresentationOk_ ) return;
-
-//   xcor.clear();
-//   ycor.clear();
-
-//   double xm = ( rij_.getMatrix().at(0) ).at(0);
-//   double ym = ( rij_.getMatrix().at(1) ).at(1);
-//   double r  = ( rij_.getMatrix().at(1) ).at(0);
-
-//   cout <<  " racs11= " << xm << " racs22= " << ym << " r12= " << r << endl;
-
-
-//   int nbintv = 50;
-//   if ( xm == 0.0 ) return;
-//   double pas = 2.0 * xm / nbintv;
-
-//   //  cout << " r= " << r << endl;
-//   double rac = (1 - r*r);
-//   if ( rac > 0.0 ) 
-//     {
-//       cout << " cas rac > " << endl;
-//       rac = sqrt(1 - r*r);
-//       double alpha = -r / rac;
-//       double beta = xm / ( ym * rac);
-//       //  double gamma = ym / ( xm * rac );
-//       double epsil = xm * ym * rac;
-//       double fac1 = -1.0 / ( beta * beta);
-//       double fac2 = epsil/beta;
-//       double fac3 = -alpha/beta;
-//       double aux;
-//       for ( k=0; k < nbintv; k++)
-//      {
-//        x = -xm + k*pas;
-//        aux = fac1 * x * x + fac2;
-//        //     cout << " aux2= " << aux << endl;
-//        if ( aux <= 0.0 )
-//          {
-//            aux = 0.0;
-//          }
-//        else aux = sqrt(aux);
-      
-//        //        y = fac3*x;
-//        y = fac3*x + aux;
-//        xcor.push_back(x);
-//        ycor.push_back(y);
-//      }
-
-//       for ( k=0; k <= nbintv; k++)
-//      {
-//        x = xm - k*pas;
-//        aux =  fac1 * x * x + fac2;
-//        if ( aux <= 0.0 ) 
-//          {
-//            aux = 0.0;
-//          }
-//        else aux = sqrt(aux);
-//        //   y = fac3*x;
-//        y = fac3*x - aux;
-//        xcor.push_back(x);
-//        ycor.push_back(y);
-//      }
-//     }
-//   else
-//     // cas degenere
-//     {
-//       cout << " cas degenere " << endl;
-//       double fac = ym/xm;
-//       for ( k=0; k < nbintv; k++)
-//      {
-//        x = -xm + k*pas;
-//        y = fac*x;
-//        xcor.push_back(x);
-//        ycor.push_back(y);
-//      }
-        
-//     }
-// }
 
 void particleBeam::particlesPhaseSpaceData(vector<double>& xcor, vector<double>& ycor, unsigned indexAbs, unsigned indexOrd) {

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

@@ -135 +135 @@
       // sinon c'est un element de parmela d'index id
       beams.push_back(particleBeam());
+      cout << " creation diagn. no " << beams.size() << " par PARMELA " << endl;
       vector<double> centroid;
       bareParticle refPart;

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

@@ -157 +157 @@
 
       beams.push_back(particleBeam());
+      cout << " creation diagn. no " << beams.size() << " par TRANSPORT " << endl;
       string elemLabel = ptr->getLabel();
       beam2Moments transpMoments;
@@ -166 +167 @@
           result = false;
           break;
-        }
+        } 
       beams.back().set2Moments(transpMoments);
     }

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -542 +542 @@
   envDialog->show();
       
-  unsigned nbel = dtmanage_->getBeamLineSize();
+  //  unsigned nbel = dtmanage_->getBeamLineSize();
   vector<double> xcor;
   vector<double> ycor;
-  //dtmanage_->donneesRmsEnveloppe(type,1, nbel, xcor,ycor);
-  dtmanage_->donneesRmsEnveloppe(type,nbel,xcor,ycor);
-  //    scatterPlot1D(envDialog->contents(),xcor,ycor);  
+  // dtmanage_->donneesRmsEnveloppe(type,1, nbel, xcor,ycor);
+    dtmanage_->donneesRmsEnveloppe(type,xcor,ycor);
 chartPlot2vec(envDialog->contents(), xcor, ycor, false);
 }
-
-// void PspaApplication::setModelComponentForPhaseSpace(WStandardItemModel* model, vector<bareParticle>& partic, unsigned indexParticleComponent, unsigned modelComponent) {
-//   double valeur;
-//   if ( indexParticleComponent > 5  ) return;
-
-//   if ( indexParticleComponent <= 2 ) {
-//     for (unsigned i = 0; i < partic.size(); ++i) {
-//       valeur = partic.at(i).getPosition().getComponent(indexParticleComponent);
-//       model->setData(i, modelComponent, valeur);
-//     }
-//   } else {
-//     if ( indexParticleComponent == 5 ) {
-//       cout << " PspaApplication::faireDessinParmela : deltap non programme " << endl;
-//       return;
-//     } else {
-//       for (unsigned i = 0; i < partic.size(); ++i) {
-//      double begamz = partic.at(i).getBetaGamma().getComponent(2);
-//      if ( begamz != 0.0) {
-//        valeur = 1.e3*partic.at(i).getBetaGamma().getComponent(indexParticleComponent-3)/begamz;
-//      } else {
-//        valeur = 0.0;
-//      }
-//      model->setData(i, modelComponent, valeur);
-//       }
-//     }
-//   }
-// }
 
 void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam, unsigned indexAbs, unsigned indexOrd, string namex, string namey )