Changeset 500 in Sophya for trunk

Timestamp:

Oct 22, 1999, 8:12:02 PM (26 years ago)

Author:

ercodmgr

Message:

Suite portage DPC - OK Reza 22/10/99

File:

• trunk/SophyaPI/PIext/servnobjm.cc (modified) (11 diffs)

trunk/SophyaPI/PIext/servnobjm.cc

@@ -185 +185 @@
 double xx;
 double dx = (xmax-xmin)/np;
+
+try {
+  for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
+} 
 #ifdef SANS_EVOLPLANCK
-TRY {
-  for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
-} CATCH(merr) {
+CATCH(merr) {
   fflush(stdout); 
   cout << endl; 
@@ -198 +200 @@
   } ENDTRY;
 #else
-try {
-  for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
-}
 catch ( PException exc ) {
   fflush(stdout); 
@@ -256 +255 @@
 double dy = (ymax-ymin)/npy;
 // printf(" -- DBG -- %d %d , %g %g , %g %g \n", npx, npy, xmin, xmax, ymin, ymax);
-#ifdef SANS_EVOLPLANCK
-TRY {
+try {
   for(j=0; j<npy; j++) {
     yy = ymin+dy*j; 
@@ -265 +263 @@
     }
   }
-} CATCH(merr) {
+}
+#ifdef SANS_EVOLPLANCK
+CATCH(merr) {
   fflush(stdout); 
   cout << endl; 
@@ -274 +274 @@
   } ENDTRY;
 #else
-try {
-  for(j=0; j<npy; j++) {
-    yy = ymin+dy*j; 
-    for(i=0; i<npx; i++) {
-      xx = xmin+dx*i;
-      (*mtx)(j, i) = f(xx, yy);
-    }
-  }
-}
 catch ( PException exc ) {
   fflush(stdout); 
@@ -864 +855 @@
 if (dk <= 0) dk = 1;
 
-TRY  {
+try  {
   double* xn;
   int kmax = k2;
@@ -877 +868 @@
     }
  }
+#ifdef SANS_EVOLPLANCK
 CATCH(merr) {
   fflush(stdout); 
@@ -884 +876 @@
   cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << merr << es;
   } ENDTRY;
+#else
+catch ( PException exc ) {
+  fflush(stdout); 
+  cout << endl; 
+  cerr << endl;
+  cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << exc.Msg() << endl; 
+}
+#endif
 
 if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
@@ -1046 +1046 @@
 if (k2 > objnt->NbLines()) k2 = objnt->NbLines();
 if (dk <= 0) dk = 1;
-TRY  {
+
+try  {
   double* xn;
   for(k=k1; k<k2; k += dk)    {
@@ -1061 +1062 @@
     }
  }
+#ifdef SANS_EVOLPLANCK
 CATCH(merr) {
   fflush(stdout); 
@@ -1068 +1070 @@
   cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << merr << es;
   } ENDTRY;
- 
+#else
+catch ( PException exc ) {
+  fflush(stdout); 
+  cout << endl; 
+  cerr << endl;
+  cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << exc.Msg() << endl; 
+}
+#endif
 
 if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire