Changeset 3572 in Sophya for trunk/SophyaPI/PIext/nomhistadapter.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/nomhistadapter.cc (modified) (11 diffs)

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -16 +16 @@
 #include "strutilxx.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
 // Pour les DataTable ( Depuis Avril 2005 )
 #include "datatable.h"
 #include "swppfdtable.h"
-#endif
 
 //-----------------------------------------------------------------------------
@@ -139 +137 @@
 void NOMAdapter_Histo::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mHis->Write(pos,0,tag);
-#else
 ObjFileIO<Histo> fio(mHis);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -204 +196 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitResidus(mfit); 
-#else
 h = new Histo(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h;
 }
@@ -215 +203 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitFunction(mfit); 
-#else
 h = new Histo(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h;
 }
@@ -316 +300 @@
 void NOMAdapter_Histo2D::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mHis->Write(pos,0,tag);
-#else
 ObjFileIO<Histo2D> fio(mHis);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -389 +367 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h2;
 }
@@ -400 +374 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h2;
 }
@@ -555 +525 @@
 void NOMAdapter_NTuple::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mNt->Write(pos,0,tag);
-#else
 ObjFileIO<NTuple> fio(mNt);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -571 +535 @@
 char buff[128];
 if (opts[0] == "sizes") {
-  sprintf(buff, "%ld %ld", mNt->NEntry(), mNt->NVar());
+  sprintf(buff, "%ld %ld", (long)mNt->NEntry(), (long)mNt->NVar());
   return string(buff);   
 }
 else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
-  sprintf(buff, "%ld", mNt->NEntry());
+  sprintf(buff, "%ld", (long)mNt->NEntry());
   return string(buff);   
 }
 else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
-  sprintf(buff, "%ld", mNt->NVar());
+  sprintf(buff, "%ld", (long)mNt->NVar());
   return string(buff);   
 }
@@ -610 +574 @@
 return(mNt);
 // return( new NTupInt_NTuple(mNt) );
-}
-
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple
-//-------------------------------------------------------------------------
-
-/* --Methode-- */
-NOMAdapter_XNTuple::NOMAdapter_XNTuple(XNTuple* o)
-  : NObjMgrAdapter(o)
-{
-mNt = o;
-}
-
-/* --Methode-- */
-NOMAdapter_XNTuple::~NOMAdapter_XNTuple()
-{
-}
-
-/* --Methode-- */
-NObjMgrAdapter* NOMAdapter_XNTuple::Clone(AnyDataObj* o)
-{
-XNTuple* nt = dynamic_cast<XNTuple *>(o);
-if (nt) return ( new NOMAdapter_XNTuple(nt) );
-return ( new NObjMgrAdapter(o) );
-}
-
-/* --Methode-- */
-string NOMAdapter_XNTuple::GetDataObjType()
-{
-return ("XNTuple ");
-}
-
-/* --Methode-- */
-AnyDataObj* NOMAdapter_XNTuple::CloneDataObj(bool /*share*/)
-{
-return ( new XNTuple(*mNt) );
-}
-
-/* --Methode-- */
-void NOMAdapter_XNTuple::SavePPF(POutPersist& pos, string const & nom)
-{
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mNt->Write(pos,0,tag);
-#else
-ObjFileIO<XNTuple> fio(mNt);
-fio.Write(pos, nom);
-#endif
-}
-
-/* --Methode-- */
-void NOMAdapter_XNTuple::Print(ostream& os, int lev)
-{
-// os << mNt->Info();
-mNt->Show(os);
-}
-
-
-/* --Methode-- */
-NTupleInterface* NOMAdapter_XNTuple::GetNTupleInterface(bool& adel)
-{
-adel = false;
-return(mNt);
 }
 
@@ -751 +651 @@
 char buff[128];
 if (opts[0] == "sizes") {
-  sprintf(buff, "%ld %ld", mDT->NEntry(), mDT->NVar());
+  sprintf(buff, "%ld %ld", (long)mDT->NEntry(), (long)mDT->NVar());
   return string(buff);   
 }
 else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
-  sprintf(buff, "%ld", mDT->NEntry());
+  sprintf(buff, "%ld", (long)mDT->NEntry());
   return string(buff);   
 }
 else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
-  sprintf(buff, "%ld", mDT->NVar());
+  sprintf(buff, "%ld", (long)mDT->NVar());
   return string(buff);   
 }