Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/elementCell.cc

Timestamp:

Jun 21, 2013, 10:16:56 AM (11 years ago)

Author:

lemeur

Message:

definition des compatibilites des elements dans les software

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/elementCell.cc (modified) (8 diffs)

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

@@ -14 +14 @@
       nbParam_ = elementName_.getElementNbParameters();
       parametersString_ = new string[nbParam_+1];
-      //      parmelaOk_ = true;
-        registerAcceptableSoftware(nomDeLogiciel::parmela, TBoolOk);
+      //        registerAcceptableSoftware(nomDeLogiciel::parmela, TBoolOk);
     }
 
 void elementCell::setDefaultValues()
 {
-    defaultLabel_ = "cell";
+    defaultSpecificName_ = "cell";
     initialPhaseDef_ = 0.0;
     acceleratingFieldDef_ = 1.0;
@@ -31 +30 @@
 void elementCell::setDefaults()
 {
-    label_ = defaultLabel_;
+    specificName_ = defaultSpecificName_;
     initialPhase_ = initialPhaseDef_;
     acceleratingField_ = acceleratingFieldDef_;
@@ -45 +44 @@
    int compteur = -1;
     parametersString_[++compteur] = mixedTools::intToString(nbParam_);
-  parametersString_[++compteur] = label_;
+  parametersString_[++compteur] = specificName_;
     parametersString_[++compteur] = mixedTools::doubleToString(lenghtElem_);
     parametersString_[++compteur] = mixedTools::doubleToString(aperture_);
@@ -78 +77 @@
       }
 
-    label_ = param[++compteur];
+    specificName_ = param[++compteur];
     lenghtElem_ = atof(param[++compteur].c_str());
     aperture_ = atof(param[++compteur].c_str());
@@ -90 +89 @@
   }
 
-string elementCell::parmelaOutputFlow() const
-  {
-    ostringstream sortie;
-    // on prend les troncatures tmax et rmax à 3 sigmas 
-    sortie << "CELL /l=" << lenghtElem_ << "  /aper=" << aperture_ << endl;
-    sortie << "  /iout=1  /phi0=" << initialPhase_ << " /E0=" << acceleratingField_ << endl;
-    sortie << " /nc=1 /dwtmax=" << phaseStepMax_ << " /sym=-1" << endl;
-    sortie << "CFIELD 1" << endl;
-    sortie << acceleratingShapeFile_ << endl;
-    if ( focusingMagFile_ != "") {
-      sortie << "POISSON /zoff=" << offsetMag_ << " /rmult=" << scaleFactor_ << endl;
-      sortie << focusingMagFile_ << endl;
-    }
+// string elementCell::parmelaOutputFlow() const
+//   {
+//     ostringstream sortie;
+//     sortie << "CELL /l=" << lenghtElem_ << "  /aper=" << aperture_ << endl;
+//     sortie << "  /iout=1  /phi0=" << initialPhase_ << " /E0=" << acceleratingField_ << endl;
+//     sortie << " /nc=1 /dwtmax=" << phaseStepMax_ << " /sym=-1" << endl;
+//     sortie << "CFIELD 1" << endl;
+//     sortie << acceleratingShapeFile_ << endl;
+//     if ( focusingMagFile_ != "") {
+//       sortie << "POISSON /zoff=" << offsetMag_ << " /rmult=" << scaleFactor_ << endl;
+//       sortie << focusingMagFile_ << endl;
+//     }
 
-    return sortie.str();
-  }
+//     return sortie.str();
+//   }
 
 
@@ -112 +110 @@
     ostringstream sortie;
     //    sortie << elementName_.getElementType()  << endl;
-    sortie << elementName_.getElementLabel() << endl;
-    sortie  << label_ << endl;
+    sortie << elementName_.getGenericLabel() << endl;
+    sortie  << specificName_ << endl;
     sortie << lenghtElem_ << " " << aperture_ << endl;
     sortie << initialPhase_ << "  " << acceleratingField_ << endl;
@@ -123 +121 @@
   }
 
+
+vector< pair<string, vector<string> > > elementCell::parametersToSoftware () const {
+  vector< pair<string, vector<string> > >  sortie;
+  sortie.push_back( pair<string, vector<string> >("labelsGenericSpecific",  vector<string>() ) );
+  sortie.back().second.push_back(elementName_.getGenericLabel());
+  sortie.back().second.push_back(specificName_);
+  sortie.push_back( pair<string, vector<string> >("lenghtAperture",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString(lenghtElem_));
+  sortie.back().second.push_back(mixedTools::doubleToString( aperture_));
+  sortie.push_back( pair<string, vector<string> >("phaseInitialStepmax",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString( initialPhase_));
+  sortie.back().second.push_back(mixedTools::doubleToString( phaseStepMax_));
+  sortie.push_back( pair<string, vector<string> >("fieldValueFile",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString( acceleratingField_));
+  sortie.back().second.push_back(acceleratingShapeFile_);
+  sortie.push_back( pair<string, vector<string> >("MagFocusingFileOffsetScale",  vector<string>() ) );
+  sortie.back().second.push_back(focusingMagFile_);
+  sortie.back().second.push_back(mixedTools::doubleToString( offsetMag_));
+  sortie.back().second.push_back(mixedTools::doubleToString( scaleFactor_));
+
+  return sortie;
+}
+
+
 void elementCell::FileInput(ifstream& ifs)
 {
-  ifs >> label_;
+  ifs >> specificName_;
   ifs >> lenghtElem_ >>  aperture_;
   ifs >> initialPhase_ >> acceleratingField_;
@@ -139 +161 @@
 
 
-    txt += label_;
+    txt += specificName_;
     txt += "\nlength (cm) : ";
     txt += mixedTools::doubleToString(lenghtElem_);