Changeset 434 in PSPA

Timestamp:

Nov 22, 2013, 9:57:54 AM (10 years ago)

Author:

lemeur

Message:

correction softwaregenerator

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/src/particleBeam.cc (modified) (5 diffs)
• controler/src/softwareGenerator.cc (modified) (2 diffs)
• userInterface/src/GWt_pspaApplication.cc (modified) (8 diffs)

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

@@ -375 +375 @@
 void particleBeam::particlesPhaseSpaceComponent(vector<double>& coord, unsigned index) 
 {
+
   if ( !particleRepresentationOk_ ) return;
   
   coord.clear();
   coord.resize(relativePartic_.size(), 0.0 );
-  cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;
+  //  cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;
 
   if ( index <= 2 ) {
@@ -392 +393 @@
   
   if ( index >  2 && index < 5 ) {
-    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl;
+    //    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl;
     for (unsigned i = 0; i < relativePartic_.size(); ++i) {
       double begamz = relativePartic_.at(i).getBetaGamma().getComponent(2);
@@ -401 +402 @@
       }
     }
-    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl;
+    //    cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl;
     return;
   }
@@ -727 +728 @@
     double gamma = relativePartic_.at(particleIndex).getGamma();
     //    TRIDVECTOR pos = relativePartic_.at(particleIndex).getPosition();
+    // cout << " ------------------ particleBeam::coordonneesDeployees ----- " << endl;
+    //   cout << " particleBeam::coordonneesDeployees " << relativePartic_.at(particleIndex).FileOutputFlow() << endl;
+    //   cout << " par reference x= " << relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0);
+    // cout << " ----------------------------------------------------- " << endl;
+
+
+
     double xx = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0);
     double yy = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(1);
@@ -733 +741 @@
     //    TRIDVECTOR begam= goodPartic_.at(particleIndex).getBetaGamma();
     double begamz = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(2);
-    double dz = begamz * cdt / gamma;
-    double xp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0)/begamz;
-    double yp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1)/begamz;
-    xx += xp * dz;
-    yy += yp * dz;    
-    return TRIDVECTOR(xx, yy, dz);
+    double fac = cdt / gamma;
+    //    double dz = begamz * fac;
+    xx += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0) * fac;
+    yy += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1) * fac;
+    return TRIDVECTOR(xx, yy, begamz * fac);
  }

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

@@ -15 +15 @@
 {
   nameOfSoftware_ = nomDeLogiciel("generator");
-  registerElement(nomdElements::beam,TBoolOk);
+  registerElement(nomdElements::RFgun,TBoolOk);
 }
 
@@ -227 +227 @@
     if ( faisceau.at(k).flag == -1 ) {
       particles.push_back(bareParticle(pos,betagamma));
+      //      cout << " generator enregistre " << particles.back().FileOutputFlow() << endl;
     } else {
       passiveParticles.push_back(bareParticle(pos,betagamma));

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

@@ -612 +612 @@
     seriesType = PointSeries;
     titre = " phase space ";
-    cout << " PspaApplication::faireDessinPhaseSpace APPEL " << endl;
     beam->particlesPhaseSpaceData(xcor,ycor,legende,namex,namey);
-    cout << " PspaApplication::faireDessinPhaseSpace RETOUR " << endl;
+    // for ( int kk=0; kk < xcor.size(); kk++) 
+    //   {
+    //  cout << " dess. phas. x= " << xcor.at(kk) << " x'= " << ycor.at(kk) << endl;
+    //   }
   } else {
     GWt_dialog warningBeamState(" graphical analysis", "the beam state does not allow providing a drawing with macroparticles !", GWt_dialog::Error, false,true);
@@ -874 +876 @@
     model->setData(i, 0, xcor.at(i));
     model->setData(i, 1, ycor.at(i));
-    //    cout << " PspaApplication::chartPlot2vec el= " << i+1 << " x= " << xcor.at(i) << " y= " << ycor.at(i) << endl;
-  }
-    
+    //        cout << " PspaApplication::chartPlot2vec el= " << i+1 << " x= " << xcor.at(i) << " y= " << ycor.at(i) << endl;
+  }
+  //  cout << " PspaApplication::chartPlot2vec FLAG 0 " << endl;
   WCartesianChart *chart = new WCartesianChart(toto);
   if (!makeIcon) chart->setTitle(title);
@@ -896 +898 @@
   chart->axis(YAxis).setLocation(value);
   
+  //  cout << " PspaApplication::chartPlot2vec FLAG 1 " << endl;
+
   WDataSeries s(1,seriesType);
   s.setPen(WColor("red"));
@@ -911 +915 @@
     chart->axis(Y1Axis).setGridLinesEnabled(true);
   }
-  
+  //   cout << " PspaApplication::chartPlot2vec FLAG 2 " << endl;
+
   chart->resize(width,height); // WPaintedWidget must be given explicit size
   chart->setMargin(10, Top | Bottom); // ?
@@ -927 +932 @@
     chart->axis(YAxis).setLabelFont(yAxisFont);
   }
+  //  cout << " PspaApplication::chartPlot2vec FLAG 3 " << endl;
 
 #ifdef HAS_IMAGEMAGIC
+
+  //  cout << " PspaApplication::chartPlot2vec FLAG MAGIC " << endl;
 
   // no background
@@ -938 +946 @@
     
   std::string name;
-/*
+  /*
  Wt::WRasterImage pngImage("png", 1000, 1000);
   Wt::WPainter p(&pngImage);
@@ -945 +953 @@
   std::ofstream f(name.c_str(), std::ios::out |std::ios::trunc | std::ios::binary);
   pngImage.write(f);
-*/
-  
+  */
 
   Wt::WPdfImage pdfImage("1000", "600");
-  {
+    {
    Wt::WPainter p1(&pdfImage);
     chart->paint(p1);
-  }
+      }
 
   name = workingDir_ + "/chart-"+sessionId ()+".pdf";
@@ -961 +968 @@
 
 #endif
+  //  cout << " PspaApplication::chartPlot2vec FLAG FIN" << endl;
 
 }