Changeset 435 in PSPA

Timestamp:

Nov 25, 2013, 11:11:05 AM (10 years ago)

Author:

lemeur

Message:

corrections traces (divisions par 0)

Location:

Interface_Web/trunk/pspaWT

Files:

• sources/controler/src/particleBeam.cc (modified) (7 diffs)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (1 diff)
• workingArea/pspa.save (modified) (1 diff)

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

@@ -14 +14 @@
 particleBeam::particleBeam()  {
   P0Transport_ = 0.0;
+  clear();
   particleRepresentationOk_ = false;
   momentRepresentationOk_ = false;
@@ -233 +234 @@
 
   double gref = referenceParticle_.getGamma() - 1.0;
-  double P_reference_MeV_sur_c = sqrt( gref*(gref+2) );
+
+  double P_reference_MeV_sur_c =  gref*(gref+2);
+
+  if ( P_reference_MeV_sur_c > 0.0 ) P_reference_MeV_sur_c = sqrt( P_reference_MeV_sur_c );
+  else P_reference_MeV_sur_c = 0.0;
 
   cout << " gref = " << gref << " P_reference_MeV_sur_c = " << P_reference_MeV_sur_c << endl;
@@ -266 +271 @@
     begamz = begam.getComponent(2);
     g = gamma -1.0;
-    PMeVsc = sqrt( g*(g+2) );
-    del = 100.0 * ( PMeVsc -  P_reference_MeV_sur_c ) / P_reference_MeV_sur_c ; // en %
+    PMeVsc =  g*(g+2);
+    if ( PMeVsc > 0.)  PMeVsc = sqrt( PMeVsc );
+    else PMeVsc = 0.0;
+
+
+
 
     //    dz = begamz * cdt / gamma;
@@ -274 +283 @@
 
     part[0] = positionDeployee.getComponent(0);
-    part[1] = begam.getComponent(0)/begamz;
     part[2] = positionDeployee.getComponent(1);
-    part[3] = begam.getComponent(1)/begamz;
     part[4] = positionDeployee.getComponent(2);
-    part[5] = del;
+
+    if ( begamz == 0.0 ) {
+      part[1] = 0.0;
+      part[3] = 0.0;
+    } else {
+      part[1] = begam.getComponent(0)/begamz;
+      part[3] = begam.getComponent(1)/begamz;
+    }
+
+    if ( P_reference_MeV_sur_c > 0.0 ) {
+      del = 100.0 * ( PMeVsc -  P_reference_MeV_sur_c ) / P_reference_MeV_sur_c ; // en %
+      part[5] = del;
+    } else {
+      if ( PMeVsc > 0.0 ) part[5] = 100.;
+      else part[5] = 0.0;
+    }
 
     for ( j = 0; j < 6; j++) {
@@ -285 +307 @@
         {
           auxm = part.at(m) - centroid_.at(m);
-
           ( matrice.at(j) ).at(m) += auxj*auxm;
-          //      ( rij_transportMoments_.at(j) ).at(m) += auxj*auxm;
-
-
-          //          cout << " j= " << j << " m= " << m << " rjm= " << ( rij_transportMoments_.at(j) ).at(m) << endl;
         }
     }
@@ -299 +316 @@
   double facmoy = 1.0/double( relativePartic_.size() );
   for ( j = 0; j < 6; j++) {
-        ( matrice.at(j) ).at(j) = sqrt(( matrice.at(j) ).at(j) * facmoy );
+    double aux = ( matrice.at(j) ).at(j);
+    if ( aux > 0.0 ) ( matrice.at(j) ).at(j) = sqrt(aux * facmoy );
+    else ( matrice.at(j) ).at(j) = 0.0;
   }
 
@@ -306 +325 @@
     for (m=0; m < j; m++) {
       auxm = ( matrice.at(m) ).at(m);
-      (  matrice.at(j) ).at(m) *= facmoy/(auxj * auxm);
-    }
+      if ( auxm != 0.0 && auxj != 0.0  ) ( matrice.at(j) ).at(m) *= facmoy/(auxj * auxm);
+      else ( matrice.at(j) ).at(m) = 0.0;
+    }     
   }
     

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -27 +27 @@
 #include <Wt/WMessageBox>
 
-#define HAS_IMAGEMAGIC 1
+//#define HAS_IMAGEMAGIC 1
 
 using namespace Wt::Chart;

Interface_Web/trunk/pspaWT/workingArea/pspa.save

@@ -1 +1 @@
  globals 
 2998.65 1 100000 10
+ lattice 
+CIRCULAR 0 0 0
 rfgun
 rfgun01