Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Dec 16, 2013, 5:16:54 PM (10 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (15 diffs)

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

@@ -8 +8 @@
 #include "GWt_pspaApplication.h"
 #include "GWt_console.h"
-
-#include "softwareParmela.h"
-#include "softwareTransport.h"
-#include "softwareGenerator.h"
-#include "softwareGenerator.h"
-#include "softwareUsersprogram.h"
-#include "softwareTest.h"
-#include "softwareMadx.h" //xx
-#include "softwareUnknown.h" //xx
+#include "GWt_ligneFaisceau.h" // FIXME to be removed !
 
 #include <boost/filesystem.hpp>
@@ -46 +38 @@
 }
 
-string dataManager::getLabelFromElementNumero(int numero)
-{
-  abstractElement* ptr = pspa_->getBeamLine()->getAbstractElement(numero-1);
+string dataManager::getLabelFromElementNumero_deprecated(int numero)
+{
+/*
+ abstractElement* ptr = pspa_->getBeamLine()->getAbstractElement(numero-1);
   if ( ptr == NULL ) return "";
   return ptr->getLabel();
-}
-
-int dataManager::getNumeroFromElementLabel(string label)
-{
-  int index = -1;    
+*/
+return "";
+}
+
+int dataManager::getNumeroFromElementLabel_deprecated(string label)
+{
+/*  int index = -1;
   for (int k = 0; k < getBeamLineSize() ; k++) {
     if (pspa_->getBeamLine()->getAbstractElement(k) != NULL) {
@@ -66 +61 @@
   }
   return index;
-}
-
-abstractElement* dataManager::getElementPointerFromNumero(int k)
-{
-  return pspa_->getBeamLine()->getAbstractElement(k-1);
-}
-
-sectionToExecute* dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
-{
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " dataManager::addSectionToExecute " << endl << endl;
-#endif
-
-  abstractSoftware* prog;
-  string inputFileName;
-  if(logiciel == nomDeLogiciel::parmela) {
-    inputFileName = "parmin";
-    prog = new softwareParmela(inputFileName, &globParam_, this);
-  } else if (logiciel  == nomDeLogiciel::transport) {
-    inputFileName = "transport.input";
-    prog =  new softwareTransport(inputFileName, &globParam_, this);
-  } else if (logiciel == nomDeLogiciel::generator) {
-    inputFileName = "generator.in";
-    prog = new softwareGenerator(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
-  }
-
-  jobList_.push_back(new sectionToExecute(debut,debutIndex,fin,finIndex,prog));
-  return jobList_.back();
-}
-
-void dataManager::clearSectionToExecute()
-{
-  unsigned k;
-  for(k = 0; k < jobList_.size(); k++)
-    {
-      if ( jobList_[k] != NULL ) clearSectionToExecute(k);
-    }
-  jobList_.clear();
-}
-
-void dataManager::clearSectionToExecute(int a)
-{
-  cout << " dataManager::clearSectionToExecute : effacement de la section d'index = " << a << endl;
-  if (a < 0) return;
-  if (a >= (int)jobList_.size()) return;
-  
-  // lors de la creation de la section on a fait un 'new' d'un 
-  // softwareXXXX : on fait ici le 'delete'
-  
-  const abstractSoftware* soft = jobList_.at(a)->getSoftware();
-  if ( soft != NULL ) delete soft;
-  jobList_.erase (jobList_.begin()+a);
-}
+*/
+  return 0;
+}
+
 
 void dataManager::initializeExecution()
@@ -148 +83 @@
   indexElementToIndexDiag_.clear();
   currentBeam_ = NULL;
-  firstComputedElemNumero_ = getBeamLineSize();
-  lastComputedElemNumero_ = 1;
-  clearSectionToExecute();
+  for (unsigned int a=0; a< jobList_.size(); a++) {
+      jobList_[a]->clearSectionToExecute();
+  }
 }
 
@@ -171 +106 @@
 
   bool success = true;
-  abstractSoftware* softw = NULL;
   string workingDir = pspa_->getWorkingDir();
   
