Changeset 333 in PSPA for Interface_Web

Timestamp:

Feb 20, 2013, 11:21:23 AM (11 years ago)

Author:

lemeur

Message:

addition graphique (en cours)

Location:

Interface_Web/trunk/pspaWT

Files:

• sources/controler/include/softwareTest.h (modified) (1 diff)
• sources/controler/src/softwareParmela.cc (modified) (2 diffs)
• sources/controler/src/softwareTest.cc (modified) (2 diffs)
• sources/userInterface/include/GWt_pspaApplication.h (modified) (3 diffs)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (6 diffs)
• workingArea/pmbfield (modified) (1 diff)

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

@@ -12 +12 @@
 
   softwareTest();
+
+  bool beamToParin(string workingDir, particleBeam* beam );
+  bool beamFromParin(string workingDir, vector<bareParticle>& particles );
 
  public :

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

@@ -121 +121 @@
 bool  softwareParmela::buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) {
   bool result = true;
-        unsigned k;
-
-        for ( k= numeroDeb; k <= numeroFin; k++)
-          {
-            beams.push_back(particleBeam());
-            vector<double> centroid;
-            bareParticle refPart;
-            vector<bareParticle> particles;
-            if (!beamFromParmela(workingDir,k - offsetNumElem_ , globParamPtr_->getFrequency(), centroid, refPart,particles ))
-              {
-                abstractElement* elem = dataManager_->getElementPointerFromNumero(k);
-                if ( elem->is_accepted_by_software(nomDeLogiciel::parmela) == warning) {
-                  int avantDernier = beams.size() -2;
-                  beams.back() = beams.at(avantDernier);
-                } else {
-                  // sortie << " reading parmdesz  failed " << endl;
-    dataManager_->consoleMessage(" softwareParmela::buildBeamAfterElements : reading parmdesz  failed " );
-                  result = false;
-                  break;
-                }
-              }
-            else {
-              beams.back().setWithParticles(centroid, refPart,particles); 
-            }
+  unsigned k;
+
+  for ( k= numeroDeb; k <= numeroFin; k++)
+    {
+      beams.push_back(particleBeam());
+      vector<double> centroid;
+      bareParticle refPart;
+      vector<bareParticle> particles;
+      if (!beamFromParmela(workingDir,k - offsetNumElem_ , globParamPtr_->getFrequency(), centroid, refPart,particles ))
+        {
+          abstractElement* elem = dataManager_->getElementPointerFromNumero(k);
+          if ( elem->is_accepted_by_software(nomDeLogiciel::parmela) == warning) {
+            int avantDernier = beams.size() -2;
+            beams.back() = beams.at(avantDernier);
+          } else {
+            // sortie << " reading parmdesz  failed " << endl;
+            dataManager_->consoleMessage(" softwareParmela::buildBeamAfterElements : reading parmdesz  failed " );
+            result = false;
+            break;
           }
-        return result;
+        }
+      else {
+        beams.back().setWithParticles(centroid, refPart,particles); 
+      }
+    }
+  return result;
 }
 
@@ -274 +274 @@
   unsigned k;
   double weight = 1.0;
-  cout << " ICI sortie des particules " << endl;
   double xx,yy,zz;
   double begamx, begamy, begamz;

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

@@ -22 +22 @@
 {
     dataManager_->consoleMessage(" softwareTest::createInputFile  " );
+
+    beamToParin(workingDir, beamBefore );
+
+
+
   return true;
 }
@@ -31 +36 @@
 
 bool  softwareTest::buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) {
-    dataManager_->consoleMessage(" softwareTest::buildBeamAfterElements  " );
+  dataManager_->consoleMessage(" softwareTest::buildBeamAfterElements  " );
+  bool result = true;
+  unsigned k;
+  for ( k= numeroDeb; k <= numeroFin; k++)
+    {
+      beams.push_back(particleBeam());
+      vector<double> centroid = vector<double>(6,0.0);
+      bareParticle refPart;
+      vector<bareParticle> particles;
+            
+  
+      if (!beamFromParin(workingDir,particles ) )
+        {
+          dataManager_->consoleMessage(" softwareTest::buildBeamAfterElements : reading parin  failed " );
+          result = false;
+          break;
+        }
+      else {
+        bareParticle refPart (particles.at(0));
+        beams.back().setWithParticles(centroid, refPart,particles); 
+      }
+    }
+  return result;
+}
+
+// sauvegarde d'un 'particleBeam' sur un fichier parmela, en guise d'INPUT
+// pour l'instant de nom standard 'parin.input0'
+bool softwareTest::beamToParin(string workingDir, particleBeam* beam ) {
+  if ( !beam->particleRepresentationOk() ) {
+    dataManager_->consoleMessage("softwareParmela::beamToParmela : beam not in particles form : not yet programmed");
+    cout << " softwareParmela::beamToParmela : beam not in particles form : not yet programmed " << endl;
+    return false;
+  }
+  ofstream outfile;
+  string name = workingDir + "parin.input0";
+  outfile.open(name.c_str(), ios::out);
+  if (!outfile) {
+    dataManager_->consoleMessage(" softwareTest::beamToParin : error opening in stream ");
+    cerr << " softwareParmela::beamToParmela : error opening output stream " << name << endl;
+    return false;
+  }
+
+  const vector<bareParticle>& partic = beam->getParticleVector();
+  unsigned k;
+  double weight = 1.0;
+  double xx,yy,zz;
+  double begamx, begamy, begamz;
+  for ( k=0; k < partic.size(); k++) {
+    partic.at(k).getPosition().getComponents(xx,yy,zz);
+    partic.at(k).getBetaGamma().getComponents(begamx, begamy, begamz);
+    outfile << xx << " " << begamx << " " <<  yy << " " << begamy << " " << zz << " " << begamz  << " " << weight << endl;
+  }
+  outfile.close();
   return true;
 }
