Changeset 366 in PSPA for Interface_Web

Timestamp:

Mar 5, 2013, 6:59:13 PM (11 years ago)

Author:

lemeur

Message:

amelioration des les graphiques d'espace de phase

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/particleBeam.h (modified) (2 diffs)
• controler/src/particleBeam.cc (modified) (6 diffs)
• userInterface/src/GWt_pspaApplication.cc (modified) (2 diffs)

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

@@ -46 +46 @@
   void remplissageDesHistogrammes(double val[2],vector<double>vshf,vector<double>&xcor,vector<int>& hist,int& cnts);
 
+  double getSigmaTransportij(unsigned indexI, unsigned indexJ);
+double getUnnormalizedTranspPhaseSpaceArea(unsigned TranspIndexAbs, unsigned TranspIndexOrd);
+
+inline double dimensionalFactorFromTransportToGraphics(unsigned index) {
+  if ( index == 0 || index == 2 || index == 4 ) return 10.;
+  else return  1.0;
+}
+
+ inline string transportVariableName(unsigned index) {
+  switch ( index ) {
+  case 0 : return  " x ";
+  case 1 : return  " x' ";
+  case 2 : return " y ";
+  case 3 : return " y' ";
+  case 4 : return " l ";
+  case 5 : return "dp/p";
+  default : { 
+    cout << " particleBeam::transportVariableName : coordinate index ERROR index :  "<< index << endl;
+    return "";
+  }
+  }
+ }
+
+ inline string graphicTransportUnitName(unsigned index) {
+  switch ( index ) {
+  case 0 : return  " mm ";
+  case 1 : return  " mrad ";
+  case 2 : return " mm ";
+  case 3 : return " mrad ";
+  case 4 : return " mm ";
+  case 5 : return " % ";
+  default : { 
+    cout << " particleBeam::transportVariableName : coordinate index ERROR index :  "<< index << endl;
+    return "";
+  }
+  }
+ }
+
  public:
 
@@ -55 +93 @@
   int getNbParticles() const;
   const beam2Moments&  getTransportMoments() const;
-  double getSigmaTransportij(unsigned i, unsigned j);
   double getUnnormalizedEmittanceX();
   double getP0Transport() const;

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

@@ -34 +34 @@
 }
 
-double particleBeam::getSigmaTransportij(unsigned i, unsigned j)  {
-  if ( i < 1 || i > 6 || j < 1 || j > 6 ) {
+double particleBeam::getSigmaTransportij(unsigned indexI, unsigned indexJ)  {
+  if (  indexI > 5 ||  indexJ > 5 ) {
     cerr << " particleBeam::getSigmaTransportij() indices out of range  " << endl;
     return 0.0;
@@ -43 +43 @@
     return 0.0;
   }
-
-  i--;
-  j--;
-  if ( j > i ) {
-    unsigned aux = i;
-    i = j;
-    j = aux;
-  }
-  return ( rij_.getMatrix().at(i) ).at(j);
-}
-
-double particleBeam::getUnnormalizedEmittanceX() 
-{
-  double r = getSigmaTransportij(2,1);
+ if ( indexI >= indexJ ) {
+   return ( rij_.getMatrix().at(indexI) ).at(indexJ);
+ } else {
+   return ( rij_.getMatrix().at(indexJ) ).at(indexI);
+ }
+  
+}
+
+double particleBeam::getUnnormalizedEmittanceX() {
+  double r = getSigmaTransportij(1,0);
   double rac = (1 - r*r);
   if ( rac <= 0.0 ) {
@@ -62 +58 @@
   }
   rac = sqrt(1 - r*r);
-  return  10.*getSigmaTransportij(1,1) * getSigmaTransportij(2,2) * rac; // en pi.mm.mrad
-}
+  return  dimensionalFactorFromTransportToGraphics(0)*getSigmaTransportij(0,0) * getSigmaTransportij(1,1) * rac; // en pi.mm.mrad
+}
+
+double particleBeam::getUnnormalizedTranspPhaseSpaceArea(unsigned TranspIndexAbs, unsigned TranspIndexOrd) {
+  if (  TranspIndexAbs == TranspIndexOrd ) return 0.0;
+  double r = getSigmaTransportij(TranspIndexAbs,TranspIndexOrd);
+  double rac = (1 - r*r);
+  if ( rac <= 0.0 ) {
+    return 0.0;
+  }
+  rac = sqrt(1 - r*r);
+  return  dimensionalFactorFromTransportToGraphics(TranspIndexAbs)*getSigmaTransportij(TranspIndexAbs,TranspIndexAbs) * 
+             dimensionalFactorFromTransportToGraphics(TranspIndexOrd)*getSigmaTransportij(TranspIndexOrd,TranspIndexOrd) * rac; // en pi.mm.mrad
+}
+
+
 
 double particleBeam::getP0Transport() const { 
@@ -375 +385 @@
   }
 }
