Changeset 442 in PSPA

Timestamp:

Dec 11, 2013, 9:33:35 AM (10 years ago)

Author:

lemeur

Message:

ajout traitement utilisateur

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (1 diff)
• sources/controler/include/elementSnapshot.h (modified) (1 diff)
• sources/controler/include/mathematicalTools.h (modified) (1 diff)
• sources/controler/include/nomDeLogiciel.h (modified) (1 diff)
• sources/controler/include/particleBeam.h (modified) (1 diff)
• sources/controler/include/softwareUsersprogram.h (added)
• sources/controler/src/abstractSoftware.cc (modified) (2 diffs)
• sources/controler/src/bareParticle.cc (modified) (1 diff)
• sources/controler/src/dataManager.cc (modified) (3 diffs)
• sources/controler/src/elementDrift.cc (modified) (1 diff)
• sources/controler/src/elementSnapshot.cc (modified) (9 diffs)
• sources/controler/src/nomDeLogiciel.cc (modified) (3 diffs)
• sources/controler/src/nomdElements.cc (modified) (1 diff)
• sources/controler/src/particleBeam.cc (modified) (2 diffs)
• sources/controler/src/softwareGenerator.cc (modified) (1 diff)
• sources/controler/src/softwareUsersprogram.cc (added)
• sources/userInterface/include/GWt_elementSnapshot.h (modified) (1 diff)
• sources/userInterface/src/GWt_elementSnapshot.cc (modified) (2 diffs)
• sources/userInterface/src/GWt_snapshot.cc (copied) (copied from Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_snapshot.cc) (2 diffs)
• sources/userInterface/src/GWt_softwarePanel.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -36 +36 @@
  ../sources/controler/src/softwareTransport.cc \
  ../sources/controler/src/softwareGenerator.cc \
+ ../sources/controler/src/softwareUsersprogram.cc \
  ../sources/controler/src/sectionToExecute.cc \
  ../sources/controler/src/softwareTest.cc \

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

@@ -10 +10 @@
 {
   int incr_;
-  string snapshotFile_;
+  string programFile_;
+  string inputBeamFile_;
+  string outputBeamFile_;
   void setDefaultValues();
   void setDefaults();

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

@@ -150 +150 @@
 inline double getComponent(int index ) const {return vec_[index];}
 
+ inline double& component(int index ) {return vec_[index];}
+
  inline void setComponent(int index, double value )  {vec_[index] = value;}
 

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

@@ -13 +13 @@
   enum Logiciel
   {
-    parmela, transport, generator, useraction, test, madx, unknownSoftware
+    parmela, transport, generator, test, madx, usersprogram, unknownSoftware
   };
   

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

@@ -138 +138 @@
   virtual string fileOutputFlow() const;
   virtual bool FileInput(ifstream& ifs);
+  virtual void writeToAMLFile(string fileName);
+  virtual bool readFromAMLFile(string fileName);
 
   void histogramme(unsigned int index,vector<double>&xcor,vector<int>& hist,vector<string>& legende);

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

@@ -2 +2 @@
 #include "dataManager.h"
 #include <algorithm>
+#include <iostream>
+
 
 abstractSoftware::abstractSoftware()
@@ -52 +54 @@
 void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) 
 {
+  //  std::cout << " abstractSoftware::registerElement soft : " << nameOfSoftware_.getString() << std::endl;
   if (b == TBoolIgnore) {
+    //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "   ignore " << std::endl;
     ignoredElements_.push_back(nomdel);
   } else if (b == TBoolOk) {
+    //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "  OK " << std::endl;
     acceptedElements_.push_back(nomdel);
   }

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

@@ -119 +119 @@
 
 
-
 bool bareParticle::FileInput( ifstream& ifs)
  {

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

@@ -12 +12 @@
 #include "softwareTransport.h"
 #include "softwareGenerator.h"
+#include "softwareGenerator.h"
+#include "softwareUsersprogram.h"
 #include "softwareTest.h"
 #include "softwareMadx.h" //xx
@@ -89 +91 @@
     inputFileName = "generator.in";
     prog = new softwareGenerator(inputFileName, &globParam_, this);
-  } else if (logiciel  == nomDeLogiciel::test) {
-    prog = new softwareTest(inputFileName, &globParam_, this);
   } else if (logiciel  == nomDeLogiciel::madx) {
     inputFileName = "madx.input";
     prog = new softwareMadx(inputFileName,&sectorParam_,this);  
+  } else if (logiciel  == nomDeLogiciel::usersprogram) {
+    inputFileName = "dummy";
+    prog = new softwareUsersprogram(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::test) {
+    prog = new softwareTest(inputFileName, &globParam_, this);
   } else {
     prog = new softwareUnknown(); // xx
@@ -230 +235 @@
 
   } //k
-  
+  // if ( currentBeam_ ) {
+  // string aml_file = workingDir + "/" + "faisceau_final" + ".aml";
+  //   currentBeam_->writeToAMLFile(aml_file);
+  //   // TESTS
+  //   currentBeam_->readFromAMLFile(aml_file);
+  // }
   cout << " dataManager::executeAll() : premier element = " << firstComputedElemNumero_ << " dernier = " << lastComputedElemNumero_ << endl;
 

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

@@ -13 +13 @@
   nbParam_ = elementName_.getElementNbParameters();
   parametersString_ = new string[nbParam_+1];
-  // registerAcceptableSoftware(nomDeLogiciel::transport, TBoolOk);
-  // registerAcceptableSoftware(nomDeLogiciel::parmela, TBoolOk);
-  // registerAcceptableSoftware(nomDeLogiciel::test, TBoolOk);
 }
 

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

@@ -13 +13 @@
   nbParam_ = elementName_.getElementNbParameters();
   parametersString_ = new string[nbParam_+1];
-  // registerAcceptableSoftware(nomDeLogiciel::transport, TBoolIgnore);
-  // registerAcceptableSoftware(nomDeLogiciel::parmela, TBoolIgnore);
-  // registerAcceptableSoftware(nomDeLogiciel::generator, TBoolIgnore);
-  // registerAcceptableSoftware(nomDeLogiciel::useraction, 
-  //                                           TBoolOk);
-  // registerAcceptableSoftware(nomDeLogiciel::test, TBoolIgnore);
 }
 
@@ -30 +24 @@
   specificName_ = defaultSpecificName_;
 
-  if(incr_ < 10) {
-    snapshotFile_= string("cliche")+string(".00")+mixedTools::intToString(incr_);
-  } else if(incr_ >= 10 && incr_ < 100) {
-    snapshotFile_= string("cliche")+string(".0")+mixedTools::intToString(incr_);
-  } else {
-    snapshotFile_= string("cliche")+string(".")+mixedTools::intToString(incr_);
-  }
+  // if(incr_ < 10) {
+  //   snapshotFile_= string("cliche")+string(".00")+mixedTools::intToString(incr_);
+  // } else if(incr_ >= 10 && incr_ < 100) {
+  //   snapshotFile_= string("cliche")+string(".0")+mixedTools::intToString(incr_);
+  // } else {
+  //   snapshotFile_= string("cliche")+string(".")+mixedTools::intToString(incr_);
+  // }
 }
 
@@ -44 +38 @@
   parametersString_[++compteur] = mixedTools::intToString(nbParam_);
   parametersString_[++compteur] = specificName_;
-  parametersString_[++compteur] = snapshotFile_;
+  parametersString_[++compteur] = programFile_;
+  parametersString_[++compteur] = inputBeamFile_;
+  parametersString_[++compteur] = outputBeamFile_;
   
   if ( compteur != nbParam_ ) {
@@ -64 +60 @@
   int nbparam = atoi(param[++compteur].c_str());
   if ( nbparam != nbParam_ )  {
-    cerr << " elementSnaphot:: setParametersString parameters do not match for a DRIFT";
+    cerr << " elementSnaphot:: setParametersString parameters do not match for a SNAPSHOT";
     return;
   }
   
   specificName_ = param[++compteur];
+  programFile_  = param[++compteur];
+  inputBeamFile_  = param[++compteur];
+  outputBeamFile_  = param[++compteur];
 }
 
