Changeset 356 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

Timestamp:

Mar 2, 2013, 7:54:38 PM (11 years ago)

Author:

lemeur

Message:

bugs dans les dessins

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc (modified) (4 diffs)

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

@@ -502 +502 @@
     {
       if ( !beam->momentRepresentationOk() ) beam->buildMomentRepresentation();
+      cout << " PspaApplication::dessinerPhaseSpace cood cliquees " << xabs << " " << yord << endl;
       faireDessinTransport(toto_, beam, xabs, yord, nameAbs, nameOrd );
     }
@@ -582 +583 @@
   ellipseDialog->setClosable(true);
   ellipseDialog->show();
-    
-  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());
+  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;
   vector<double> ycor;
-  beam->donneesDessinEllipse(xcor,ycor,indexAbs, indexOrd);
+  vector<string> legende;
+  beam->donneesDessinEllipse(xcor,ycor,legende, indexAbs, indexOrd);
+  unsigned k;
+  for (int k=0 ; k < legende.size(); k++) {
+  new WBreak(ellipseDialog->contents());
+    new WText(legende.at(k), ellipseDialog->contents());
+  }
   //  beam->donneesDessinEllipseXxp(xcor,ycor);
   //  scatterPlot1D(ellipseDialog->contents(),xcor,ycor);  
@@ -863 +870 @@
   new WText(" mean : "+ mixedTools::doubleToString(out[1])+" MeV",w);
   new WBreak(w);
-  new WText(" rms : "+ mixedTools::doubleToString(out[2])+" KeV",w);
+  new WText(" sigma rms : "+ mixedTools::doubleToString(out[2])+" KeV",w);
   
   WCartesianChart *chart = new WCartesianChart(w);
-  chart->setTitle("Histogram of particle energies");
+  chart->setTitle("Histogram of kinetic energy");
   chart->setModel(model);        // set the model
   chart->setXSeriesColumn(0);    // set the column that holds the categories
@@ -881 +888 @@
   axis.setLabelFormat("%.3f");
   axis.setGridLinesEnabled(true);
-  axis.setTitle(WString("legende x"));
+  axis.setTitle(WString(" dEcin/Ecin (%)"));
 
   chart->axis(Y1Axis).setGridLinesEnabled(true);