Changeset 377 in PSPA

Timestamp:

Mar 8, 2013, 2:24:40 PM (11 years ago)

Author:

touze

Message:

erreur de remplissage des histos corrigée

Location:

Interface_Web/trunk/pspaWT/sources

Files:

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

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

@@ -43 +43 @@
   unsigned indexFromPspaToTransport(unsigned index) const;
 
-  void histogramComponent(vector<double>& coord,unsigned int index);
   void histogramInitialize(unsigned int index,vector<double>& vshf,double out[3]);
   void histogramPacking(double ecatyp,vector<double>vshf,vector<double>&xcor,vector<int>& hist);

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

@@ -357 +357 @@
   coord.resize(goodPartic_.size(), 0.0 );
   cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;
+
   if ( index <= 2 ) {
     for (unsigned i = 0; i < goodPartic_.size(); ++i) {
@@ -363 +364 @@
     return;
   }
-
+  
   if ( index >  2 && index < 5 ) {
     for (unsigned i = 0; i < goodPartic_.size(); ++i) {
@@ -378 +379 @@
   if ( index == 5 ) {
     double gamma0 = referenceParticle_.getGamma();
-    //    cout << " gamma0 = " << gamma0 << endl;
     if ( gamma0 == 0.0 ) return;
     for (unsigned i = 0; i < goodPartic_.size(); ++i) {
       coord.at(i) =  100.*(goodPartic_.at(i).getGamma() - gamma0)/gamma0;  // en %
-      //      cout << " gamma0 = " << gamma0 << " gamma = " << goodPartic_.at(i).getGamma() << endl;
     }
     return;
@@ -529 +528 @@
 }
 
-void particleBeam::histogramme(unsigned int iabs,vector<double>&xcor,vector<int>& hist,double out[3])
+void particleBeam::histogramme(unsigned int iabs,vector<double>& xcor,vector<int>& hist,double out[3])
 {
+  // out[0]= nbre de particules, out[1]= moyenne, out[2]= ecart-type
   vector<double> vshf;
-  histogramComponent(vshf,iabs);
+  particlesPhaseSpaceComponent(vshf,iabs); 
   histogramInitialize(iabs,vshf,out);
   histogramPacking(out[2],vshf,xcor,hist);
 
-  // out[0]= nbre de particules, out[1]= moyenne, out[2]= ecart-type
-  if(iabs == 0 || iabs == 1 || iabs == 2) {
-    out[2] *= 1000.0; // ecart-type en mm
-  }
-
   if(iabs == 5) {
-    for (unsigned int i = 0; i <= xcor.size(); ++i) {
-      xcor[i] = 100.*xcor[i]/out[1]; // en %
-    }
     out[1] *= EREST_MeV; // moyenne en MeV
     out[2] *= EREST_keV; // ecart-type en KeV
   }
-}
-
-void particleBeam::histogramComponent(vector<double>& coord,unsigned int index) 
-{  
-  coord.clear();
-  coord.resize(goodPartic_.size(),0.0);
-  
-  if(index == 0 || index == 1 || index == 2) 
-    {
-      // collecte d'une coordonnee x(index= 0), y(index= 1) ou z(index= 2) des particules
-      for (unsigned int k = 0; k < goodPartic_.size(); k++) {
-        coord.at(k) = goodPartic_.at(k).getPosition().getComponent(index);
-      }
-    }
-
-  if(index == 3 || index == 4)
-    {
-      // collecte de begamx (index= 3), begamy (index= 4)
-      for (unsigned int k = 0; k < goodPartic_.size(); k++) {
-        double begamz = goodPartic_.at(k).getBetaGamma().getComponent(2);
-        if (begamz == 0.0) continue;
-        double begam = goodPartic_.at(k).getBetaGamma().getComponent(index-3);
-        coord.at(k) = 1000.0*begam/begamz;  //pi.mm.mradians
-      }
-    }
-  
-  if(index == 5)
-    {
-      // collecte de l'energie acquise par les particules
-      for (unsigned int k = 0; k < goodPartic_.size(); k++) {
-        double gamma = goodPartic_.at(k).getGamma();
-        coord.at(k) = gamma-1.0;
-      }
-    }
 }
 
@@ -607 +565 @@
 
   if(index == 0) {
-    cout << "position x -moyenne " << vmoy << " m " << "-mini " << vmin << " m " << "-maxi " << vmax << " m " << "ecart type " << ecatyp*1000.0 << " mm" << endl;
+    cout << "position x -moyenne " << vmoy << " cm " << "-mini " << vmin << " cm " << "-maxi " << vmax << " cm " << "ecart type " << ecatyp << " cm" << endl;
   } 
   if(index == 1) {
-    cout << "position y -moyenne " << vmoy << " m " << "-mini " << vmin << " m " << "-maxi " << vmax << " m " << "ecart type " << ecatyp*1000.0 << " mm" << endl;
+    cout << "position y -moyenne " << vmoy << " cm " << "-mini " << vmin << " cm " << "-maxi " << vmax << " cm " << "ecart type " << ecatyp << " cm" << endl;
   } 
   if(index == 2) {
-    cout << "position z -moyenne " << vmoy << " m " << "-mini " << vmin << " m " << "-maxi " << vmax << " m " << "ecart type " << ecatyp*1000.0 << " mm" << endl;
+    cout << "position z -moyenne " << vmoy << " cm " << "-mini " << vmin << " cm " << "-maxi " << vmax << " cm " << "ecart type " << ecatyp << " cm" << endl;
   }
   if(index == 3) {
-    cout << "divergence xp -moyenne " << vmoy << " pi.mm.mrad " << "-mini " << vmin << " pi.mm.mrad " << "-maxi " << vmax << " pi.mm.mrad " << "ecart type " << ecatyp << " pi.mm.mrad" << endl;
+    cout << "divergence xp -moyenne " << vmoy << " mrad " << "-mini " << vmin << " mrad " << "-maxi " << vmax << " mrad " << "ecart type " << ecatyp << " mrad" << endl;
   } 
   if(index == 4) {
-    cout << "divergence yp -moyenne " << vmoy << " pi.mm.mrad " << "-mini " << vmin << " pi.mm.mrad " << "-maxi " << vmax << " pi.mm.mrad " << "ecart type " << ecatyp << " pi.mm.mrad" << endl;
+    cout << "divergence yp -moyenne " << vmoy << " mrad " << "-mini " << vmin << " mrad " << "-maxi " << vmax << " mrad " << "ecart type " << ecatyp << " mrad" << endl;
   } 
   if(index == 5) {
@@ -668 +626 @@
     if(var < 0 ) {
       cout<<"lesser that the minimum "<<var<<", ("<< i<<")"<< endl;
-      hist[0]++;
-    }
-
-    if(var >= phist) {
+      hist.at(0)++;
+    } else if(var >= phist) {
       cout<<"greater that the maximum "<<var<<", ("<< i<<")"<< endl;
-      hist[ihist-1]++;
-    }
-
-    int kk= (int)floor(var/hpas);
-    hist[kk]++;
-  }
-}
-
+      hist.at(ihist-1)++;
+    } else {
+      int kk= (int)floor(var/hpas);
+      hist.at(kk)++;
+    }
+  }
+}
+

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

