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

trunk/SophyaPI/PIext/nomimagadapter.cc

@@ -11 +11 @@
 #include "pimgadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"
-#else
 #include "objfitter.h"
-#endif
 
 
@@ -62 +58 @@
 AnyDataObj* NOMAdapter_Image<T>::CloneDataObj(bool share)
 {
-#ifdef SANS_EVOLPLANCK
-FitsImage<T> * fima = dynamic_cast<FitsImage<T> *>(mImg);
-if (fima == NULL)   return( new Image<T>(*mImg ) );
-else return ( new FitsImage<T>(*fima) );
-#else
 return( new Image<T>(*mImg, share) );
-#endif
 }
 
@@ -76 +66 @@
 void NOMAdapter_Image<T>::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mImg->Write(pos,0,tag);
-#else
 string s = typeid(*mObj).name();
 cout << "NOMAdapter_Image<T>::SavePPF() - Error : Not supported for " << s << endl;
-#endif
 }
 
@@ -147 +131 @@
 AnyDataObj* NOMAdapter_Image<T>::FitResidusObj(GeneralFit& mfit)
 {
-#ifdef SANS_EVOLPLANCK
-RzImage* rzim = mImg->FitResidus(mfit);  
-ImageR4* im   = new ImageR4(*rzim);
-return im;
-#else
 Image<T>* im = new Image<T>(ObjectFitter::FitResidus(*mImg,mfit));
 return im;
-#endif
 }
 
@@ -160 +138 @@
 AnyDataObj* NOMAdapter_Image<T>::FitFunctionObj(GeneralFit& mfit)
 {
-#ifdef SANS_EVOLPLANCK
-RzImage* rzim = mImg->FitFunction(mfit);  
-ImageR4* im   = new ImageR4(*rzim);
-return im;
-#else
 Image<T>* im = NULL;
 //im = new Image<T>(ObjectFitter::FitFunction(*mImg,mfit));
 return im;
-#endif
 }
 
@@ -236 +208 @@
 #pragma define_template NTupInt_Image<r_4>
 #pragma define_template NTupInt_Image<r_8>
-#ifdef SANS_EVOLPLANCK
-#pragma define_template NOMAdapter_Image<int_2>
-#pragma define_template NTupInt_Image<int_2>
-#endif
 #endif
 #if defined(ANSI_TEMPLATES) || defined(__ANSI_TEMPLATES__) || defined(__GNU_TEMPLATES__) 
@@ -250 +218 @@
 template class NTupInt_Image<r_4>;
 template class NTupInt_Image<r_8>;
-#ifdef SANS_EVOLPLANCK
-template class NOMAdapter_Image<int_2>;
-template class NTupInt_Image<int_2>;
 #endif
-#endif
-
-
+
+