Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

Timestamp:

Mar 11, 2014, 11:21:43 AM (10 years ago)

Author:

lemeur

Message:

refection generale des secteurs et applications de softwares (suite)

File:

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

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

@@ -13 +13 @@
 }
 
-softwareParmela::softwareParmela(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect, data)
+// softwareParmela::softwareParmela(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect, data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("parmela");
+//   cout << " CONSTRUCTEUR softwareParmela() COMPLET " << endl;
+// }
+
+softwareParmela::softwareParmela(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName, cmpb, data)
 {
   nameOfSoftware_ = new nomDeLogiciel("parmela");
-  cout << " CONSTRUCTEUR softwareParmela() COMPLET " << endl;
-  // registerElement(nomdElements::RFgun,TBoolOk);
-  // registerElement(nomdElements::drift,TBoolOk);
-  // registerElement(nomdElements::cell,TBoolOk);
-  // registerElement(nomdElements::bend,TBoolOk);
-  // registerElement(nomdElements::soleno,TBoolOk);
-  // registerElement(nomdElements::fit,TBoolIgnore);
-  // registerElement(nomdElements::snapshot,TBoolIgnore);
-}
-
+  cout << " CONSTRUCTEUR softwareParmela() COMPLET avec COMPUTING BLOCK = " << cmpb << endl;
+    cout << " softwareParmela::CONSTRUCTEUR adresse mamager " << dataManager_  << endl;
+    cout << " softwareParmela::CONSTRUCTEUR adresse GLOBAUX " << dataManager_->getGlobalParameters()  << endl;
+}
+
+void softwareParmela::setRelativeParmelaElementIndices() {
+    relativeParmelaElementIndices_.clear();
+
+  relativeParmelaElementIndices_.resize(getComputingBlock()->getNumberOfElements(), -1);
+  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
+  abstractElement* elPtr = getComputingBlock()->getFirstElement();
+  bool there_is_rfgun = (elPtr->getNomdElement().getElementType() == nomdElements::RFgun );
+
+  //  unsigned offsetNumElem;
+  // index du premier element de parmela
+  int id;
+  // les elements de parmela sont indexes de 1 Ã  max, s'il n'y a pas de rfgun
+  if ( !there_is_rfgun ) {
+    id = 1;
+    // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
+  } else {
+    id = 0;
+  }
+
+  unsigned k;
+  unsigned curseur = 0;
+  //  for ( k=numeroDeb_; k <= numeroFin_ ; k++ ) {
+  for ( k = 0; k < getComputingBlock()->getNumberOfElements(); k ++) {
+    abstractElement* elem = getComputingBlock()->getElement(k);
+    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
+    // if ( elem->is_accepted_by_software(nameOfSoftware_) == TBoolOk ) {
+
+    if ( getNomDeLogiciel()->doAcceptElement(elem->getNomdElement().getElementType()) == TBoolOk  ) {
+      relativeParmelaElementIndices_.at(curseur) = id;
+      cout << " mis a " << id << endl;
+      id++;
+    }
+    curseur++;
+  }
+}
 
 
 bool softwareParmela::createInputFile(particleBeam* beamBefore, string workingDir)
 {
+
+  cout << " softwareParmela::createInputFile ENTREE " << endl;
   unsigned int k;
 
-//  setRelativeParmelaElementIndices();
+  setRelativeParmelaElementIndices();
   string name = workingDir + inputFileName_;
   ofstream outfile;
@@ -42 +80 @@
   }
   
-  abstractElement* elPtr = getSectionToExecute()->getElements().front();
+  //  abstractElement* elPtr = getSectionToExecute()->getElements().front();
+
+  abstractElement* elPtr = getComputingBlock()->getFirstElement();
   double initalKineticEnergy = 0.0;
+
   bool there_is_rfgun = (elPtr->getNomdElement().getElementType() == nomdElements::RFgun );
-  
+
   if ( !there_is_rfgun ) {
     string nameOfInput = workingDir + "parin.input0";
@@ -55 +96 @@
     elPtr->setPhaseStep( dataManager_->getGlobalParameters()->getIntegrationStep() );
     initalKineticEnergy = elPtr->getInitialKineticEnergy();
-    // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
-  }
-  
+  }
+
   outfile << "TITLE" << endl;
   outfile << " titre provisoire " << endl;
   outfile << "RUN /n0=1 /ip=999 /freq=" << dataManager_->getGlobalParameters()->getFrequency() << "  /z0=0.0 /W0=" << initalKineticEnergy << "  /itype=1" << endl;
   outfile << "OUTPUT 0" << endl;
+
+  unsigned int premier = 0 ;
   if ( there_is_rfgun ) {
     outfile << elementsData(elPtr->parametersToSoftware());
+    premier++;
   } else {
     outfile << "INPUT 0 /NP=" << beamBefore->getNbParticles() << endl;
   }
-  
- // retrouver le sector !!
-  for ( k =1; k < getSectionToExecute()->getElements().size(); k++)
+
+  for ( k =premier++; k < getComputingBlock()->getNumberOfElements(); k++)
     {
-      outfile << elementsData(getSectionToExecute()->getElements()[k]->parametersToSoftware());
-    }
-    
+      outfile << elementsData(getComputingBlock()->getElement(k)->parametersToSoftware());
+    }
+  
   outfile << "ZOUT" << endl;
   outfile << "START /wt=0.0 /dwt=" << dataManager_->getGlobalParameters()->getIntegrationStep() << "  /nsteps=" << dataManager_->getGlobalParameters()->getNbSteps() << "  nsc=" << dataManager_->getGlobalParameters()->getScPeriod() << "  /nout=10" << endl;
@@ -121 +163 @@
 
   unsigned curseur;
-  for ( unsigned int k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
-    abstractElement* elem = getSectionToExecute()->getElements()[k];
+  for ( unsigned int k=0; k < getComputingBlock()->getNumberOfElements() ; k++ ) {
+    abstractElement* elem = getComputingBlock()->getElement(k);
       if ( elem == NULL ) {
         dataManager_->consoleMessage(" softwareParmela::buildBeamAfterElements : null pointer on element " );
@@ -129 +171 @@
 
     curseur = k;
-    cout << " softwareParmela::buildBeamAfterElements : type element " << getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType() << endl;
-    if (!(nameOfSoftware_->doAcceptElement(getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
-
-      cout << " softwareParmela::buildBeamAfterElements ELEMENT ETRANGER " << endl;
-//      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
+    cout << " softwareParmela::buildBeamAfterElements : type element " << getComputingBlock()->getElement(curseur)->getNomdElement().getElementType() << endl;
+
+
+    //      if (!(nameOfSoftware_->doAcceptElement(getComputingBlock()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
+
+    if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
 
         // si l'element doit etre ignore de parmela, on renvoie sur le diag precedent
@@ -149 +192 @@
           double freq= dataManager_->getGlobalParameters()->getFrequency();
           unsigned numeroParmel;
-//        numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
-    numeroParmel = curseur;
-          cout << " lecture PARMELA el no absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
+          numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+          //    numeroParmel = curseur;
+          cout << " lecture PARMELA el no relativement absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
         // lecture sortie parmela
         if(!beamFromParmela(workingDir,numeroParmel,freq,centroid,refPart,particles))