@@ -88 +87 @@
   sortie << elementName_.getGenericLabel() << endl;
   sortie  << specificName_ << endl;
-  sortie << snapshotFile_ << endl;
+  sortie << programFile_ << endl;
+  sortie << inputBeamFile_ << endl;
+  sortie << outputBeamFile_ << endl;
   return sortie.str();
 }
@@ -97 +98 @@
   sortie.back().second.push_back(elementName_.getGenericLabel());
   sortie.back().second.push_back(specificName_);
-  sortie.push_back( pair<string, vector<string> >("snapshotFile",  vector<string>() ) );
-  sortie.back().second.push_back(snapshotFile_);
+  sortie.push_back( pair<string, vector<string> >("nameOfFiles",  vector<string>() ) );
+  sortie.back().second.push_back(programFile_);
+  sortie.back().second.push_back(inputBeamFile_);
+  sortie.back().second.push_back(outputBeamFile_);
   return sortie;
 }
@@ -105 +108 @@
 {
   ifs >> specificName_;
-  ifs >> snapshotFile_;
+  ifs >> programFile_;
+  ifs >> inputBeamFile_;
+  ifs >> outputBeamFile_;;
 }
 
@@ -112 +117 @@
   string txt = "";  
   txt += specificName_;
-  txt += "\nname of file for snapshot : ";
-  txt += snapshotFile_;
+  txt += "\nname of file for user's program : ";
+  txt += programFile_;
+  txt += "\nname of input beam file for user's program : ";
+  txt += inputBeamFile_;
+  txt += "\nname of output beam file for user's program : ";
+  txt += outputBeamFile_;
   return txt;
 }
@@ -121 +130 @@
   UAPNode* node= root->addChild("snapshot");
   node->addAttribute("name",specificName_);
+
+  UAPNode* fichiers = node->addChild("names_of_files");
+  fichiers->addAttribute("program",programFile_);
+  fichiers->addAttribute("inputf",inputBeamFile_);
+  fichiers->addAttribute("outputf",outputBeamFile_);
 }

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

@@ -6 +6 @@
     else if ( s == "transport" ) return transport;
     else if ( s == "generator" ) return generator;
-    else if ( s == "useraction" ) return useraction;
     else if ( s == "test" ) return test;
     else if ( s == "madx" ) return madx;
+    else if ( s == "usersprogram" ) return usersprogram;
     return unknownSoftware;
   }
@@ -19 +19 @@
     case transport : { return "transport"; }
     case generator : { return "generator"; }
-    case useraction : { return "useraction"; }
     case test : { return "test"; }
     case madx : { return "madx"; }
+    case usersprogram : { return "usersprogram"; }
     case unknownSoftware : { return "unknownSoftware"; }
     }
@@ -37 +37 @@
     case transport : { return "#c0ea8e"; }
     case generator : { return "#a3c0ed"; }
-    case useraction : { return "#FFFFFF"; }
     case test : { return "#ecc38e"; }
     case madx : { return "#ecc38e"; } //{ return "#FFFF00"; }

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

@@ -74 +74 @@
   case soleno :   return 5;
   case fit :   return 4;
-  case snapshot : return 2;
+  case snapshot : return 4;
   case mpole :   return 3;
   default : return 0;

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

@@ -5 +5 @@
 #include "mathematicalTools.h"
 #include "mixedTools.h"
+
+#include "UAP/UAPUtilities.hpp"
+#include "AML/AMLReader.hpp"
 
 #include <stdio.h>
@@ -203 +206 @@
   sortie << endl;
   return sortie.str();