-  // on verifie la consecution des sections
-  int lastel = 0;
+
+  // Main loop !
   for(unsigned k = 0; k < jobList_.size(); k++) {
-    if ( jobList_[k]->getElementNumberInSection() != lastel +1 ) {
-      consoleMessage("dataManager::executeAll ERROR : sections should be consecutive ");
-      return false;
-    } else {
-      lastel = jobList_[k]->getLastElementNumberInSection();
-    }
-  }
-  
-  unsigned debut;
-  unsigned fin;
-  for(unsigned k = 0; k < jobList_.size(); k++) {
-
-#if BAVARD > 0  
+    sector* sector = jobList_[k];
+    
+    // for the moment, we put everything in one line without loops
+    for (unsigned int l=0; l <sector->getSectionsToExecute().size(); l++) {
+      sectionToExecute* section = sector->getSectionsToExecute()[l];
+      abstractSoftware* softw = section->getSoftware();
+      
+#if BAVARD > 0
     cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
 #endif
-    
-    debut = jobList_[k]->getElementNumberInSection();
-    fin = jobList_[k]->getLastElementNumberInSection();
-    softw = jobList_[k]->getSoftware();
-    
-    //cout << "k= " << k << ", de " << jobList_[k]->getFirstElement()->getLabel() << " Ã  " << jobList_[k]->getLastElement()->getLabel() << " avec " << softw->getName() << endl;
-
+      
+      //cout << "k= " << k << ", de " << jobList_[k]->getFirstElement()->getLabel() << " Ã  " << jobList_[k]->getLastElement()->getLabel() << " avec " << softw->getName() << endl;
+      
     if (softw == NULL) {
       success = false;
@@ -205 +130 @@
     }
     
-    success = softw->createInputFile(currentBeam_,debut,fin,workingDir);
+    success = softw->createInputFile(currentBeam_,workingDir);
     if ( success ) {
       success = softw->execute(workingDir);
@@ -222 +147 @@
     if ( !success ) break;
     
-    if ( debut < firstComputedElemNumero_ ) firstComputedElemNumero_ = debut;
-    if ( fin > lastComputedElemNumero_ ) lastComputedElemNumero_ = fin;
-
-#if BAVARD > 0    
-    cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
-    cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
-    for (unsigned j = debut; j <= fin; j++) {
-      abstractElement* elPtr= getElementPointerFromNumero(j);
-      cout << "[" << j << "] " << elPtr->getNomdElement().getExpandedName() << endl;
-    }
+#if BAVARD > 0
+      cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
+      cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
+      std::vector< abstractElement* > elements = section->getElements();
+      for (unsigned j = 0; j < elements.size(); j++) {
+        cout << "[" << j << "] " << elements[j]->getNomdElement().getExpandedName() << endl;
+      }
 #endif
-
+    } //l
   } //k
   // if ( currentBeam_ ) {
@@ -241 +163 @@
   //   currentBeam_->readFromAMLFile(aml_file);
   // }
-  cout << " dataManager::executeAll() : premier element = " << firstComputedElemNumero_ << " dernier = " << lastComputedElemNumero_ << endl;
+  cout << " dataManager::executeAll() " << endl;
 
   return success;
@@ -264 +186 @@
   
   outfile << globParam_.FileOutputFlow();
-  outfile << sectorParam_.FileOutputFlow();
-
+
+  // FIXME Francois: Comment sauver la configuration des section ?
+  for (unsigned int a=0; a< jobList_.size(); a++) {
+    outfile << jobList_[a]->getSectorParameters().FileOutputFlow();
+  }
+  // END
+  
   abstractElement* elPtr;
-  for(int k = 0; k < getBeamLineSize() ; k++)
-    {
-      elPtr = pspa_->getBeamLine()->getAbstractElement(k);
-      outfile << elPtr->FileOutputFlow();
-    }
+  for (unsigned k = 0; k < jobList_.size(); k++) {
+    sector* sector = jobList_[k];
+    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+      sectionToExecute* section = sector->getSectionsToExecute()[l];
+      for (unsigned m = 0; m < section->getElements().size(); m++) {
+        elPtr = section->getElements()[m];
+        outfile << elPtr->FileOutputFlow();
+      }
+    }
+  }
   outfile.close();
 }
@@ -300 +232 @@
 
   abstractElement* elPtr;
-  for(int k = 0; k < getBeamLineSize() ; k++) {
-    elPtr = pspa_->getBeamLine()->getAbstractElement(k);
-    elPtr->InputRep(sect);
-  }
-  
+  for (unsigned k = 0; k < jobList_.size(); k++) {
+    sector* sector = jobList_[k];
+    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+      sectionToExecute* section = sector->getSectionsToExecute()[l];
+      for (unsigned m = 0; m < section->getElements().size(); m++) {
+        elPtr = section->getElements()[m];
+        elPtr->InputRep(sect);
+      }
+    }
+  }
   cout << "!Create the AML file ---------------------------" << endl;
   AMLReader reader;
@@ -335 +272 @@
       globParam_.FileInput(infile);
     } else if (elementLabel == string("sectors") ) {
-      sectorParam_.raz();
-      sectorParam_.FileInput(infile);
+      // FIXME Francois !!!!!!!
+//      sectorParam_.raz();
+//      sectorParam_.FileInput(infile);
+      // END
     } else {
       elementType = nomdElements::getTypeFromLabel(elementLabel);
@@ -371 +310 @@
 }
 
