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

trunk/SophyaPI/PIext/basexecut.cc

@@ -24 +24 @@
 #include "datatable.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#else
 #include "tvector.h"
-#endif
 
 
@@ -95 +91 @@
   mImgApp->RedirectStdOutErr(false);
                                     --------DEL  */
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    tokens.erase(tokens.begin());
-    fuf(tokens);
-  }  CATCH(merr) {
-    fflush(stdout); 
-    string es = PeidaExc(merr);
-    cerr << "\n PIABaseExecutor: Call UserFunc  Exception :" << merr << es;
-    cout << endl; 
-    }
-#else
   try {
     tokens.erase(tokens.begin());
@@ -122 +107 @@
     return(-79);
   }
-#endif
 /*DEL----- Plus besoin en multi-thread ? / Reza 06/01/2004 
   mImgApp->RedirectStdOutErr(red);
@@ -732 +716 @@
   }
 
-#ifndef SANS_EVOLPLANCK
 /* Lecture matrice/vecteur depuis fichier ASCII  */
 else if ((kw == "mtxfrascii") || (kw == "vecfrascii") ) {
@@ -788 +771 @@
 }
   
-#endif
 
 else if (kw == "fillnt" ) {
@@ -970 +952 @@
 usage += "\n  Related commands: ntloop fillnt ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
-#ifndef SANS_EVOLPLANCK
 kw = "mtxfrascii";
 usage = "Reads a matrix from an ASCII file (TMatrix<r_8>)";
@@ -986 +967 @@
 usage += "\n  Related commands:  mtxfrascii vecfrascii ntfrascii ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
-#endif
 
 kw = "print";
@@ -1181 +1161 @@
 usage += "\n-         i,k,val,real,imag,mod,phas,teta,phi,_nl";
 usage += "\n- FITS Binary/ASCII table: fits column names,_nl";
-#ifdef SANS_EVOLPLANCK
-usage += "\n  ------ Eros Variable names (double) -------- ";
-usage += "\n- StarList: x,y,flux,fond,pixmax,flags,";
-usage += "\n-           xref,yref,fluxref,fondref,pixmaxref,_nl";
-#endif
 usage += "\n  ------ Other parameters -------- ";
 usage += "\nLoop parameters can be specified as I1[:I2[:DI]] for(int i=I1; i<I2; i+=DI)";