Changeset 434 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc

Timestamp:

Nov 22, 2013, 9:57:54 AM (11 years ago)

Author:

lemeur

Message:

correction softwaregenerator

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc (modified) (5 diffs)

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

@@ -375 +375 @@
 void particleBeam::particlesPhaseSpaceComponent(vector<double>& coord, unsigned index) 
 {
+
   if ( !particleRepresentationOk_ ) return;
   
   coord.clear();
   coord.resize(relativePartic_.size(), 0.0 );
-  cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;
+  //  cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;
 
   if ( index <= 2 ) {
@@ -392 +393 @@
   
   if ( index >  2 && index < 5 ) {
-    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl;
+    //    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl;
     for (unsigned i = 0; i < relativePartic_.size(); ++i) {
       double begamz = relativePartic_.at(i).getBetaGamma().getComponent(2);
@@ -401 +402 @@
       }
     }
-    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl;
+    //    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl;
     return;
   }
@@ -727 +728 @@
     double gamma = relativePartic_.at(particleIndex).getGamma();
     //    TRIDVECTOR pos = relativePartic_.at(particleIndex).getPosition();
+    // cout << " ------------------ particleBeam::coordonneesDeployees ----- " << endl;
+    //   cout << " particleBeam::coordonneesDeployees " << relativePartic_.at(particleIndex).FileOutputFlow() << endl;
+    //   cout << " par reference x= " << relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0);
+    // cout << " ----------------------------------------------------- " << endl;
+
+
+
     double xx = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0);
     double yy = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(1);
@@ -733 +741 @@
     //    TRIDVECTOR begam= goodPartic_.at(particleIndex).getBetaGamma();
     double begamz = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(2);
-    double dz = begamz * cdt / gamma;
-    double xp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0)/begamz;
-    double yp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1)/begamz;
-    xx += xp * dz;
-    yy += yp * dz;    
-    return TRIDVECTOR(xx, yy, dz);
+    double fac = cdt / gamma;
+    //    double dz = begamz * fac;
+    xx += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0) * fac;
+    yy += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1) * fac;
+    return TRIDVECTOR(xx, yy, begamz * fac);
  }