Changeset 324 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc

Timestamp:

Feb 18, 2013, 1:52:42 PM (11 years ago)

Author:

touze

Message:

menu analyse graphique + histo

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc (modified) (5 diffs)

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

@@ -428 +428 @@
 }
 
-void particleBeam::histogramme(vector<double>&xcor,vector<int>& hist,int& cnts)
+void particleBeam::histogramme(vector<double>&xcor,vector<int>& hist,int& cnts,double out[3])
 {
+  // sortie pour la legende: out[0]= entries, out[1]= mean, out[2]= rms
+
   double gammin= GRAND;
   double gammax= -gammin;
@@ -446 +448 @@
 
   double sum= (float)goodPartic_.size();
+  out[0]= sum;
   Emoy /= sum;
+  out[1]= Emoy; //MeV
   ecatyp /= sum;
+  out[2]= 1000.0*sqrt(ecatyp); //KeV
   ecatyp = sqrt(abs(ecatyp-Emoy*Emoy));
 
@@ -487 +492 @@
   for (int i = 0; i < ihist; ++i) {
 
-    // on gradue l'abcisse en pourcents
+    // on gradue l'abscisse en pourcents
     xcor[i]= 100.*( vmin+i*hpas );
   }
@@ -497 +502 @@
     int k= var/hpas;
     int kk= (int)floor(var/hpas);
-    if(i%20 == 0) cout<<"v("<<i<<")= " <<var<<" ["<<k<<"-"<<kk<<"], "<<endl; 
+    //if(i%20 == 0) cout<<"v("<<i<<")= " <<var<<" ["<<k<<"-"<<kk<<"], "<<endl; 
     hist[kk]++;
   }
@@ -504 +509 @@
   for (int i = 0; i < ihist; ++i) {
     if(hist.at(i) > 0) cnts++;
-    cout<<"("<<xcor.at(i)<<","<<hist.at(i)<<") ";
+    //cout<<"("<<xcor.at(i)<<","<<hist.at(i)<<") ";
   }
   cout<< " ... cnts=  " << cnts << endl;