+
+bool softwareTest::beamFromParin(string workingDir, vector<bareParticle>& particles ) {
+  ifstream infile;
+  string name = workingDir + "parin.input0";
+  infile.open(name.c_str(), ios::in);
+  if (!infile) {
+    dataManager_->consoleMessage(" softwareParmela::beamToParmela : error opening output stream ");
+    cerr << " softwareParmela::beamToParmela : error opening output stream " << name << endl;
+    return false;
+  }
+
+  particles.clear();
+  double weight;
+  double xx,yy,zz;
+  double begamx, begamy, begamz;
+  TRIDVECTOR  pos;
+  TRIDVECTOR betagamma;
+  while ( infile >> xx >> begamx >>  yy >>  begamy >> zz >> begamz  >> weight) {
+    pos.setComponents(xx,yy,zz);
+    betagamma.setComponents(begamx, begamy, begamz);
+    particles.push_back(bareParticle(pos,betagamma));
+  }
+  infile.close();
+  return true;
+}

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

@@ -50 +50 @@
   WComboBox* choixElementDessin_;
   WComboBox* choixTypeDessinFaisceau_;
+    WComboBox* choixAbsPhase_;
+    WComboBox* choixOrdPhase_;
   WComboBox* choixEnveloppeDessin_;
   WComboBox* choixHistoDessin_;
@@ -77 +79 @@
   
   void dialogOnGraphics();
-  void faireDessinParmela(WContainerWidget* toto, particleBeam* beam);
+    void faireDessinParmela(WContainerWidget* toto, particleBeam* beam, unsigned indexAbs, unsigned indexOrd );
   void faireDessinTransport(WContainerWidget* toto, particleBeam* beam);
   void faireDessinEnveloppe(WContainerWidget* toto, string type);
@@ -89 +91 @@
   void dessinerHistogramme();
     
+    
+     
+
+    
  public :
   
   PspaApplication(const WEnvironment& env);
+
 
   string getSelection();

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

@@ -240 +240 @@
   choixTypeDessinFaisceau_->addItem("macroparticles");
   Wt::WRadioButton *button2= new WRadioButton(" phase space after element");
+
+    choixAbsPhase_ = new WComboBox();
+    choixAbsPhase_->addItem("x");
+    choixAbsPhase_->addItem("y");
+    choixAbsPhase_->addItem("z");
+    choixAbsPhase_->addItem("xp");
+    choixAbsPhase_->addItem("yp");
+    choixAbsPhase_->addItem("dE/E");
+
+    choixOrdPhase_ = new WComboBox();
+    choixOrdPhase_->addItem("x");
+    choixOrdPhase_->addItem("y");
+    choixOrdPhase_->addItem("z");
+    choixOrdPhase_->addItem("xp");
+    choixOrdPhase_->addItem("yp");
+    choixOrdPhase_->addItem("dE/E");
+
+
+
   group_->addButton(button2,2);
   glayout->addWidget(button2,1,1);
   glayout->addWidget(choixElementDessin_,1,2);
   glayout->addWidget(choixTypeDessinFaisceau_,1,3);
+
+  glayout->addWidget(choixAbsPhase_,1,4);
+  glayout->addWidget(choixOrdPhase_,1,5);
   /////////////////////////////////////////////////////////////////////
 
@@ -455 +477 @@
   toto_->clear();
     
-  int typeFaisceau = choixTypeDessinFaisceau_->currentIndex();  
+  int typeFaisceau = choixTypeDessinFaisceau_->currentIndex();
   int index = choixElementDessin_->currentIndex();
