Changeset 354 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

Timestamp:

Mar 1, 2013, 3:38:12 PM (11 years ago)

Author:

lemeur

Message:

complement dessin phase space + rationalisation

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc (modified) (4 diffs)

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

@@ -163 +163 @@
 bool softwareParmela::beamFromParmela(string workingDir,unsigned numeroParmel, double referencefrequency, vector<double>& centroid, bareParticle& refPart,vector<bareParticle>& particles ) 
 {
+
   string nomfilefais = workingDir + "parmdesz";
   cout << " nom fichier desz : " << nomfilefais << endl;
@@ -183 +184 @@
 
       if ( partic.ne == (int)numeroParmel ) {
-        faisceau.push_back(partic);
         if ( partic.np == 1 ) {
           // en principe on est sur la particule de reference
@@ -191 +191 @@
           }
           phaseRef = partic.phi;
-          TRIDVECTOR  posRef(partic.xx,partic.yy,0.0);
+
+          // le 'z' est 'absolu' (le long de la trajectoire)
+          TRIDVECTOR  posRef(partic.xx,partic.yy,partic.z);
           TRIDVECTOR betagammaRef(partic.xxp*partic.begamz, partic.yyp*partic.begamz, partic.begamz);
           refPart = bareParticle(posRef, betagammaRef);
@@ -200 +202 @@
             return false;
           }
-        }
+        } 
+        faisceau.push_back(partic); 
       }
     } //while