Changeset 417 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.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/softwareParmela.cc (modified) (5 diffs)

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

@@ -22 +22 @@
   cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
   abstractElement* elPtr = dataManager_->getElementPointerFromNumero(numeroDeb_);
+
   bool there_is_rfgun = ( elPtr->getNomdElement().getElementType() == RFgun );
   unsigned offsetNumElem;
@@ -262 +263 @@
   particles.clear();
   particles.resize(faisceau.size(), bareParticle());
-  double x,xp,y,yp;
+  //  double x,xp,y,yp;
+  double xp, yp;
   double betagammaz;
-  double betaz;
-  double deltaz;
+  //  double betaz;
+  double cdt;
   double dephas;
   double g;
@@ -273 +275 @@
   // sont donnes en radians
   for (unsigned k = 0; k < faisceau.size(); k++) {
-    x= faisceau.at(k).xx;
+    //    x= faisceau.at(k).xx;
     xp=faisceau.at(k).xxp;
-    y= faisceau.at(k).yy;
+    //    y= faisceau.at(k).yy;
     yp=faisceau.at(k).yyp;
     // dephasage par rapport a la reference
@@ -281 +283 @@
     g = faisceau.at(k).wz/EREST_MeV;
     betagammaz = faisceau.at(k).begamz;
-    betaz = betagammaz/(g+1.0);
-    deltaz = FACTEUR * betaz * dephas / referencefrequency;
-    x += xp * deltaz;
-    y += yp * deltaz;
-    pos.setComponents(x,y,deltaz);
+    //    betaz = betagammaz/(g+1.0);
+    //    deltaz = FACTEUR * betaz * dephas / referencefrequency;
+    cdt = FACTEUR * dephas / referencefrequency;
+    //    x += xp * deltaz;
+    //    y += yp * deltaz;
+    pos.setComponents(faisceau.at(k).xx,faisceau.at(k).yy,cdt);
     betagamma.setComponents(xp*betagammaz, yp*betagammaz, betagammaz);
     particles.at(k) = bareParticle(pos,betagamma);
@@ -311 +314 @@
     }
     
-    const vector<bareParticle>& partic = beam->getParticleVector();
+    //    const vector<bareParticle>& partic = beam->getParticleVector();
     double weight = 1.0;
     double xx,yy,zz;
     double begamx, begamy, begamz;
-    for (unsigned k = 0; k < partic.size(); k++) {
-        partic.at(k).getPosition().getComponents(xx,yy,zz);
-        partic.at(k).getBetaGamma().getComponents(begamx,begamy,begamz);
+    //    TRIDVECTOR pos, begam;
+    double zmin = GRAND;
+    double zmax = -zmin; 
+    double cdtmin, cdtmax;
+    beam->ZrangeCdt(cdtmin, cdtmax);
+    cout << " softwareParmela::beamToParmela cdtmin = " << cdtmin << " cdtmax = " << cdtmax << endl;
+  
+    for (unsigned k = 0; k < beam->getNbParticles(); k++) {
+        // partic.at(k).getPosition().getComponents(xx,yy,zz);
+        // partic.at(k).getBetaGamma().getComponents(begamx,begamy,begamz);
+      beam->coordonneesDeployees(k, -cdtmax).getComponents(xx,yy,zz);
+      beam->betaGamma(k).getComponents(begamx,begamy,begamz);
+      if ( zz > zmax) zmax = zz;
+      if ( zz < zmin ) zmin = zz;
         outfile << xx << " " << begamx << " " <<  yy << " " << begamy << " " << zz << " " << begamz  << " " << weight << endl;
     }
     outfile.close();
+    cout << " softwareParmela::beamToParmela zmn = " << zmin << " zmax = " << zmax << endl;
     return true;
 }