Changeset 368 in PSPA for Interface_Web

Timestamp:

Mar 6, 2013, 9:57:20 AM (12 years ago)

Author:

lemeur

Message:

reglage longueur ligne pour graphique enveloppe

Location:

Interface_Web/trunk/pspaWT/sources/controler

Files:

• include/dataManager.h (modified) (4 diffs)
• src/dataManager.cc (modified) (7 diffs)

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

@@ -18 +18 @@
 class dataManager
 {
-  abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
 
  public:
@@ -70 +69 @@
     
 
-    //    void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);
-    /* inline void setWorkingDir(string wd) { */
-    /*     workingDir_ = wd; */
-    /* } */
     
 private:
@@ -79 +74 @@
     particleBeam* currentBeam_;
   PspaApplication* pspa_;
-    
+  unsigned firstComputedElemNumero_;
+  unsigned lastComputedElemNumero_;
     vector<particleBeam> diagnosticBeam_;
     
@@ -86 +82 @@
     void removeFile(string nameOfFile);
     void clearSectionToExecute();
+    abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
  
   };

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

@@ -82 +82 @@
     jobList_.clear();
 }
+
 
 
@@ -102 +103 @@
     diagnosticBeam_.clear();
     currentBeam_ = NULL;
+    firstComputedElemNumero_ = getBeamLineSize();
+    lastComputedElemNumero_ = 1;
     clearSectionToExecute();
 }
@@ -153 +156 @@
         if ( !success ) break;
         
+
+        if ( debut < firstComputedElemNumero_ ) firstComputedElemNumero_ = debut;
+        if ( fin > lastComputedElemNumero_ ) lastComputedElemNumero_ = fin;
+
         //debug
         cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
@@ -162 +169 @@
         
     } //k
-    
+    cout << " dataManager::executeAll premier element : " << firstComputedElemNumero_ << " dernier : " << lastComputedElemNumero_ << endl;
     return success;
 }
@@ -254 +261 @@
 }
 
-// void dataManager::donneesRmsEnveloppe(string type,unsigned int numeroDeb,unsigned int numeroFin, vector<double>& xcor,vector<double>& ycor)
-// {
-//   unsigned k;
-//   if ( numeroDeb < 1 ) numeroDeb = 1;
-//   if ( numeroFin > diagnosticBeam_.size() ) numeroFin = diagnosticBeam_.size();
-        
-//   double longueur = 0.0;
-//   double valeur = 0.0;
-//   xcor.clear();
-//   ycor.clear();
-//   if ( type == "x" )
-//     {
-//       for (k= numeroDeb; k <= numeroFin; k++)
-//         {
-//        if ( !diagnosticBeam_.at(k-1).momentRepresentationOk() ) diagnosticBeam_.at(k-1).buildMomentRepresentation();
-//        longueur += pspa_->getBeamLine()->getAbstractElement(k-1)->getLenghtOfElement();
-//        valeur = diagnosticBeam_.at(k-1).getXmaxRms();
-//        cout << " dataManager::donneesRmsEnveloppe longueur = " << longueur << " enveleloppe : " << valeur << endl;
-//        xcor.push_back(longueur);
-//        ycor.push_back(valeur);
-//         }
-//     }
-//   else
-//     {
-//       cerr << " dataManager::donneesRmsEnveloppe type " << type << " not programmed " << endl;
-//       return;
-//     }
-// }
 
 
@@ -295 +274 @@
     unsigned i = 0;
     cout << " dataManager::donneesRmsEnveloppe BeamLineSize = " << getBeamLineSize() << endl;
-    for (unsigned k = 0; k < getBeamLineSize(); k++) {
+    //    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;
@@ -306 +286 @@
       longueur += elPtr->getLenghtOfElement();
       valeur = diagnosticBeam_.at(i).getXmaxRms();
-      cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveleloppe : " << valeur << endl;
+      cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
       xcor.push_back(longueur);
       ycor.push_back(valeur);