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

trunk/SophyaPI/PIext/piinit.cc

@@ -11 +11 @@
 #include "nomimagadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#include "fitsimage.h"
-#include "nomstladapter.h"
-#else
 #include <complex>
 #include "nomtmatvecadapter.h"
@@ -35 +30 @@
 #include "piaversion.h"
 
-#endif
 
 int PIAppInitiator::FgInit = 0;
 
 PIAppInitiator::PIAppInitiator(PIStdImgApp * app)
-#ifdef SANS_EVOLPLANCK
- : PeidaStarRecoInitiator()
-#else
  : SambaInitiator()
-#endif
 {
   FgInit++;
@@ -63 +53 @@
   serv->RegisterClass(new DataTable, new NOMAdapter_DataTable );
   serv->RegisterClass(new SwPPFDataTable, new NOMAdapter_DataTable );
-  char* varenv=NULL;
-  if ( (varenv=getenv("PEIDA_TMP")) == NULL )   varenv=getenv("TMPDIR") ;
-  if (varenv)  XNTuple::SetSwapPath(varenv);
 
   serv->RegisterClass(new GeneralFitData, new NOMAdapter_GeneralFitData );
 
-#ifdef SANS_EVOLPLANCK
-  serv->RegisterClass(new Vector, new NOMAdapter_Vector );
-  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
-#else
 //  Octobre 2008 : prise en charge tableaux/matrice/vecteurs en uint_4 uint_8 
   serv->RegisterClass(new TArray<uint_2>, new NOMAdapter_TArray<uint_2> );
@@ -105 +88 @@
   serv->RegisterClass(new TVector<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
   serv->RegisterClass(new TMatrix<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
-#endif
 
   /*  Avril 2007 : Prise en charge des images par NOMAdapter_TMatrix  au lieu de
@@ -120 +102 @@
   serv->RegisterClass(new Image<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
 
-#ifdef SANS_EVOLPLANCK
-  serv->RegisterClass(new Image<uint_2>, new  NOMAdapter_Image<uint_2> );
-  serv->RegisterClass(new Image<int_2>, new  NOMAdapter_Image<int_2> );
-  serv->RegisterClass(new Image<int_4>, new  NOMAdapter_Image<int_4> );
-  serv->RegisterClass(new Image<r_4>, new  NOMAdapter_Image<r_4> );
-  serv->RegisterClass(new Image<r_8>, new  NOMAdapter_Image<r_8> );
-
-  serv->RegisterClass(new FitsImage<uint_2>, new  NOMAdapter_Image<uint_2> );
-  serv->RegisterClass(new FitsImage<int_2>, new  NOMAdapter_Image<int_2> );
-  serv->RegisterClass(new FitsImage<int_4>, new  NOMAdapter_Image<int_4> );
-  serv->RegisterClass(new FitsImage<r_4>, new  NOMAdapter_Image<r_4> );
-
-  serv->RegisterClass(new StarList, new NOMAdapter_StarList );
-#else
   serv->RegisterClass(new LocalMap<int_4>, new NOMAdapter_PixelMap<int_4> );
   serv->RegisterClass(new SphereThetaPhi<int_4>, new NOMAdapter_PixelMap<int_4> );
@@ -159 +127 @@
 
   SophyaInitiator::RegisterModule("PIext/piapp", PIAPP_VERSIONNUMBER);
-#endif  
 }