Changeset 417 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc

Timestamp:

Jun 10, 2013, 4:52:52 PM (11 years ago)

Author:

lemeur

Message:

mise a jour des manipulations de faisceau

File:

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

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

@@ -182 +182 @@
   //  passiveParticles.resize(nbProbPart, bareParticle());
   double x,y;
-  double deltaz;
-  double deltat;
+  //  double deltaz;
+  double cdeltat;
   TRIDVECTOR  pos;
   TRIDVECTOR betagamma;
@@ -207 +207 @@
     double gamma = sqrt(1.0 + betagamma.norm2());
 
-    // decalage temporel par rapport a la reference  
-    deltat = faisceau.at(k).clock - timeRef; // nanoseondes
-    double ds = CLIGHT_m_per_ns * deltat /gamma;
-    x += betaGammax * ds;  // en metres
-    y += betaGammay * ds;
+    // decalage temporel par rapport a la reference  ?
+    // on prend le faisceau sous la forme "a un instant donne"
+
+    //   deltat = faisceau.at(k).clock - timeRef; // nanoseondes
+    cdeltat = CLIGHT_m_per_ns * (faisceau.at(k).clock - timeRef); // metres
+    //    double ds = CLIGHT_m_per_ns * deltat /gamma;
+    //    x += betaGammax * ds;  // en metres
+    //    y += betaGammay * ds;
 
     // ici on neglige la difference entre gamma de la part. et gamma de la ref.
-    deltaz = (pzPartRel/EREST_eV) * CLIGHT_m_per_ns * deltat; // en metres
-
-    pos.setComponents(100.*x,100.*y,100.*deltaz);  // en cm
+    //    deltaz = (pzPartRel/EREST_eV) * CLIGHT_m_per_ns * deltat; // en metres
+
+    //    pos.setComponents(100.*x,100.*y,100.*deltaz);  // en cm
+    pos.setComponents(100.*x,100.*y,100.*cdeltat);  // en cm
     if ( faisceau.at(k).flag == -1 ) {
       particles.push_back(bareParticle(pos,betagamma));