Changeset 386 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

Timestamp:

Mar 12, 2013, 1:54:41 PM (11 years ago)

Author:

lemeur

Message:

amélioration fiabilité graphique

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc (modified) (6 diffs)

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

@@ -7 +7 @@
 
 softwareTransport::softwareTransport() : abstractSoftware()
-{;}
+{
+  nameOfSoftware_ = nomDeLogiciel("transport");
+}
 
 softwareTransport::softwareTransport(string inputFileName,globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
-{;}
+{
+  nameOfSoftware_ = nomDeLogiciel("transport");
+}
 
 bool softwareTransport::createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
 { 
-  if ( numeroDeb < 1 || numeroFin > dataManager_->getBeamLineSize() ) {
-    dataManager_->consoleMessage(" softwareTransport::createInputFile : numero of element out of limits " );
-    cerr << " numero of element out of limits " << endl;
-    return false;
-  }
+
+  if ( !initComputationLimits(numeroDeb,numeroFin) ) return false;
 
   abstractElement* premierEl = NULL;
-  premierEl = dataManager_->getElementPointerFromNumero(numeroDeb);
+  premierEl = dataManager_->getElementPointerFromNumero(numeroDeb_);
 
   // ceinture et bretelles
@@ -79 +80 @@
 
   abstractElement* elPtr;
-  for (unsigned k = numeroDeb; k <= numeroFin; k++)
+  for (unsigned k = numeroDeb_; k <= numeroFin_; k++)
     {
       elPtr = dataManager_->getElementPointerFromNumero(k);
       cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getElementName() << endl;
-      if(elPtr->getNomdElement().getElementType() == snapshot) continue;
       outfile << elPtr->transportOutputFlow() << endl;
     }
@@ -95 +95 @@
 }
 
-bool softwareTransport::execute( unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
+bool softwareTransport::execute(string workingDir)
 {
   bool ExecuteStatus = true;
 
   ostringstream sortie;
-  sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb << " a " << numeroFin << endl;
+  sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb_ << " a " << numeroFin_ << endl;
   
   string transportJob = workingDir + "transport";
@@ -132 +132 @@
 }
 
-bool softwareTransport::buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams,string workingDir) 
+bool softwareTransport::buildBeamAfterElements(string workingDir) 
 {
 
   bool result = true;
-  
-  for (unsigned k = numeroDeb; k <= numeroFin; k++)
+  if ( !ComputationLimitsOk() ) return false;
+
+  for (unsigned k = numeroDeb_; k <= numeroFin_; k++)
     {
       abstractElement* ptr = dataManager_->getElementPointerFromNumero(k);
@@ -143 +144 @@
         dataManager_->consoleMessage(" softwareTransport::buildBeamAfterElements : null pointer on element " );
         cout << " softwareTransport::buildBeamAfterElements : null pointer on element " << endl;
-        result = false;
-        break;        
-      }
-
+        return false;         
+      }
+
+
+      if ( ptr->is_accepted_by_software(nameOfSoftware_) != TBoolOk ) {
+        // si l'element doit etre ignore, on renvoie sur le diag precedent
+        dataManager_->updateCurrentDiagnostic(false);
       // si l'element est un snapshot, recuperer la sortie precedente
-      if(ptr->getNomdElement().getElementType() == snapshot) {
-        int avantDernier = beams.size() - 1;
-        string* param = ptr->getParametersString();
-        string cliche = workingDir + param[2].c_str();
-         cout<<"["<<k<<"] : ecrit sur fichier " << cliche << " le contenu de beam["<<avantDernier<<"]"<<endl;
-         //      continue;
-      }
-
-      beams.push_back(particleBeam());
-      cout << " creation diagn. no " << beams.size() << " par TRANSPORT " << endl;
-      string elemLabel = ptr->getLabel();
-      beam2Moments transpMoments;
-      
-      if (!moments2FromTransport(workingDir,elemLabel,ptr->getNomdElement(),transpMoments) )
-        {
-          dataManager_->consoleMessage(" softwareTransport::buildBeamAfterElements : failure in reading moments " );
-          cout << " softwareTransport::buildBeamAfterElements plantage dans lecture moments " << endl;
-          result = false;
-          break;
-        } 
-      beams.back().set2Moments(transpMoments);
+        if(ptr->getNomdElement().getElementType() == snapshot) {
+          string* param = ptr->getParametersString();
+          string cliche = workingDir + param[2].c_str();
+          cout<<"["<<k<<"] : ecrit sur fichier " << cliche << " le contenu de beam[ ]"<<endl;
+        }
+      } else {
+        // si le numero est reconnu de transport
+
+
+
+        string elemLabel = ptr->getLabel();
+        beam2Moments transpMoments;
+        // lecture sortie transport
+        if (!moments2FromTransport(workingDir,elemLabel,ptr->getNomdElement(),transpMoments) )
+          {
+            // si echec, on renvoie sur le diag precedent
+            dataManager_->updateCurrentDiagnostic(false);
+
+            dataManager_->consoleMessage(" softwareTransport::buildBeamAfterElements : element skipped in reading moments from transport output :  " + elemLabel);
+            //   cout << " softwareTransport::buildBeamAfterElements plantage dans lecture moments " << endl;
+            return true;
+          } else {
+          // si succes, 
+        // on initialise une nouvelle sortie diagnostic 
+          particleBeam* newDiag = dataManager_->updateCurrentDiagnostic(true);
+        // et on la complete
+          newDiag->set2Moments(transpMoments);
+        }
+      }
     }
   return result;
 }
-
 bool softwareTransport::moments2FromTransport(string workingDir,string elLab,const nomdElements elem,beam2Moments& moments) const 
 {
@@ -226 +237 @@
   }
 
-  moments.readFromTransportOutput(fichierStream);
-  return true;
-}
+  return moments.readFromTransportOutput(fichierStream);
+}