Changeset 231 in PSPA

Timestamp:

Jan 4, 2013, 11:23:21 AM (12 years ago)

Author:

lemeur

Message:

bugs et details

Location:

Interface_Web/trunk/pspaWT/src

Files:

• GWt_fit.cc (modified) (1 diff)
• GWt_pspaApplication.cc (modified) (3 diffs)
• particleBeam.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/src/GWt_fit.cc

@@ -24 +24 @@
   string var = *param;
   if ( var == "R11" ) {
+    nameEdit_->setCurrentIndex(0);
+  }
+  else if ( var == "R22" ) {
     nameEdit_->setCurrentIndex(1);
   }
-  else if ( var == "R22" ) {
+  else if ( var == "R12" ) {
     nameEdit_->setCurrentIndex(2);
   }
-  else if ( var == "R12" ) {
+  else if ( var == "R21" ) {
     nameEdit_->setCurrentIndex(3);
   }
-  else if ( var == "R21" ) {
+  else {
     nameEdit_->setCurrentIndex(4);
-  }
-  else {
-    nameEdit_->setCurrentIndex(5);
   }
   new WText(" value : ",dialog_->contents());

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -805 +805 @@
 
 
-  new WText(nameOfCase_ + " : emittance x,x' " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , toto);
+  new WText(nameOfCase_ + " : emittance x,x' " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , ellipseDialog->contents());
   new WBreak(toto);
-  new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", toto);
-  new WBreak(toto);
-  new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", toto);
-  new WBreak(toto);
-  new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", toto);
+  new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", ellipseDialog->contents());
+  new WBreak(ellipseDialog->contents());
+  new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", ellipseDialog->contents());
+  new WBreak(ellipseDialog->contents());
+  new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", ellipseDialog->contents());
   
   vector<double> xcor;
@@ -892 +892 @@
 
 WCartesianChart *chart = new WCartesianChart(toto);
-  chart->setTitle("Enveloppe");
+  chart->setTitle("titre");
 
   //  chart->initLayout();
@@ -915 +915 @@
 
   // chart->setBackground (WBrush(WColor("blue")));
-  chart->resize(800, 400); // WPaintedWidget must be given explicit size
+  chart->resize(500, 300); // WPaintedWidget must be given explicit size
 
 #ifdef HAS_IMAGEMAGIC

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -466 +466 @@
   }
     
+  ////////////////// si C21 = 1 , transport plante ! a voir //////////
+cout << " valeur initiale de  C21: " << ( matrice.at(1) ).at(0) << endl;
+  if ( ( matrice.at(1) ).at(0) >0.999999  ) {
+    ( matrice.at(1) ).at(0) = 0.999999;
+    cout << " j'ai fait la correction C21: " << ( matrice.at(1) ).at(0) << endl;
+  }
+  
+
   // les longueurs sont en cm
   // les angles en radians, on passe en mrad;