Changeset 224 in PSPA

Timestamp:

Dec 21, 2012, 5:30:31 PM (12 years ago)

Author:

touze

Message:

embryon d'histo... à completer

Location:

Interface_Web/trunk/pspaWT

Files:

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

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -92 +92 @@
  bool removeExtensionFromConfigName(string& config);
 
+ void dessinerHistogramme();
+
  public :
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -110 +110 @@
   virtual bool FileInput(ifstream& ifs);
 
-
+  void histogramme(vector<double>&xcor,vector<int>& hist,int& cnts);
 };
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -246 +246 @@
   dessin->addWidget(okEnv);
  okEnv->clicked().connect(this, &PspaApplication::dessinerEnveloppe);
+
+ /////////////////////////////////////////////////////////////////////
+ dessin->addWidget(new WText(" histogramme :  "));
+ WPushButton* okHisto = new WPushButton("histogramme");
+ dessin->addWidget(okHisto);
+ okHisto->clicked().connect(this,&PspaApplication::dessinerHistogramme);
+ /////////////////////////////////////////////////////////////////////
 
   toto_ = new WContainerWidget();
@@ -905 +912 @@
     return test;
 }
+
+/////////////////////////
+//   c'est un embryon d'histogramme
+
+void PspaApplication::dessinerHistogramme()
+{
+  // pour mon test : histo en energie
+  toto_->clear();
+
+  GWt_dialog* pourVoir= new GWt_dialog("histogramme",toto_,false);
+  pourVoir->setMinimumSize(400,400);
+  pourVoir->setClosable(true);
+  pourVoir->show();
+
+
+  particleBeam* beam = dtmanage_->getDiagnosticBeam(1);
+  vector<double> xcor;
+  vector<int> hist;
+  int cnts;
+  beam->histogramme(xcor,hist,cnts);
+
+  cout<<"xcor.size()= "<<xcor.size()<<", hist.size()= "<<hist.size()<<endl;
+
+  //////////////////////////////////////////////////////////////////////////////////
+
+  WContainerWidget *w = toto_;
+  int nbpts= xcor.size()+cnts+1;
+  WStandardItemModel *model = new WStandardItemModel(nbpts,2,w);
+  model->setHeaderData(1, WString("energie"));
+
+  int j= 0;
+  if(hist[0] > 0) {
+    model->setData(j,0,xcor[0]);
+    model->setData(j,1,hist[0]);
+    j++;
+  } 
+  model->setData(j,0,xcor[0]);
+  model->setData(j,1,hist[0]);
+  j++;
+  for (int i = 1; i < nbpts; ++i) {
+    if(hist[i] == 0) {
+      if(hist[i-1] > 0) {
+        model->setData(j,0,xcor[i]);
+        model->setData(j,1,hist[i-1]);
+        j++;
+      }
+      model->setData(j,0,xcor[i]);
+      model->setData(j,1,hist[i]);
+      j++;
+    }
+    if(hist[i] > 0) {
+      model->setData(j,0,xcor[i]);
+      model->setData(j,1,hist[i-1]);
+      j++;
+      model->setData(j,0,xcor[i]);
+      model->setData(j,1,hist[i]);
+      j++;
+    }  
+  }
+  
+  WCartesianChart *chart = new WCartesianChart(w);
+  chart->setTitle("Histogramme");
+  chart->setModel(model);        // set the model
+  chart->setXSeriesColumn(0);    // set the column that holds the categories
+  chart->setLegendEnabled(true); // enable the legend
+
+   // Provide space for the X and Y axis and title.
+  chart->setPlotAreaPadding(200, Right);
+  chart->setPlotAreaPadding(80, Left);
+  chart->setPlotAreaPadding(40, Top | Bottom);
+
+  chart->setType(ScatterPlot);
+  
+  WAxis& axis = chart->axis(XAxis);
+  axis.setLabelFormat("%.1f");
+  axis.setGridLinesEnabled(true);
+  chart->axis(Y1Axis).setGridLinesEnabled(true);
+
+  WDataSeries s(1, LineSeries);
+  chart->addSeries(s);
+  
+
+  chart->resize(800, 400);
+
+  chart->setMargin(10, Top | Bottom);
+  chart->setMargin(WLength::Auto, Left | Right);
+
+  LegendLocation location = LegendOutside;
+  Side side = Right;
+  AlignmentFlag alignment = AlignMiddle;
+  chart->setLegendLocation(location, side, alignment);
+  chart->setLegendStyle(chart->legendFont(), WPen(black), WBrush(WColor(0xFF, 0xFA, 0xE5)));
+ }

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -519 +519 @@
     }
 }
