Changeset 431 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h

Timestamp:

Nov 15, 2013, 3:30:50 PM (11 years ago)

Author:

touze

Message:

systeme periodique (mailles) + multipoles + madx

File:

• Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h (modified) (3 diffs)

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

@@ -3 +3 @@
 
 #include "globalParameters.h"
+#include "sectorParameters.h"
 #include "particleBeam.h"
 #include "nomDeLogiciel.h"
@@ -19 +20 @@
 
  protected :
-
+  
   unsigned numeroDeb_, numeroFin_;
   globalParameters* globParamPtr_;
+  sectorParameters* sectParamPtr_; //xx
   dataManager* dataManager_;
   string inputFileName_;
   nomDeLogiciel nameOfSoftware_;
 
-    /**
+  /**
      Accepted elements list for this software
-     */
+  */
   std::vector <nomdElements::typedElement> acceptedElements_;
 
-    /**
+  /**
      Ignore software list for this element
-     */
+  */
   std::vector <nomdElements::typedElement> ignoredElements_;
-
+  
   abstractSoftware();
 
@@ -42 +44 @@
   bool ComputationLimitsOk() const;
 
-
   void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
 
  public :
 
-  abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt);
+  abstractSoftware(string,globalParameters*,dataManager*);
+  abstractSoftware(string,sectorParameters*,dataManager*);
   ~abstractSoftware() {;}
 
   inline const nomDeLogiciel* getNomDeLogiciel() const {
     return &nameOfSoftware_;
-}
+  }
 
   trivaluedBool doAcceptElement(nomdElements::typedElement typdel);
 
+  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
+  virtual bool execute(string workingDir) = 0;
+  virtual bool buildBeamAfterElements(string workingDir) = 0;
 
-  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
-
-
-  virtual bool  execute(string workingDir) = 0;
-
- virtual bool buildBeamAfterElements(string workingDir) = 0;
-
-    /** Color of the background of this sofware
-     Should be a valid Css name as FFEEDD
-     */
-    virtual string getColor() = 0;
-
-    /** Name of this software
-     */
-    inline string getName() const {
-      return nameOfSoftware_.getString();
-    }
-
+  /** Color of the background of this sofware
+      Should be a valid Css name as FFEEDD
+  */
+  virtual string getColor() = 0;
+  
+  /** Name of this software
+   */
+  inline string getName() const {
+    return nameOfSoftware_.getString();
+  }
 };
 #endif