Changeset 488 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/elementRfgun.cc

Timestamp:

Feb 7, 2014, 2:00:55 PM (10 years ago)

Author:

lemeur

Message:

lecture fichier sauvegarde AML

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/elementRfgun.cc (modified) (5 diffs)

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

@@ -126 +126 @@
 // }
 
-string elementRfgun::FileOutputFlow() const
-{
-  ostringstream sortie;
-  // on prend les troncatures tmax et rmax à 3 sigmas 
-  //    sortie << elementName_.getElementType() << endl;
-  sortie << elementName_.getGenericLabel() << endl;
-  sortie  << specificName_ << endl;
-  sortie <<  nmacrop_ << "  " << sigma_t_ << "  " << sigma_r_ << endl;
-  sortie << emit_x_ << "  " << emit_y_ << endl; 
-  sortie << E_cin_ << " " << sigma_E_ << endl;
-  sortie << phaseStep_ << "  "  << totalCharge_ << endl; 
-  return sortie.str();
-}
+// string elementRfgun::FileOutputFlow() const
+// {
+//   ostringstream sortie;
+//   // on prend les troncatures tmax et rmax à 3 sigmas 
+//   //    sortie << elementName_.getElementType() << endl;
+//   sortie << elementName_.getGenericLabel() << endl;
+//   sortie  << specificName_ << endl;
+//   sortie <<  nmacrop_ << "  " << sigma_t_ << "  " << sigma_r_ << endl;
+//   sortie << emit_x_ << "  " << emit_y_ << endl; 
+//   sortie << E_cin_ << " " << sigma_E_ << endl;
+//   sortie << phaseStep_ << "  "  << totalCharge_ << endl; 
+//   return sortie.str();
+// }
 
 vector< pair<string, vector<string> > > elementRfgun::parametersToSoftware () const 
@@ -164 +164 @@
 }
 
-void elementRfgun::FileInput(ifstream& ifs)
-{
-  ifs >> specificName_;
-  ifs >> nmacrop_ >> sigma_t_ >> sigma_r_;
-  ifs >> emit_x_  >>  emit_y_; 
-  ifs >> E_cin_ >> sigma_E_;
-  ifs >> phaseStep_ >> totalCharge_;
-}
+// void elementRfgun::FileInput(ifstream& ifs)
+// {
+//   ifs >> specificName_;
+//   ifs >> nmacrop_ >> sigma_t_ >> sigma_r_;
+//   ifs >> emit_x_  >>  emit_y_; 
+//   ifs >> E_cin_ >> sigma_E_;
+//   ifs >> phaseStep_ >> totalCharge_;
+// }
 
 string elementRfgun::print() 
@@ -198 +198 @@
 void elementRfgun::InputRep(UAPNode* root)
 {
-  UAPNode* ele = root->addChild("element");
-  ele->addAttribute("name",specificName_);
-
+  // UAPNode* ele = root->addChild("element");
+  // ele->addAttribute("name",specificName_);
+  // UAPNode* node = NULL;
+  // node = ele->addChild("description");
+  // node->addAttribute("type",elementName_.getGenericLabel());
+  UAPNode* ele = setAMLelementHeader(root);
   UAPNode* node = ele->addChild("comment");
   node->addAttribute("type","RFgun");
@@ -217 +220 @@
   node->addChild("emittance_b")->addAttribute("design",txt);
   txt = mixedTools::doubleToString(E_cin_);
-  txt = mixedTools::doubleToString(E_cin_);
   node->addChild("total_energy")->addAttribute("design",txt);
   txt = mixedTools::doubleToString(sigma_E_);
@@ -232 +234 @@
 }
 
+void elementRfgun::FileAMLInput(UAPNode* entree) 
+{
+  if ( !checkAMLelementGenericName(entree) ) return;
+  UAPNode* beam = entree->getChildByName("beam");
+  AMLtools::readAMLParameterAttribut(beam, "n_particles", "design", nmacrop_);
+  AMLtools::readAMLParameterAttribut(beam, "sig_t", "design", sigma_t_);
+  AMLtools::readAMLParameterAttribut(beam, "emittance_a", "design", emit_x_);
+  AMLtools::readAMLParameterAttribut(beam, "emittance_b", "design", emit_y_);
+  AMLtools::readAMLParameterAttribut(beam, "total_energy", "design", E_cin_);
+  AMLtools::readAMLParameterAttribut(beam, "sig_e", "design", sigma_E_);
+  AMLtools::readAMLParameterAttribut(beam, "particle_charge", "design", totalCharge_);
+
+  AMLtools::readAMLParameterAttribut(entree, "sigma_r", "value", sigma_r_);
+  AMLtools::readAMLParameterAttribut(entree, "phaseStep", "value", phaseStep_);
+
+}