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

Timestamp:

Mar 9, 2013, 5:12:55 PM (11 years ago)

Author:

lemeur

Message:

complements graphiques, legendes et unification unites

File:

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

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

@@ -345 +345 @@
 
 
-void particleBeam::particlesPhaseSpaceData(vector<double>& xcor, vector<double>& ycor, unsigned indexAbs, unsigned indexOrd) {
+void particleBeam::particlesPhaseSpaceData(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, string namex, string namey) {
+
+  unsigned indexAbs, indexOrd;
+  indexAbs = pspaCoorIndexFromString(namex);
+  indexOrd = pspaCoorIndexFromString(namey);
+ 
   particlesPhaseSpaceComponent(xcor, indexAbs);
   particlesPhaseSpaceComponent(ycor, indexOrd);
+  legende.clear();
+    legende.push_back( "phase space " + namex + "," + namey);
+    legende.push_back( "particle number : " +   mixedTools::intToString(getNbParticles()));
 }
 
@@ -360 +368 @@
   if ( index <= 2 ) {
     for (unsigned i = 0; i < goodPartic_.size(); ++i) {
-      coord.at(i) =  goodPartic_.at(i).getPosition().getComponent(index);
+      coord.at(i) =  10.*goodPartic_.at(i).getPosition().getComponent(index);  // en mm
     }
     return;
@@ -369 +377 @@
       double begamz = goodPartic_.at(i).getBetaGamma().getComponent(2);
       if ( begamz != 0.0) {
-        coord.at(i) =  1000.*goodPartic_.at(i).getBetaGamma().getComponent(index - 3)/begamz; // mimmiradians
+        coord.at(i) =  1000.*goodPartic_.at(i).getBetaGamma().getComponent(index - 3)/begamz; // milliradians
       } else {
         coord.at(i) = 0.0;
@@ -403 +411 @@
 }
 
-
-void particleBeam::donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, unsigned indexAbs, unsigned indexOrd) {
+unsigned particleBeam::pspaCoorIndexFromString(string nameCoor) const {
+  if ( nameCoor == "x" ) {
+    return 0;
+  } else if ( nameCoor == "y" ) {
+    return 1;
+  } else if ( nameCoor == "dz" ) {
+    return 2;
+  } else if ( nameCoor == "xp" ) {
+    return 3;
+  } else if ( nameCoor == "yp" ) {
+    return 4;
+  } else if ( nameCoor == "dE/E" ) {
+    return 5;
+  } else {
+    return 99;
+  }
+}
+
+unsigned particleBeam::transportCoorIndexFromString(string nameCoor) const {
+  if ( nameCoor == "x" ) {
+    return 0;
+  } else if ( nameCoor == "y" ) {
+    return 2;
+  } else if ( nameCoor == "dz" ) {
+    return 4;
+  } else if ( nameCoor == "xp" ) {
+    return 1;
+  } else if ( nameCoor == "yp" ) {
+    return 3;
+  } else if ( nameCoor == "dE/E" ) {
+    return 5;
+  } else {
+    return 99;
+  }
+}
+
+//void particleBeam::donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, unsigned indexAbs, unsigned indexOrd) {
+
+void particleBeam::donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, string namex, string namey) {
   int k;
   double x,y;
-  cout << " particleBeam::donneesDessinEllipse index recus x" << indexAbs << " index y " << indexOrd << endl;
-
-  if ( !momentRepresentationOk_ ) return;
-
-  if ( indexAbs > 5 || indexOrd > 5 ) return;
+  if ( !momentRepresentationOk_ ) buildMomentRepresentation();
+
+  //  if ( !momentRepresentationOk_ ) return;
+
+  unsigned indexAbs, indexOrd;
+
+
+  // index TRANSPORT
+  indexAbs = transportCoorIndexFromString(namex);
+  indexOrd = transportCoorIndexFromString(namey);
+  cout << " namex= " << namex << " indexAbs= " << indexAbs << " namey= " << namey << " indexOrd= " << indexOrd << endl; 
+    if ( indexAbs > 5 || indexOrd > 5 ) return;
 
   xcor.clear();
   ycor.clear();
-  // les index sont dans l'ordre x,y,z,xp,yp, de/E
-  // on traduit en TRANSPORT
-
-  indexAbs = indexFromPspaToTransport(indexAbs);
-  indexOrd = indexFromPspaToTransport(indexOrd);
+
 
 
@@ -427 +475 @@
 
 
-  // a completer 
+
   legende.clear();
   //  if ( indexAbs == 0 && indexOrd == 1 ) {