Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/elementBeam.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/elementBeam.cc (modified) (9 diffs)

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

@@ -10 +10 @@
     parametersString_ = new string[nbParam_+1];
     //  transportOk_ = true;
-    registerAcceptableSoftware(nomDeLogiciel::transport, TBoolOk);
+    //    registerAcceptableSoftware(nomDeLogiciel::transport, TBoolOk);
 }
 
@@ -16 +16 @@
 
 void elementBeam::setDefaultValues() {
-    defaultLabel_ = "beam";
+    defaultSpecificName_ = "beam";
     xDef_ = 0.0;
     xpDef_ = 0.0;
@@ -27 +27 @@
 
 void elementBeam::setDefaults() {
-    label_ = defaultLabel_;
+    specificName_ = defaultSpecificName_;
     x_ = xDef_;
     xp_ = xpDef_;
@@ -41 +41 @@
     int compteur = -1;
     parametersString_[++compteur] = mixedTools::intToString(nbParam_);
-    parametersString_[++compteur] = label_;
+    parametersString_[++compteur] = specificName_;
     parametersString_[++compteur] = mixedTools::doubleToString(x_);
     parametersString_[++compteur] = mixedTools::doubleToString(xp_);
@@ -55 +55 @@
     return parametersString_;
 }
+
+
+
 
 void elementBeam::setParametersString(string* param) {
@@ -70 +73 @@
     }
     
-    label_ = param[++compteur];
+    specificName_ = param[++compteur];
     x_ = atof(param[++compteur].c_str());
     xp_ = atof(param[++compteur].c_str());
@@ -80 +83 @@
 }
 
-string elementBeam::parmelaOutputFlow() const
-{
-    ostringstream sortie;
-    cout << " BEAM sortie parmela non programmee " << endl;
-    return sortie.str();
-}
+// string elementBeam::parmelaOutputFlow() const
+// {
+//     ostringstream sortie;
+//     cout << " BEAM sortie parmela non programmee " << endl;
+//     return sortie.str();
+// }
 
-string elementBeam::transportOutputFlow() const {
-    ostringstream sortie;
-    beam2Moments moments(x_, xp_, y_, yp_, dl_, del_);
-    cout << " elementBeam::transportOutputFlow(), p0 = " << p0_ << endl;
-    sortie << label_ << ":" << moments.writeToTransportInput(p0_) << endl;
-    return sortie.str();
-}
+// string elementBeam::transportOutputFlow() const {
+//     ostringstream sortie;
+//     beam2Moments moments(x_, xp_, y_, yp_, dl_, del_);
+//     cout << " elementBeam::transportOutputFlow(), p0 = " << p0_ << endl;
+//     sortie << specificName_ << ":" << moments.writeToTransportInput(p0_) << endl;
+//     return sortie.str();
+// }
 
 string elementBeam::FileOutputFlow() const {
     ostringstream sortie;
     // sortie << elementName_.getElementType() << endl;
-    sortie << elementName_.getElementLabel() << endl;
-    sortie  << label_ << endl;
+    sortie << elementName_.getGenericLabel() << endl;
+    sortie  << specificName_ << endl;
     sortie << x_ << "  " << xp_ << " " <<  y_  << " " <<  yp_  << endl;
     sortie << dl_ << "  " << del_ << " " <<  p0_  << endl;
@@ -106 +109 @@
 }
 
+vector< pair<string, vector<string> > > elementBeam::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> >("transverseCoordinates",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString(x_));
+  sortie.back().second.push_back(mixedTools::doubleToString(xp_));
+  sortie.back().second.push_back(mixedTools::doubleToString(y_));
+  sortie.back().second.push_back(mixedTools::doubleToString(xp_));
+  sortie.push_back( pair<string, vector<string> >("longitudinalCoordinates",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString(dl_));
+  sortie.back().second.push_back(mixedTools::doubleToString(del_));                 
+  sortie.push_back( pair<string, vector<string> >("momentum",  vector<string>() ) );
+  sortie.back().second.push_back(mixedTools::doubleToString(p0_));
+  return sortie;
+}
+
+
 void elementBeam::elementBeam::FileInput(ifstream& ifs) {
-    ifs >> label_;
+    ifs >> specificName_;
     ifs >> x_ >> xp_ >>  y_ >> yp_;
     ifs >> dl_ >> del_ >> p0_;
@@ -118 +140 @@
 string elementBeam::print() {
     string txt = "";
-    txt += label_;
+    txt += specificName_;
     txt += "\n 1/2 horizontal beam extend rms (cm) : ";
     txt += mixedTools::doubleToString(x_);