Changeset 111 in PSPA for Interface_Web/trunk/pspaWT/src/particleBeam.cc

Timestamp:

Nov 27, 2012, 6:45:29 PM (12 years ago)

Author:

lemeur

Message:

tests de bonne execution de parmela

File:

• Interface_Web/trunk/pspaWT/src/particleBeam.cc (modified) (7 diffs)

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -8 +8 @@
 
 
-void particleBeam::setFromParmela(double referencefrequency)
+bool particleBeam::setFromParmela(double referencefrequency)
 {
   unsigned int k;
@@ -19 +19 @@
     {
       cerr << " particleBeam::setFromParmela() erreur a l'ouverture du fichier" << nomfilefais  << endl;; 
-      exit(0);
+      return false;
     }
   else cout << " particleBeam::setFromParmela() : ouverture du fichier " << nomfilefais << endl; 
@@ -98 +98 @@
     }
   particleRepresentationOk_ = true;
-  buildMomentRepresentation();
+  //  buildMomentRepresentation();
+  return true;
 }
 
@@ -304 +305 @@
 }
 
-void  particleBeam::setFromTransport(ifstream& inp, unsigned nblignes)
+bool  particleBeam::setFromTransport(ifstream& inp, unsigned nblignes)
   {
     unsigned k;
@@ -352 +353 @@
 
      momentRepresentationOk_ = true;
+     return true;
   }
 
@@ -370 +372 @@
   double alpha = -r / rac;
   double beta = xm / ( ym * rac);
-  double gamma = ym / ( xm * rac );
+  //  double gamma = ym / ( xm * rac );
   double epsil = xm * ym * rac;
 
@@ -399 +401 @@
     }
 
-  for ( k=0; k < nbintv; k++)
+  for ( k=0; k <= nbintv; k++)
     {
       x = xm - k*pas;