+  unsigned xabs = choixAbsPhase_->currentIndex();
+  unsigned yord = choixOrdPhase_->currentIndex();
+       
   particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
     
@@ -464 +489 @@
     return;
   }
-      
+    
+    
   if ( typeFaisceau == 0 )
     {
@@ -472 +498 @@
   else if ( typeFaisceau == 1 )
     {
-      if ( beam->particleRepresentationOk() ) faireDessinParmela(toto_, beam);
+      if ( beam->particleRepresentationOk() ) faireDessinParmela(toto_, beam, xabs, yord);
       else {
         GWt_dialog warningBeamState(" graphical analysis", "the beam state does not allow providing a drawing with macroparticles !", GWt_dialog::Error, false,true);
@@ -515 +541 @@
 }
 
-void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam)
-{
-    
+
+void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam, unsigned indexAbs, unsigned indexOrd )
+{
+  cout << " faireDessinParmela " << endl;
     GWt_dialog* pointsDialog = new GWt_dialog("space phase",toto,false);
     pointsDialog->setMinimumSize(400,400);
@@ -527 +554 @@
     vector<bareParticle>& partic = beam->getParticleVector();
     new WText(nameOfCase_ + " : espace de phase x,x' "+ " nb partic. "+ mixedTools::intToString(partic.size()), pointsDialog->contents());
-    WStandardItemModel *model = new WStandardItemModel(partic.size(), 3, pointsDialog->contents());
+    WStandardItemModel *model = new WStandardItemModel(partic.size(), 2, pointsDialog->contents());
     //    model->setHeaderData(0, WString("X"));
     //   model->setHeaderData(1, WString("Y = sin(X)"));
     
-    
+    if ( indexAbs > 5 || indexOrd > 5 ) return;
+
     for (unsigned i = 0; i < partic.size(); ++i) {
-        double x= partic.at(i).getPosition().getComponent(0);
-        double begamz = partic.at(i).getBetaGamma().getComponent(2);
-        double xp;
-        if ( begamz != 0.0) {
-          xp = partic.at(i).getBetaGamma().getComponent(0)/begamz;
+      double valAbs, valOrd;
+      double begamz = partic.at(i).getBetaGamma().getComponent(2);
+      if ( indexAbs <= 2 ) {
+        valAbs = partic.at(i).getPosition().getComponent(indexAbs);
+        cout << " i= " << i << " valabs = " << valAbs << endl;
+      } else {
+        if ( indexAbs == 5 ) {
+          cout << " PspaApplication::faireDessinParmela : deltap non programme " << endl;
+          return;
         } else {
-          xp = 0.0;
+          if ( begamz != 0.0) {
+            valAbs = 1.e3*partic.at(i).getBetaGamma().getComponent(indexAbs-3)/begamz;
+          } else {
+            valAbs = 0.0;
+          }
         }
-        //    cout << "x = " << x << " xp= " << xp << endl;
-        model->setData(i, 0, x);
-        model->setData(i, 1,1.e3*xp);
-        model->setData(i, 2,2.e3*xp);
-    }
-    
+      }
+
+      if ( indexOrd <= 2 ) {
+        valOrd = partic.at(i).getPosition().getComponent(indexOrd);
+      } else {
+        if ( indexOrd == 5 ) {
+          cout << " PspaApplication::faireDessinParmela : deltap non programme " << endl;
+          return;
+        } else {
+
+
+          if ( begamz != 0.0) {
+            valOrd = 1.e3*partic.at(i).getBetaGamma().getComponent(indexOrd-3)/begamz;
+          } else {
+            valOrd = 0.0;
+          }
+        cout << " i= " << i << " valord = " << valOrd << endl;
+        }
+      }
+      
+
+        // double x= partic.at(i).getPosition().getComponent(0);
+        // double begamz = partic.at(i).getBetaGamma().getComponent(2);
+        // double xp;
+        // if ( begamz != 0.0) {
+        //   xp = partic.at(i).getBetaGamma().getComponent(0)/begamz;
+        // } else {
+        //   xp = 0.0;
+        // }
+        // //    cout << "x = " << x << " xp= " << xp << endl;
+        // model->setData(i, 0, x);
+        // model->setData(i, 1,1.e3*xp);
+        // model->setData(i, 2,2.e3*xp);
+        model->setData(i, 0, valAbs);
+        model->setData(i, 1,  valOrd);
+    }
+      cout << " faireDessinParmela : FAISCEAU VU  " << endl;
+
     WCartesianChart *chart = new WCartesianChart(pointsDialog->contents());
     chart->setModel(model);        // set the model

Interface_Web/trunk/pspaWT/workingArea/pmbfield

@@ -1 +1 @@
  z(cm)   b(gauss)
- -20.530     32.19      0.00     32.18     -0.00
+ -20.530      0.00      0.00      0.00      0.00