Changeset 86 in PSPA for Interface_Web

Timestamp:

Nov 19, 2012, 5:47:08 PM (12 years ago)

Author:

lemeur

Message:

dessin ellipse transport

Location:

Interface_Web/trunk/pspaWT

Files:

• include/GWt_pspaApplication.h (modified) (1 diff)
• include/particleBeam.h (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (3 diffs)
• src/particleBeam.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -70 +70 @@
   void faireDessin();
 
+  void faireDessinTransport();
 
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -119 +119 @@
  void Zrange(double& zmin, double& zmax) const;
 
-
+ void donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor);
 
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -417 +417 @@
           {
             resul = dtmanage_->executeParmela( debut, fin);
-            faireDessin();
+                    faireDessin();
             addConsoleMessage(resul);
           }
@@ -423 +423 @@
           {
             resul = dtmanage_->executeTransport( debut, fin);
+            faireDessinTransport();
             addConsoleMessage(resul);
           }
@@ -521 +522 @@
 // }
 
+void PspaApplication::faireDessinTransport()
+{
+  WContainerWidget* toto = leDessin_;
+  toto->clear();
+  new WText("emittance transport", toto);
+
+  vector<double> xcor;
+  vector<double> ycor;
+  dtmanage_->getCurrentBeam().donneesDessinEllipseXxp(xcor,ycor);
+  int nbpts = xcor.size();
+  cout << " PspaApplication::faireDessinTransport() nbpts = " << nbpts << endl;
+  WStandardItemModel *model = new WStandardItemModel(nbpts, 2, toto);
+  for (int i = 0; i < nbpts; ++i) {
+    model->setData(i, 0, xcor.at(i));
+    model->setData(i, 1, ycor.at(i));
+  }
+
+  WCartesianChart *chart = new WCartesianChart(toto);
+  chart->setModel(model);        // set the model
+  chart->setXSeriesColumn(0);    // set the column that holds the X data
+  chart->setLegendEnabled(true); // enable the legend
+
+  chart->setType(ScatterPlot);   // set type to ScatterPlot
+
+  // Typically, for mathematical functions, you want the axes to cross
+  // at the 0 mark:
+   chart->axis(XAxis).setLocation(ZeroValue);
+   chart->axis(YAxis).setLocation(ZeroValue);
+
+  // Provide space for the X and Y axis and title. 
+  chart->setPlotAreaPadding(80, Left);
+  chart->setPlotAreaPadding(40, Top | Bottom);
+  // Add the curves
+  WDataSeries s(1, CurveSeries, Y1Axis);
+     chart->addSeries(s);
+
+  chart->resize(300, 300); // WPaintedWidget must be given explicit size
+
+}
+
+
+
+
 void PspaApplication::updateSelections()
 {

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -356 +356 @@
      momentRepresentationOk_ = true;
   }
+
+void particleBeam::donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor)
+{
+  if ( !momentRepresentationOk_ ) return;
+
+  xcor.clear();
+  ycor.clear();
+
+  double xm = ( rij_transportMoments_.at(0) ).at(0);
+  double ym = ( rij_transportMoments_.at(1) ).at(1);
+  double r  = ( rij_transportMoments_.at(1) ).at(0);
+
+  cout << " r= " << r << endl;
+
+  double rac = sqrt(1 - r*r);
+  double alpha = -r / rac;
+  double beta = xm / ( ym * rac);
+  double gamma = ym / ( xm * rac );
+  double epsil = xm * ym * rac;
+
+
+  int nbintv = 50;
+  double pas = 2.0 * xm / nbintv;
+  double fac1 = -1.0 / ( beta * beta);
+  double fac2 = epsil/beta;
+  double fac3 = -alpha/beta;
+  int k;
+  double x,y;
+  double aux;
+  for ( k=0; k < nbintv; k++)
+    {
+      x = -xm + k*pas;
+      aux = fac1 * x * x + fac2;
+      //     cout << " aux2= " << aux << endl;
+      if ( aux <= 0.0 )
+        {
+          aux = 0.0;
+        }
+      else aux = sqrt(aux);
+      
+      //        y = fac3*x;
+            y = fac3*x + aux;
+      xcor.push_back(x);
+      ycor.push_back(y);
+    }
+
+  for ( k=0; k < nbintv; k++)
+    {
+      x = xm - k*pas;
+      aux =  fac1 * x * x + fac2;
+      if ( aux <= 0.0 ) 
+        {
+          aux = 0.0;
+        }
+      else aux = sqrt(aux);
+      //   y = fac3*x;
+            y = fac3*x - aux;
+      xcor.push_back(x);
+      ycor.push_back(y);
+    }
+}