-particleBeam* dataManager::getDiagnosticBeam(string elementLabel)
-{
-  return getDiagnosticBeam( getNumeroFromElementLabel(elementLabel) -1);
+particleBeam* dataManager::getDiagnosticBeam_deprecated(string elementLabel)
+{
+  // FIXME : Devra etre changé par une récupération par "abstractElement" et non pas par label
+  unsigned int number = 0;
+  abstractElement* elPtr;
+  for (unsigned k = 0; k < jobList_.size(); k++) {
+    sector* sector = jobList_[k];
+    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+      sectionToExecute* section = sector->getSectionsToExecute()[l];
+      for (unsigned m = 0; m < section->getElements().size(); m++) {
+        elPtr = section->getElements()[m];
+        if (elPtr->getLabel() == elementLabel) {
+          return getDiagnosticBeam(number);
+        }
+        number ++;
+      }
+    }
+  }
+  return NULL;
 }
 
@@ -390 +345 @@
   if ( type == "x" ) {
     unsigned i = 0;
-    cout << " dataManager::donneesRmsEnveloppe BeamLineSize = " << getBeamLineSize() << endl;
+    cout << " dataManager::donneesRmsEnveloppe " << endl;
     //    for (unsigned k = 0; k < getBeamLineSize(); k++) {
-    for (unsigned k = firstComputedElemNumero_ -1 ; k < lastComputedElemNumero_ ; k++) {
-      abstractElement* elPtr = pspa_->getBeamLine()->getAbstractElement(k);
-      //     if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-      //      if(elPtr->getNomdElement().getElementType() == fit) continue;
-      particleBeam* beamToDraw = getDiagnosticBeam(i);
-      if ( !beamToDraw->momentRepresentationOk() ) {
-        beamToDraw->buildMomentRepresentation();
-      }
-
-      longueur += elPtr->getLenghtOfElement();
-      valeur = beamToDraw->getXmaxRms();
-      cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
-      xcor.push_back(0.01*longueur);  // on passe en metres
-      ycor.push_back(valeur);
-      i++;
+    for (unsigned k = 0; k < jobList_.size(); k++) {
+      sector* sector = jobList_[k];
+      for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+        sectionToExecute* section = sector->getSectionsToExecute()[l];
+        for (unsigned m = 0; m < section->getElements().size(); m++) {
+          abstractElement* elPtr = section->getElements()[m];
+          //     if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+          //      if(elPtr->getNomdElement().getElementType() == fit) continue;
+          particleBeam* beamToDraw = getDiagnosticBeam(i);
+          if ( !beamToDraw->momentRepresentationOk() ) {
+            beamToDraw->buildMomentRepresentation();
+          }
+          
+          longueur += elPtr->getLenghtOfElement();
+          valeur = beamToDraw->getXmaxRms();
+          cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
+          xcor.push_back(0.01*longueur);  // on passe en metres
+          ycor.push_back(valeur);
+          i++;
+        }
+      }
     }
     legendy.clear();
@@ -413 +374 @@
 }
 
-int dataManager::getBeamLineSize() {
-    return pspa_->getBeamLine()->getBeamLineSize();
-}
-
-
-abstractSoftware* dataManager::createSoftwareConnexion(nomDeLogiciel logi)
-{
-  string inputFileName;
-  if(logi == nomDeLogiciel::parmela) {
-    cout << " dataManager::createSoftwareConnexion : logiciel identifie : parmela " << endl;
-    inputFileName = "parmin";
-    return new softwareParmela(inputFileName, &globParam_, this);
-  } else if (logi == nomDeLogiciel::transport) {
-    cout << " dataManager::createSoftwareConnexion : logiciel identifie : transport " << endl;
-    inputFileName = "transport.input";
-    return new softwareTransport(inputFileName, &globParam_, this);
-  } else if (logi == nomDeLogiciel::generator) {
-    cout << " dataManager::createSoftwareConnexion : logiciel identifie : generator " << endl;
-    inputFileName = "generator.in";
-    return new softwareGenerator(inputFileName, &globParam_, this);
-  } else if (logi == nomDeLogiciel::test) {
-    cout << " dataManager::createSoftwareConnexion : logiciel identifie : test " << endl;
-        return new softwareTest(inputFileName, &globParam_, this);
-  } else {
-    cout << " dataManager::createSoftwareConnexion : logiciel identifie : null " << endl;
-    return NULL;
-  }
-}
+int dataManager::getBeamLineSize_deprecated() {
+// FIXME : Cette methode ne doit pas exister, mis a part pour savoir quelle est la taille de la beamLine
+  unsigned int i = 0;
+  for (unsigned k = 0; k < jobList_.size(); k++) {
+    sector* sector = jobList_[k];
+    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+      i += sector->getSectionsToExecute()[l]->getElements().size();
+    }
+  }
+  return i;
+}
+
 
 sector* dataManager::addNewSector() {
@@ -448 +393 @@
   str >> result;
   
-  sector* sect = new sector(std::string("sector ") + result);
-  sectors_.push_back(sect);
+  sector* sect = new sector(this, std::string("sector ") + result);
+  jobList_.push_back(sect);
   return sect;
 }