@@ -873 +873 @@
 
   WContainerWidget *w= histoDialog->contents();
-
-  // 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++;
-  //   }
-  // }
-
   int n = hist.size();
   int nbpts= 2*(n+1);
-  cout << " nbre de points nbpts= " << nbpts << endl;
   WStandardItemModel *model = new WStandardItemModel(nbpts,2,w);
-   
+
   int j= 0;
   model->setData(j,0,xcor[0]);
@@ -920 +884 @@
   model->setData(j,1,hist[0]);
   j++;
+
   for (int i = 1; i < n; ++i) {
     model->setData(j,0,xcor[i]);
@@ -928 +893 @@
     j++;
   }
-  
+
   model->setData(j,0,xcor[n]);
   model->setData(j,1,hist[n-1]);
@@ -934 +899 @@
   model->setData(j,0,xcor[n]);
   model->setData(j,1,0.0);
-  
+
   // legendes
   string unites[2];
   if(iabs == 0 || iabs == 1 || iabs == 2) {
-    unites[0]= " m"; unites[1]= " mm";
+    unites[0]= unites[1]= " cm";
   }
   if(iabs == 3 || iabs == 4) {
-    unites[0]= unites[1]= " pi.mm.mrad";
+    unites[0]= unites[1]= " mrad";
   }
   if(iabs == 5) {
@@ -955 +920 @@
   WCartesianChart *chart = new WCartesianChart(w);
 
-  if(iabs == 0) chart->setTitle("Histogram of x-coordinate");
-  if(iabs == 1) chart->setTitle("Histogram of y-coordinate");
-  if(iabs == 2) chart->setTitle("Histogram of z-coordinate");
-  if(iabs == 3) chart->setTitle("Histogram of xp- ??? ");
-  if(iabs == 4) chart->setTitle("Histogram of yp- ???");
-  if(iabs == 5) chart->setTitle("Histogram of kinetic energy");
+  if(iabs == 0) chart->setTitle("x-coordinate");
+  if(iabs == 1) chart->setTitle("y-coordinate");
+  if(iabs == 2) chart->setTitle("z-coordinate");
+  if(iabs == 3) chart->setTitle("xp-divergence");
+  if(iabs == 4) chart->setTitle("yp-devergence");
+  if(iabs == 5) chart->setTitle("kinetic energy");
   
   chart->setModel(model);        // set the model
@@ -977 +942 @@
   axis.setGridLinesEnabled(true);
 
-  if(iabs < 5) {
-    axis.setTitle(WString(" ???"));
-  } else {
-    axis.setTitle(WString(" dEcin/Ecin (%)"));
-  }
-
+  if(iabs == 0) axis.setTitle(WString(" x (cm)"));
+  if(iabs == 1) axis.setTitle(WString(" y (cm)"));
+  if(iabs == 2) axis.setTitle(WString(" z (cm)"));
+  if(iabs == 3) axis.setTitle(WString(" xp (mrad)"));
+  if(iabs == 4) axis.setTitle(WString(" yp (mrad)"));
+  if(iabs == 5) axis.setTitle(WString(" dEcin/Ecin (%)"));
+  
   chart->axis(Y1Axis).setGridLinesEnabled(true);
   //chart->axis(Y1Axis).setTitle(WString("legende y"));