Changeset 203 in PSPA

Timestamp:

Dec 18, 2012, 7:31:04 PM (12 years ago)

Author:

lemeur

Message:

correction dans bend

Location:

Interface_Web/trunk/pspaWT/src

Files:

• GWt_pspaApplication.cc (modified) (2 diffs)
• elementBend.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -682 +682 @@
 {
   vector<bareParticle>& partic = beam->getParticleVector();
-  new WText(nameOfCase_ + " : emittance parmela"+ " nb partic. "+ mixedTools::intToString(partic.size()), toto);
+  new WText(nameOfCase_ + " : espace de phase x,x' "+ " nb partic. "+ mixedTools::intToString(partic.size()), toto);
   WStandardItemModel *model = new WStandardItemModel(partic.size(), 3, toto);
   //    model->setHeaderData(0, WString("X"));
@@ -749 +749 @@
   //  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
   //  toto->clear();
-  new WText(nameOfCase_ + " : emittance transport", toto);
+  new WText(nameOfCase_ + " : emittance x,x' ", toto);
   vector<double> xcor;
   vector<double> ycor;

Interface_Web/trunk/pspaWT/src/elementBend.cc

@@ -2 +2 @@
 #include "mixedTools.h"
 #include "mathematicalConstants.h"
-
+#include "PhysicalConstants.h"
 elementBend::elementBend() :  abstractElement() 
 {
@@ -78 +78 @@
   {
     ostringstream sortie;
-    
-    sortie << "BEND /l=" << lenghtElem_ << "  / aper=" << aperture_ << "  / iout=1 / wr=" << momentum_ << " /alpha=" << angleDeg_ << " / beta1=" << beta1_;
+    // il faut entrer l'energie cinetique
+    double ecin = momentum_/ERESTMeV;
+    ecin = ecin*ecin + 1.;
+    ecin = ERESTMeV*(sqrt(ecin) - 1.0);
+    sortie << "BEND /l=" << lenghtElem_ << "  / aper=" << aperture_ << "  / iout=1 / wr=" << ecin << " /alpha=" << angleDeg_ << " / beta1=" << beta1_;
     sortie << " / beta2=" << beta1_;
     return sortie.str();