+}
+
+
+void particleBeam::writeToAMLFile(string fileName) {
+  UAPNode* uap_root = new UAPNode("UAP_root");
+  UAPNode* rep = uap_root->addChild("AML_representation");
+
+  // root node in the hierarchy
+  UAPNode* lab = rep->addChild("laboratory");
+  lab->addAttribute("name","PSPA lab");
+
+
+
+  // root node in the hierarchy
+  UAPNode* par = lab->addChild("particles");
+  par->addAttribute("name","PSPA particles");
+
+  unsigned int k;
+  if ( particleRepresentationOk_ ) {
+  for ( k = 0 ; k < relativePartic_.size(); k++)
+    {
+      TRIDVECTOR& position = relativePartic_.at(k).getReferenceToPosition();
+      TRIDVECTOR& betgam = relativePartic_.at(k).getReferenceToBetaGamma();
+      UAPNode* partic = par->addChild("particle");
+      string txt;
+      txt = mixedTools::doubleToString(position.getComponent(0));
+      partic->addAttribute("x",txt);
+      txt = mixedTools::doubleToString(position.getComponent(1));
+      partic->addAttribute("y",txt);
+      txt = mixedTools::doubleToString(position.getComponent(2));
+      partic->addAttribute("cdeltat",txt);
+      txt = mixedTools::doubleToString(betgam.getComponent(0));
+      partic->addAttribute("betagamma_x",txt);
+      txt = mixedTools::doubleToString(betgam.getComponent(1));
+      partic->addAttribute("betagamma_y",txt);
+      txt = mixedTools::doubleToString(betgam.getComponent(2));
+      partic->addAttribute("betagamma_z",txt);
+    }
+
+  } else {
+    cout << " particleBeam::writeToAMLFile : representation 'particules' indisponible" << endl;
+  }
+
+  cout << "!Create the AML particle file ---------------------------" << endl;
+  AMLReader reader;
+  reader.AMLRepToAMLFile (uap_root, fileName);
+
+}
+
+bool particleBeam::readFromAMLFile(string fileName) {
+
+  cout << "!read the AML particle file ---------------------------" << endl;
+  AMLReader reader;
+  UAPNode* uap_root = NULL;
+  uap_root = reader.AMLFileToAMLRep (fileName);
+  if ( !uap_root ) {
+    cout << " particleBeam::readFromAMLFile ERREUR lecture fichier particules " << endl;
+    return false;
+  }
+
+
+  NodeVec lesParticules = uap_root->getSubNodesByName(string("particles"));
+
+  NodeVec& listPart = (*lesParticules.begin())->getChildren();
+
+  if (  !listPart.size() ) {
+    cout << " particleBeam::readFromAMLFile ERREUR lecture fichier : pas de particules ? " << endl;
+    return false;
+  }
+
+  vector<bareParticle> vecteurParticules;
+  bareParticle reference;
+  for (NodeVecIter iter = listPart.begin(); iter != listPart.end(); iter++) {
+    TRIDVECTOR position, betagamma;
+    UAPAttribute* att = NULL;
+    att = (*iter)->getAttribute("x");
+    if ( att ) att->getDouble(position.component(0));
+    att = (*iter)->getAttribute("y");
+    if ( att ) att->getDouble(position.component(1));
+    att = (*iter)->getAttribute("cdeltat");
+    if ( att ) att->getDouble(position.component(2));
+
+    att = (*iter)->getAttribute("betagamma_x");
+    if ( att ) att->getDouble(betagamma.component(0));
+    att = (*iter)->getAttribute("betagamma_y");
+    if ( att ) att->getDouble(betagamma.component(1));
+    att = (*iter)->getAttribute("betagamma_z");
+    if ( att ) att->getDouble(betagamma.component(2));
+    
+    if ( fabs(position.component(0)) < PETIT &&  fabs(position.component(1)) < PETIT && fabs(position.component(2)) < PETIT ) {
+      reference = bareParticle(position, betagamma);
+    }
+    vecteurParticules.push_back(bareParticle(position, betagamma));
+  }
+  vector<double> centroid(6,0.0);
+  setWithParticles(centroid, reference, vecteurParticules);
+  return true;
 }
 

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

