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

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

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

trunk/SophyaPI/PIext/servnobjm.cc

@@ -20 +20 @@
 #include "fct2dfit.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
 #include "matharr.h"
 #include "pitvmaad.h"
-#endif
 
 #include "ntuple.h"
@@ -70 +65 @@
 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)))  
+  if (typeid(*o) == typeid(*((*it).obj)))  
      throw(DuplicateIdExc("Services2NObjMgr::RegisterClass() - Duplicate class"));
-#endif
+
 dataobj_adapter oba;
 oba.obj = o;
@@ -215 +207 @@
   for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
 } 
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc()  Exception :" << merr << es;
-  delete vpy;
-  vpy = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -234 +215 @@
   vpy = NULL;
 }
-#endif
 
 if (vpy) {
@@ -286 +266 @@
   }
 }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc2D()  Exception :" << merr << es;
-  delete mtx;  mtx = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -303 +273 @@
   delete mtx;  mtx = NULL;
 }
-#endif
 
 if (mtx) {
@@ -348 +317 @@
  DVList::ValList::const_iterator it;
  for(it = varlist.Begin(); it != varlist.End(); it++) {
-#ifdef SANS_EVOLPLANCK
-   MuTyV mtv = (*it).second;
-   double value = (double)(mtv);
-#else
    double value = (double)((*it).second.elval);
-#endif
    string name_var = (*it).first;
    fprintf(fip,"double %s = %.17f;\n",name_var.c_str(),value);
@@ -408 +372 @@
 
 // Creation NTuple 
-char* ntn[4] = {"expx","expy","expex","expey",};
+const char* ntn[4] = {"expx","expy","expex","expey",};
 NTuple* nt = NULL;
 bool haserr = false;
@@ -447 +411 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expz"};
+const char* ntn[3] = {"expx","expy","expz"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -486 +450 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expw"};
+const char* ntn[3] = {"expx","expy","expw"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -520 +484 @@
 if (!mImgapp)  return; 
 
-char* ntn[4] = {"expx","expy","expz","expw"};
+const char* ntn[4] = {"expx","expy","expz","expw"};
 NTuple* nt = new NTuple(4,ntn);  // Creation NTuple
 
@@ -571 +535 @@
   // Pas de remise a zero ! h1->Zero();
 } else {
-  char* ntn[2]= {"hxval", "hwt"};
+  const char* ntn[2]= {"hxval", "hwt"};
   nt = new NTuple(2,ntn);  // Creation NTuple 
 }
@@ -624 +588 @@
   // Pas de remise a zero ! h2->Zero();
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -688 +652 @@
   hp_already_exist = true;
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -741 +705 @@
   }
 
-char* ntn[2]= {"vi", "vv"};
+const char* ntn[2]= {"vi", "vv"};
 NTuple* nt = new NTuple(2,ntn);  // Creation NTuple 
 
@@ -790 +754 @@
   }
 
-char* ntn[3]= {"mi", "mj", "mv"};
+const char* ntn[3]= {"mi", "mj", "mv"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple 
 
@@ -836 +800 @@
 // if (nomvec.length() < 1) nomvec = "/tmp/expvec";
 
-char* ntn[2]= {"vecval", "vecwt"};
+const char* ntn[2]= {"vecval", "vecwt"};
 nt = new NTuple(1,ntn);  // Creation NTuple
  
@@ -933 +897 @@
   }  
 if (nt == NULL) {
-  char* ntn[4]= {"x", "y","z","t"};
+  const char* ntn[4]= {"x", "y","z","t"};
   nt = new NTuple(4,ntn);  // Creation NTuple 
   fgnnt = true;
@@ -987 +951 @@
     }  
   if (nt == NULL) {
-    char* ntn[4]= {"x", "y","z","t"};
+    const char* ntn[4]= {"x", "y","z","t"};
     nt = new NTuple(4,ntn);  // Creation NTuple 
     fgnnt = true;
@@ -1016 +980 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1031 +986 @@
   cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
@@ -1154 +1108 @@
 
 // Creation NTuple Buffer
-char* ntn[4]= {"x","y","f","e"};
+const char* ntn[4]= {"x","y","f","e"};
 NTuple*nt = new NTuple(4,ntn);
 
@@ -1301 +1255 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1316 +1261 @@
   cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire
@@ -1473 +1417 @@
 
 
-
-
-// SANS_EVOLPLANCK     Attention !
-#ifdef SANS_EVOLPLANCK
-#include "pclassids.h"
-
-/* --Methode-- */
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-switch (cid) {
-  case ClassId_Poly1 : 
-    return("Poly1");
-  case ClassId_Poly2 : 
-    return("Poly2");
-  case ClassId_Matrix : 
-    return("Matrix");
-  case ClassId_Vector : 
-    return("Vector");
-
-  case ClassId_DVList : 
-    return("DVList");
-
-  case ClassId_Histo1D : 
-    return("Histo1D");
-  case ClassId_Histo2D : 
-    return("Histo2D");
-  case ClassId_HProf : 
-    return("HProf");
-  case ClassId_HistoErr : 
-    return("HistoErr");
-  case ClassId_NTuple : 
-    return("NTuple");
-  case ClassId_XNTuple : 
-    return("XNTuple");
-  case ClassId_GeneralFitData : 
-    return("GeneralFitData");
-
-  case ClassId_Image : 
-    return("RzImage");
-  case ClassId_Image + kuint_1 : 
-    return("ImageU1");
-  case ClassId_Image + kint_1 : 
-    return("ImageI1");
-  case ClassId_Image + kuint_2 : 
-    return("ImageU2");
-  case ClassId_Image + kint_2 : 
-    return("ImageI2");
-  case ClassId_Image + kuint_4 : 
-    return("ImageU4");
-  case ClassId_Image + kint_4 : 
-    return("ImageI4");
-  case ClassId_Image + kr_4 : 
-    return("ImageR4");
-  case ClassId_Image + kr_8 : 
-    return("ImageR8");
-  case ClassId_ZFidu : 
-    return("ZFidu");
-
-  case ClassId_StarList : 
-    return("StarList");
-  case ClassId_Transfo : 
-    return("Transfo");
-  case ClassId_PSF : 
-    return("PSF");
-
-
-// - Ajout objet PPF
-  default:
+const char* Services2NObjMgr::PClassIdToClassName(int cid)
+{
     return("AnyDataObj");
-  }
-}  
-
-#else
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-    return("AnyDataObj");
-}
-#endif
+}