+
+void particleBeam::histogramme(vector<double>&xcor,vector<int>& hist,int& cnts)
+{
+  double gammin= GRAND;
+  double gammax= -gammin;
+  double Emoy= 0.0;
+  double ecatyp= 0.0;
+
+  for (unsigned int k = 0; k < goodPartic_.size(); k++)
+    {
+      double gamma = goodPartic_.at(k).getGamma();
+      double EMev = (gamma-1.0)*ERESTMeV;
+      if (gamma < gammin) gammin = gamma;
+      else if (gamma > gammax) gammax = gamma;
+      Emoy += EMev;
+      ecatyp += EMev*EMev;
+    }
+
+  double sum= (float)goodPartic_.size();
+  Emoy /= sum;
+  ecatyp /= sum;
+  ecatyp = sqrt(abs(ecatyp-Emoy*Emoy));
+
+  double Emin = (gammin-1.0)*ERESTMeV;
+  double Emax = (gammax-1.0)*ERESTMeV;
+  cout << "energie cinetique -moyenne " << Emoy << " Mev " << "-mini " << Emin << " Mev " << "-maxi " << Emax << " Mev " << "ecart type " << ecatyp*1000.0 << " Kev" << endl;
+
+  vector<double> Eshf;
+  for (unsigned int k = 0; k < goodPartic_.size(); k++)
+    {
+      double gamma = goodPartic_.at(k).getGamma();
+      double EMev = (gamma-1.0)*ERESTMeV;
+      Eshf.push_back(EMev-Emoy);
+    }
+
+  //////////////////////////////////////////////////////////////////////////////
+  
+  // demi fenetre en energie, et pas de l'histogramme
+  double hfene= max(3.*ecatyp-Emoy,Emoy-3.*ecatyp);
+  double hpas = hfene/50.;
+
+  cout << "demi fenetre " << hfene << ", hpas= " << hpas << endl;
+
+  double vmin = -hfene;
+  double dfen = 2.*hfene;
+  int ihist = dfen/hpas;
+  double phist = ihist*hpas;
+  double dpas = hpas-(dfen-phist);
+  if(dpas <= hpas*1.e-03) {
+    ihist++;
+    phist= ihist*hpas;
+  }
+  double vmax= vmin+hpas*ihist;
+  
+  cout << "'xAxisNumberOfBins= " << ihist <<", xAxisMinimum= " << vmin << ", xAxisMaximum= " << vmax << ", NParticules= " << Eshf.size() << ", phist " << phist << endl;
+
+  xcor= vector<double>(ihist);
+  for (unsigned i = 0; i < ihist; ++i) {
+    xcor[i]= vmin+i*hpas;
+  }
+
+  hist= vector<int>(ihist,0);
+  for (unsigned i = 0; i < Eshf.size(); ++i) {
+    double var= Eshf[i]-vmin;
+    if(var < 0 || var >= phist) cout<<"out of range "<<var<<", ("<< i<<")"<< endl;
+    int k= var/hpas;
+    int kk= (int)floor(var/hpas);
+    if(i%20 == 0) cout<<"v("<<i<<")= " <<var<<" ["<<k<<"-"<<kk<<"], "<<endl; 
+    hist[kk]++;
+  }
+
+  cnts= 0;
+  for (unsigned i = 0; i < ihist; ++i) {
+    if(hist.at(i) > 0) cnts++;
+    cout<<"("<<xcor.at(i)<<","<<hist.at(i)<<") ";
+  }
+  cout<< " ... cnts=  " << cnts << endl;
+}