Changeset 487 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareMadx.cc

Timestamp:

Feb 5, 2014, 11:45:11 AM (10 years ago)

Author:

touze

Message:

ajout de quadrupole et sextupole

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareMadx.cc (modified) (3 diffs)

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

@@ -16 +16 @@
 {
   nameOfSoftware_ = new nomDeLogiciel("madx");
-
- // registerElement(nomdElements::RFgun,TBoolOk);
- //  registerElement(nomdElements::drift,TBoolOk);
- //  registerElement(nomdElements::mpole,TBoolOk);
 }
 
@@ -241 +237 @@
   if(keyword == "drift") {
     double length = atof(v.at(1).second.at(0).c_str());
-    os << label << ":" << " drift, l=" << 0.01*length<< ";" << endl;
+    os << label << ":" << " drift, l=" << 0.01*length << ";" << endl;
 
   } else if(keyword == "mpole") {
@@ -253 +249 @@
     os <<"};" << endl;
     
+  } else if(keyword == "qpole") {
+    double ln = atof(v.at(1).second.at(0).c_str());
+    double k1 = atof(v.at(1).second.at(1).c_str());
+    os << label << ":" << " quadrupole, l=" << ln << ", k1= " << k1 << ";" << endl;
+
+  } else if(keyword == "spole") {
+    double ln = atof(v.at(1).second.at(0).c_str());
+    double k2 = atof(v.at(1).second.at(1).c_str());
+    os << label << ":" << " sextupole, l=" << ln << ", k2= " << k2 << ";" << endl;
+
   } else {
     cout << "softwareMadx::inputFormat ERROR : element type= " << keyword << " not defined" << endl;