@@ -14 +14 @@
 softwareGenerator::softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
 {
+  cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
   nameOfSoftware_ = nomDeLogiciel("generator");
   registerElement(nomdElements::RFgun,TBoolOk);

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

@@ -14 +14 @@
 class GWt_elementSnapshot : public GWt_abstractElement
 {
-  WLineEdit* snapshotFile_;
-   
+   WLineEdit* programFile_;
+  WLineEdit* inputBeamFile_;
+  WLineEdit* outputBeamFile_;
+  
  public:
     

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

@@ -19 +19 @@
   string* param = beginDialog();
 
-  new WText("name of file for snapshot : ",dialog_->contents());
-  snapshotFile_ = new WLineEdit(param->c_str(),dialog_->contents());
+  new WText("name of user's program : ",dialog_->contents());
+  programFile_ = new WLineEdit(param->c_str(),dialog_->contents());
+  new WBreak(dialog_->contents());
+
+
+  new WText("name of input beam file, output from pspa : ",dialog_->contents());
+  inputBeamFile_ = new WLineEdit( (++param)->c_str(),dialog_->contents());
+  new WBreak(dialog_->contents());
+
+  new WText("name of output beam file (input for pspa) : ",dialog_->contents());
+  outputBeamFile_ = new WLineEdit( (++param)->c_str(),dialog_->contents());
   new WBreak(dialog_->contents());
 
@@ -40 +49 @@
   envoi[++compteur] = mixedTools::intToString(nbParam);
   envoi[++compteur] = labelEdit_->text().toUTF8();
-  envoi[++compteur] = snapshotFile_->text().toUTF8();
+  envoi[++compteur] = programFile_->text().toUTF8();
+  envoi[++compteur] = inputBeamFile_->text().toUTF8();
+  envoi[++compteur] = outputBeamFile_->text().toUTF8();
+
+
   if ( compteur !=  (int)nbParam ) {
     cerr << " GWt_elementSnapshot::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;

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

@@ -19 +19 @@
   string* param = beginDialog();
 
-  new WText("name of file for snapshot : ",dialog_->contents());
-  snapshotFile_ = new WLineEdit(param->c_str(),dialog_->contents());
+  new WText("name of user's program : ",dialog_->contents());
+  programFile_ = new WLineEdit(param->c_str(),dialog_->contents());
+  new WBreak(dialog_->contents());
+
+
+  new WText("name of input beam file, output from pspa : ",dialog_->contents());
+  inputBeamFile_ = new WLineEdit( (++param)->c_str(),dialog_->contents());
+  new WBreak(dialog_->contents());
+
+  new WText("name of output beam file (input for pspa) : ",dialog_->contents());
+  outputBeamFile_ = new WLineEdit( (++param)->c_str(),dialog_->contents());
   new WBreak(dialog_->contents());
 
@@ -40 +49 @@
   envoi[++compteur] = mixedTools::intToString(nbParam);
   envoi[++compteur] = labelEdit_->text().toUTF8();
-  envoi[++compteur] = snapshotFile_->text().toUTF8();
+  envoi[++compteur] = programFile_->text().toUTF8();
+
+  envoi[++compteur] = inputBeamFile_->text().toUTF8();
+  envoi[++compteur] = outputBeamFile_->text().toUTF8();
+
+
   if ( compteur !=  (int)nbParam ) {
     cerr << " GWt_snapshot::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;

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

@@ -279 +279 @@
 
           trivaluedBool tb = softToExec->doAcceptElement(elPtr->getNomdElement().getElementType());
+          cout << " GWt_softwarePanel::areDataCoherent() el " << elPtr->getLabel() << " tb= " << tb << endl;
           if (tb  == TBoolOk ) {
             elPtr->setSoftware(softToExec);