Changeset 381 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/particleBeam.h

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/include/particleBeam.h (modified) (3 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/particleBeam.h

@@ -49 +49 @@
 double getUnnormalizedTranspPhaseSpaceArea(unsigned TranspIndexAbs, unsigned TranspIndexOrd);
 
+
+ unsigned pspaCoorIndexFromString(string nameCoor) const;
+ unsigned transportCoorIndexFromString(string nameCoor) const;
+
 inline double dimensionalFactorFromTransportToGraphics(unsigned index) {
-  if ( index == 0 || index == 2 || index == 4 ) return 10.;
-  else return  1.0;
+  if ( index == 0 || index == 2 || index == 4 ) return 10.;   // mm
+  else return  1.0;  // mrad
 }
+
+
+
 
  inline string transportVariableName(unsigned index) {
@@ -68 +75 @@
   }
  }
+
+
+
 
  inline string graphicTransportUnitName(unsigned index) {
@@ -107 +117 @@
   void printAllXYZ() const;
   void Zrange(double& zmin, double& zmax) const;
-  //  void donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor);
-  void donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, unsigned indexAbs, unsigned indexOrd);
-  void particlesPhaseSpaceData(vector<double>& xcor, vector<double>& ycor, unsigned indexAbs, unsigned indexOrd);
+  void donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, string namex, string namey);
+  void particlesPhaseSpaceData(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, string namex, string namey);
   virtual string FileOutputFlow() const;
   virtual bool FileInput(ifstream& ifs);