Changeset 355 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

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

Author:

lemeur

Message:

correction de correction de bug (beam2Moments::readFromTransportOutput)

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (2 diffs)

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);