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

trunk/SophyaPI/PIext/piafitting.cc

@@ -25 +25 @@
 #include "hisprof.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
 #include "objfitter.h"
-#endif
 
 #include "piafitting.h"
@@ -42 +37 @@
 #include "nomgfdadapter.h"
 #include "nomimagadapter.h"
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#else
 #include "nomtmatvecadapter.h"
-#endif
 
 ////////////////////////////////////////////////////////////////////
@@ -854 +845 @@
 
 // Fit
-#ifdef SANS_EVOLPLANCK
-mParSave = mPar; mStepSave = mStep; mFixSave = mFix;
-mMinSave = mMin; mMaxSave = mMax;
-#else
 mParSave.Clone(mPar); mStepSave.Clone(mStep); mFixSave.Clone(mFix);
 mMinSave.Clone(mMin); mMaxSave.Clone(mMax);
-#endif
 mOptSave = mOpt;
 double c2r = -1.;
@@ -1218 +1204 @@
 , saveErrScale(1.),saveErrMin(0.), saveXC(0.), saveYC(0.)
 {
-#ifdef SANS_EVOLPLANCK
-COMPATIBLE_ASSERT(mFitter);
-#else
 ASSERT(mFitter);
-#endif
 
 int npar = mFitter->mNPar;