+
 unsigned particleBeam::indexFromPspaToTransport(unsigned index) const {
   cout << " indexFromPspaToTransport entree : " << index << endl;
-  unsigned indexRetour;
   switch ( index ) {
-  case 0 : return  0; break; // x
-  case 1 : return  2; break; // y
-  case 2 : return  4; break; // z -> l
-  case 3 : return  1; break; // xp
-  case 4 : return  3; break; // yp
-  case 5 : return  5; break; // de/E
+  case 0 : return  0; // x
+  case 1 : return  2;  // y
+  case 2 : return  4; // z -> l
+  case 3 : return  1;  // xp
+  case 4 : return  3;  // yp
+  case 5 : return  5; // de/E
   default : { 
     cout << " particleBeam::indexFromPspaToTransport : coordinate index ERROR inital index :  "<< index << endl;
@@ -391 +401 @@
   }
 }
+
 
 void particleBeam::donneesDessinEllipse(vector<double>& xcor, vector<double>& ycor, vector<string>& legende, unsigned indexAbs, unsigned indexOrd) {
@@ -409 +420 @@
   indexOrd = indexFromPspaToTransport(indexOrd);
 
+
+  double dimensionalFactorX, dimensionalFactorY; // to mm, if necessary
+  dimensionalFactorX = dimensionalFactorFromTransportToGraphics(indexAbs);
+  dimensionalFactorY = dimensionalFactorFromTransportToGraphics(indexOrd);
+
+
   // a completer 
   legende.clear();
-  if ( indexAbs == 0 && indexOrd == 1 ) {
-    string namx = " x ";
-    string namy = " xp ";
-    string  emitt = mixedTools::doubleToString(getUnnormalizedEmittanceX());
-    string xmax = "x max= ";
-    string valXmax = mixedTools::doubleToString(10.0*getSigmaTransportij(1,1)); // mm
-    string ymax = "x' max= ";
-    string valYmax = mixedTools::doubleToString(getSigmaTransportij(2,2)); // mm
+  //  if ( indexAbs == 0 && indexOrd == 1 ) {
+    string namx = transportVariableName(indexAbs);
+    string namy = transportVariableName(indexOrd);
+    double em = getUnnormalizedTranspPhaseSpaceArea(indexAbs,indexOrd) ;
+    string  emitt = mixedTools::doubleToString(getUnnormalizedTranspPhaseSpaceArea(indexAbs,indexOrd));
+    string xmax = namx + "max= ";
+    string valXmax = mixedTools::doubleToString(dimensionalFactorX*getSigmaTransportij(indexAbs,indexAbs)); 
+    string ymax = namy + "max= ";
+    string valYmax = mixedTools::doubleToString(dimensionalFactorY*getSigmaTransportij(indexOrd,indexOrd)); // mm
     string correl = " correlation ";
-    string valCorrel = mixedTools::doubleToString(getSigmaTransportij(2,1));
-    string xunit = " mm";
-    string yunit = " mrad";
+    string valCorrel = mixedTools::doubleToString(getSigmaTransportij(1,0));
+    string xunit = graphicTransportUnitName(indexAbs);
+    string yunit = graphicTransportUnitName(indexOrd);
     legende.push_back( "emittance" + namx + "," + namy + ": " + emitt + " pi." + xunit + "." + yunit);
     legende.push_back( xmax + valXmax + xunit);
     legende.push_back( ymax + valYmax + yunit);
-  } else {
-    legende.push_back(" text of legend not yet programmed ");
-  }
+  // } else {
+  //   legende.push_back(" text of legend not yet programmed ");
+  // }
 
   cout << " index x" << indexAbs << " index y " << indexOrd << endl;
-
-  double xm = ( rij_.getMatrix().at(indexAbs) ).at(indexAbs);
-  double ym = ( rij_.getMatrix().at(indexOrd) ).at(indexOrd);
+  double xm = dimensionalFactorX*( rij_.getMatrix().at(indexAbs) ).at(indexAbs);
+  double ym = dimensionalFactorY*( rij_.getMatrix().at(indexOrd) ).at(indexOrd);
   double r;
   if ( indexOrd > indexAbs ) {

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -594 +594 @@
   ellipseDialog->show();
   new WText(nameOfCase_, ellipseDialog->contents());
-  // new WText(nameOfCase_ + " : emittance " + namex + " , " + namey + " : " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , ellipseDialog->contents());
-  // new WBreak(ellipseDialog->contents());
-  // new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", ellipseDialog->contents());
-  // new WBreak(ellipseDialog->contents());
-  // new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", ellipseDialog->contents());
-  // new WBreak(ellipseDialog->contents());
-  // new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", ellipseDialog->contents());
   
   vector<double> xcor;
@@ -836 +829 @@
   double out[3]= {0.0};
 
-  int iabs= choixVariableHisto_->currentIndex();  
+  unsigned iabs= choixVariableHisto_->currentIndex();  
   string xname= choixVariableHisto_->currentText().toUTF8();
   beam->histogramme(iabs,xcor,hist,cnts,out);