Changeset 495 in Sophya for trunk/SophyaPI/PIext/servnobjm.cc

Timestamp:

Oct 21, 1999, 8:58:45 PM (26 years ago)

Author:

ercodmgr

Message:

Portage -> DPPlanck , Reza+cmv 21/10/99

File:

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

trunk/SophyaPI/PIext/servnobjm.cc

@@ -23 +23 @@
 #include "ntuple.h"
 #include "cimage.h"
-#include "fitsimage.h"
 
 #include "histos.h"
@@ -62 +61 @@
 ObjAdaptList::iterator it;
 for(it = objadaplist.begin(); it != objadaplist.end(); it++) 
+#ifdef SANS_EVOLPLANCK
     if (typeid(*o) == typeid(*((*it).obj)))  THROW(dupIdErr);
-
+#else
+    if (typeid(*o) == typeid(*((*it).obj)))  
+     throw(DuplicateIdExc("Services2NObjMgr::RegisterClass() - Duplicate class"));
+#endif
 dataobj_adapter oba;
 oba.obj = o;
@@ -182 +185 @@
 double xx;
 double dx = (xmax-xmin)/np;
+#ifdef SANS_EVOLPLANCK
 TRY {
   for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
@@ -193 +197 @@
   vpy = NULL;
   } ENDTRY;
-
+#else
+try {
+  for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
+}
+catch ( PException exc ) {
+  fflush(stdout); 
+  cout << endl; 
+  cerr << endl;
+  cerr << "Services2NObjMgr::PlotFunc()  Exception :"  << exc.Msg() << endl; 
+  delete vpy;
+  vpy = NULL;
+}
+#endif
 
 if (vpy) {
@@ -240 +256 @@
 double dy = (ymax-ymin)/npy;
 // printf(" -- DBG -- %d %d , %g %g , %g %g \n", npx, npy, xmin, xmax, ymin, ymax);
+#ifdef SANS_EVOLPLANCK
 TRY {
   for(j=0; j<npy; j++) {
@@ -256 +273 @@
   delete mtx;  mtx = NULL;
   } 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); 
+  cout << endl; 
+  cerr << endl;
+  cerr << "Services2NObjMgr::PlotFunc2D()  Exception :"  << exc.Msg() << endl; 
+  delete mtx;  mtx = NULL;
+}
+#endif
 
 if (mtx) {