Changeset 243 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

Jan 18, 2013, 10:02:58 PM (11 years ago)

Author:

lemeur

Message:

rationalisation pour introduire nouveau logiciel

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_abstractElement.h (modified) (1 diff)
• abstractElement.h (modified) (3 diffs)
• dataManager.h (modified) (3 diffs)
• elementBeam.h (modified) (1 diff)
• elementBend.h (modified) (1 diff)
• elementCell.h (modified) (1 diff)
• elementDrift.h (modified) (1 diff)
• elementFit.h (modified) (1 diff)
• elementRfgun.h (modified) (1 diff)
• elementSoleno.h (modified) (1 diff)
• particleBeam.h (modified) (4 diffs)

Interface_Web/trunk/pspaWT/include/GWt_abstractElement.h

@@ -5 +5 @@
 #include "GWt_draggableImage.h"
 #include "abstractElement.h"
+#include "GWt_console.h"
 
 #include <Wt/WDialog>

Interface_Web/trunk/pspaWT/include/abstractElement.h

@@ -7 +7 @@
 
 #include "nomdElements.h"
+#include "nomDeLogiciel.h"
+#include "trivaluedBool.h"
 
 using namespace std;
@@ -14 +16 @@
  protected :
   
-  bool parmelaOk_;
-  bool parmelaIgnored_;
-  bool transportOk_;
+  /* bool parmelaOk_; */
+  /* bool parmelaIgnored_; */
+  /* bool transportOk_; */
   int nbParam_;
   string* parametersString_;
@@ -50 +52 @@
 
   /* string getElementImage() const; */
-
   /* string getElementName() const; */
 
   double getLenghtOfElement() const;
   int getNbParams() const;  
-  bool is_parmela_ignored() const;
-  bool is_parmela_element() const;
-  bool is_transport_element() const;
-
+  /* bool is_parmela_ignored() const; */
+  /* bool is_parmela_element() const; */
+  /* bool is_transport_element() const; */
+  virtual trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
   virtual void setPhaseStep(double);
   virtual double getInitialKineticEnergy() const;

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -12 +12 @@
 #include "beam2Moments.h"
 
+typedef struct 
+{
+  float xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz;
+  float phi0, ksi1,ksi2,ksi3;
+  int ne,np,ngood,npart;
+
+  int readFromParmelaFile(FILE* fp)
+  {
+    return fscanf(fp, " %e %e %e %e %e %e %e %e %e %e %d %d %d %d %e %e %e %e \n", &xx, &xxp, &begamx,&yy,&yyp,&begamy,&z, &begamz,&phi,&wz,&ne,&np,&ngood,&npart,&phi0, &ksi1,&ksi2,&ksi3);
+  }
+  void imprim()
+  {
+    printf( " %e %e %e %e %e %e %e %e %e %e %d %d %d, %d %e %e %e %e \n", xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz,ne,np,ngood,npart,phi0, ksi1,ksi2,ksi3);
+  }
+} parmelaParticle;
 
 
@@ -31 +46 @@
   void clearSectionToExecute();
   bool  moments2FromTransport(string workingDir, string elLab, const nomdElements elem, beam2Moments& moments) const;
-
+  bool beamFromParmela(string workingDir,unsigned numeroElement, double referencefrequency, vector<double>& centroid, bareParticle& refPart,vector<bareParticle>& particles );
  public:
 
@@ -56 +71 @@
   void initializeExecution(string workingDir);
   trivaluedBool checkExecute(string& diagnostic);
+  trivaluedBool checkElementsForExec(nomDeLogiciel logiciel, unsigned indexDeb, unsigned indexFin, string& diagnostic);
   bool executeTransport( unsigned int numeroDeb, unsigned int numeroFin, string workingDir,  string& resul);
   bool executeParmela( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul);
+  bool launchJob(string commandLine, string& resul);
   bool executeAll(string workingDir, string& resul);
   void saveConfiguration(string workingDir, string nameOfFile);

Interface_Web/trunk/pspaWT/include/elementBeam.h

@@ -30 +30 @@
 ~elementBeam();
 
+virtual  trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
 
 

Interface_Web/trunk/pspaWT/include/elementBend.h

@@ -43 +43 @@
   double getLenghtOfElement() const;
 
+ virtual trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
+
 
   virtual void setParametersString(string* param);

Interface_Web/trunk/pspaWT/include/elementCell.h

@@ -46 +46 @@
   ~elementCell() { ;}
 
+ virtual trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
 
   virtual string* getParametersString() const;

Interface_Web/trunk/pspaWT/include/elementDrift.h

@@ -18 +18 @@
   ~elementDrift() {;}
 
+ virtual trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
+
+
   virtual string* getParametersString() const;
 

Interface_Web/trunk/pspaWT/include/elementFit.h

@@ -29 +29 @@
   ~elementFit() {;}
 
+ virtual  trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
+
 
   virtual void setParametersString(string* param);

Interface_Web/trunk/pspaWT/include/elementRfgun.h

@@ -42 +42 @@
   ~elementRfgun() {;}
 
+ virtual  trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
+
   virtual void setPhaseStep(double ph) { phaseStep_ = ph;}
   

Interface_Web/trunk/pspaWT/include/elementSoleno.h

@@ -32 +32 @@
   ~elementSoleno() {;}
 
+  virtual trivaluedBool is_accepted_by_software(nomDeLogiciel soft) const;
+
  virtual void setParametersString(string* param);
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -10 +10 @@
 
 #include "bareParticle.h"
-#include "mathematicalTools.h"
+//#include "mathematicalTools.h"
 #include "nomdElements.h"
 #include "beam2Moments.h"
@@ -16 +16 @@
 using namespace std;
 
-typedef struct 
-{
-  float xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz;
-  float phi0, ksi1,ksi2,ksi3;
-  int ne,np,ngood,npart;
+/* typedef struct  */
+/* { */
+/*   float xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz; */
+/*   float phi0, ksi1,ksi2,ksi3; */
+/*   int ne,np,ngood,npart; */
 
-  int readFromParmelaFile(FILE* fp)
-  {
-    return fscanf(fp, " %e %e %e %e %e %e %e %e %e %e %d %d %d %d %e %e %e %e \n", &xx, &xxp, &begamx,&yy,&yyp,&begamy,&z, &begamz,&phi,&wz,&ne,&np,&ngood,&npart,&phi0, &ksi1,&ksi2,&ksi3);
-  }
-  void imprim()
-  {
-    printf( " %e %e %e %e %e %e %e %e %e %e %d %d %d, %d %e %e %e %e \n", xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz,ne,np,ngood,npart,phi0, ksi1,ksi2,ksi3);
-  }
-} parmelaParticle;
+/*   int readFromParmelaFile(FILE* fp) */
+/*   { */
+/*     return fscanf(fp, " %e %e %e %e %e %e %e %e %e %e %d %d %d %d %e %e %e %e \n", &xx, &xxp, &begamx,&yy,&yyp,&begamy,&z, &begamz,&phi,&wz,&ne,&np,&ngood,&npart,&phi0, &ksi1,&ksi2,&ksi3); */
+/*   } */
+/*   void imprim() */
+/*   { */
+/*     printf( " %e %e %e %e %e %e %e %e %e %e %d %d %d, %d %e %e %e %e \n", xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz,ne,np,ngood,npart,phi0, ksi1,ksi2,ksi3); */
+/*   } */
+/* } parmelaParticle; */
 
 
@@ -63 +63 @@
   virtual ~particleBeam() {;}
 
-  bool setFromParmela(string workingDir,unsigned numeroElement,double referencefrequency);
+  //  bool setFromParmela(string workingDir,unsigned numeroElement,double referencefrequency);
   void buildMomentRepresentation();
 
@@ -92 +92 @@
  
   void set2Moments(beam2Moments& moments);
-
+  void setWithParticles(vector<double>& centroid, bareParticle& referencePart, vector<bareParticle>& particles);
   void printAllXYZ() const;