Index: /trunk/Cosmo/RadioBeam/brsrc.cc
===================================================================
--- /trunk/Cosmo/RadioBeam/brsrc.cc	(revision 3571)
+++ /trunk/Cosmo/RadioBeam/brsrc.cc	(revision 3572)
@@ -118,6 +118,6 @@
 NTuple BRSourceGen::Convert2Table(double freq0)
 {
-  char* nomsntsrc[9] = {"num","freq","freqred","amp","angrad","angdeg","phase",
-			"angyrad","angymin"};
+  const char* nomsntsrc[9] = {"num","freq","freqred","amp","angrad","angdeg","phase",
+                              "angyrad","angymin"};
   NTuple nt(9, nomsntsrc);
   double xnt[15];
Index: /trunk/Cosmo/RadioBeam/multicyl.cc
===================================================================
--- /trunk/Cosmo/RadioBeam/multicyl.cc	(revision 3571)
+++ /trunk/Cosmo/RadioBeam/multicyl.cc	(revision 3572)
@@ -33,5 +33,5 @@
 
 //-----------------------------------------------------------------------------
-MultiCylinders::MultiCylinders(char* fileName)
+MultiCylinders::MultiCylinders(const char* fileName)
 {
   adfg_ = false; src_ = NULL;
Index: /trunk/Cosmo/RadioBeam/multicyl.h
===================================================================
--- /trunk/Cosmo/RadioBeam/multicyl.h	(revision 3571)
+++ /trunk/Cosmo/RadioBeam/multicyl.h	(revision 3572)
@@ -28,5 +28,5 @@
   //   longueur @ f=2 ~ 64 (256*lambda/2 = 256*0.25)
  MultiCylinders(int nr=256, int ns=1024);
- MultiCylinders(char* filename);
+ MultiCylinders(const char* filename);
  ~MultiCylinders();
 
Index: /trunk/Cosmo/RadioBeam/treccyl.cc
===================================================================
--- /trunk/Cosmo/RadioBeam/treccyl.cc	(revision 3571)
+++ /trunk/Cosmo/RadioBeam/treccyl.cc	(revision 3572)
@@ -36,5 +36,5 @@
 static int test1cyl(string& ppfname);
 static int testmulticyl(string& ppfname);
-int ReadParam(char* fileName);
+int ReadParam(const char* fileName);
 
 //-----------------------------------------------------------
@@ -285,5 +285,5 @@
 
 //---------------------------------------------------------------------
-int ReadParam(char* fileName)
+int ReadParam(const char* fileName)
 {  
   DataCards dc;
Index: /trunk/Cosmo/SimLSS/cmvchkwhu.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvchkwhu.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvchkwhu.cc	(revision 3572)
@@ -48,5 +48,5 @@
 
  const int n = 11;
- char *vname[n] = {"k","tf","tfnw","tfnb","tfc","tfb"
+ const char *vname[n] = {"k","tf","tfnw","tfnb","tfc","tfb"
                   ,"hutf","hutfnw","hutfnb","hutfc","hutfb"};
  NTuple nt(n,vname);
Index: /trunk/Cosmo/SimLSS/cmvfitpk.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvfitpk.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvfitpk.cc	(revision 3572)
@@ -133,5 +133,5 @@
  POutPersist pos("cmvfitpk.ppf");
  const int nvar = 2*npar+1;
- char *vname[nvar] = {
+ const char *vname[nvar] = {
        "xi2"
        ,"b","a","oc","ob","ol","h","n"
Index: /trunk/Cosmo/SimLSS/cmvsinxsx.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvsinxsx.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvsinxsx.cc	(revision 3572)
@@ -75,5 +75,5 @@
  //--- Create NTuple
  const int nvar = 11;
- char *vname[nvar] = {"t","s","sn","sx","sx2","snx","snx2","asx","asx2","asnx","asnx2"};
+ const char *vname[nvar] = {"t","s","sn","sx","sx2","snx","snx2","asx","asx2","asnx","asnx2"};
  double xnt[nvar];
  NTuple nt(nvar,vname);
Index: /trunk/Cosmo/SimLSS/cmvtgrowth.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtgrowth.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtgrowth.cc	(revision 3572)
@@ -35,5 +35,5 @@
 
  const int n = 2;
- char *vname[n] = {"z","d1"};
+ const char *vname[n] = {"z","d1"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/cmvtluc.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtluc.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtluc.cc	(revision 3572)
@@ -56,5 +56,5 @@
  double norm3 = pow(norm,3.);
  const int n = 11;
- char *vname[n] = {
+ const char *vname[n] = {
    "z","hz","om","or","ol","ok","ot",
    "da","dl","dvc","vc0"
Index: /trunk/Cosmo/SimLSS/cmvtransf.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtransf.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtransf.cc	(revision 3572)
@@ -79,5 +79,5 @@
 
  const int n = 6;
- char *vname[n] = {"k","t","tnosc1","tnosc2","tnob","tcmbf"};
+ const char *vname[n] = {"k","t","tnosc1","tnosc2","tnob","tcmbf"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/cmvtstagn.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtstagn.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtstagn.cc	(revision 3572)
@@ -158,5 +158,5 @@
 
 del ntjack
-c++exec char *vname[2] = {"x","y"}; double xnt[2]; \
+c++exec const char *vname[2] = {"x","y"}; double xnt[2]; \
 NTuple ntjack(2,vname); \
 for(int i=0;i<xjack.Size();i++) \
Index: /trunk/Cosmo/SimLSS/cmvtstblack.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtstblack.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtstblack.cc	(revision 3572)
@@ -267,5 +267,5 @@
 
  const int n = 14;
- char *vname[n] = {"f","l","prf","prl","pdf","pdl","rrf","rrl","rdf","rdl","wrf","wrl","wdf","wdl"};
+ const char *vname[n] = {"f","l","prf","prl","pdf","pdl","rrf","rrl","rdf","rdl","wrf","wrl","wdf","wdl"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/cmvtstpk.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtstpk.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtstpk.cc	(revision 3572)
@@ -119,5 +119,5 @@
  //--------------------------
  const int n = 14;
- char *vname[n] = {
+ const char *vname[n] = {
    "k","pkini",
    "tf","pk0","pk",
Index: /trunk/Cosmo/SimLSS/cmvtstsch.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtstsch.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtstsch.cc	(revision 3572)
@@ -169,5 +169,5 @@
  //-------
  const int n = 3;
- char *vname[n] = {"m","f","mf"};
+ const char *vname[n] = {"m","f","mf"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/cmvtuniv.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtuniv.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtuniv.cc	(revision 3572)
@@ -184,5 +184,5 @@
  double norm3 = pow(norm,3.);
  const int n = 15;
- char *vname[n] = {
+ const char *vname[n] = {
    "z","hz","om","or","ol","ok","ot","ob",
    "dtc","dlc","da","dl",
@@ -269,5 +269,5 @@
 
  const int n = 8;
- char *vname[n] = {"z","d","di","dl","dp","zi","zl","zp"};
+ const char *vname[n] = {"z","d","di","dl","dp","zi","zl","zp"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/cmvtvarspec.cc
===================================================================
--- /trunk/Cosmo/SimLSS/cmvtvarspec.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/cmvtvarspec.cc	(revision 3572)
@@ -130,5 +130,5 @@
 //-----------------------------------------------------------------
  const int n = 2;
- char *vname[n] = {"k","pk"};
+ const char *vname[n] = {"k","pk"};
  NTuple nt(n,vname);
  double xnt[n];
Index: /trunk/Cosmo/SimLSS/genefluct3d.cc
===================================================================
--- /trunk/Cosmo/SimLSS/genefluct3d.cc	(revision 3571)
+++ /trunk/Cosmo/SimLSS/genefluct3d.cc	(revision 3572)
@@ -106,5 +106,5 @@
                 <<" D="<<dx<<","<<dy<<","<<dz<<endl;
  if(nx<=0 || dx<=0.) {
-   char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
+   const char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -228,5 +228,5 @@
  if(kredshref<0.) {
    if(Nz_<=0) {
-     char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
+     const char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
      cout<<bla<<endl; throw ParmError(bla);
    }
@@ -265,5 +265,5 @@
 
  if(cosmo_ == NULL || redsh_ref_<0.) {
-   char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
+   const char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -561,5 +561,5 @@
   else if(array_type==2) nvar = 4;
   else return;
-  char *vname[4] = {"t","z","re","im"};
+  const char *vname[4] = {"t","z","re","im"};
   float xnt[4];
   NTuple nt(nvar,vname);
@@ -852,14 +852,14 @@
 
  if(growth_ == NULL) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
    cout<<bla<<endl; throw ParmError(bla);
  }
  if(type_evol<1 || type_evol>2) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
 
  InterpFunc interpinv(loscom2zred_min_,loscom2zred_max_,loscom2zred_);
- unsigned short ok;
+ //unsigned short ok;
 
  //CHECK: Histo hgr(0.9*zred_[0],1.1*zred_[n-1],1000);
@@ -1421,5 +1421,5 @@
  if(type_evol<0) type_evol = 0;
  if(type_evol>2) {
-   char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -1436,5 +1436,5 @@
    //      Mlim ~ sqrt(DNu) * (Dlum)^2 / Dtrcom
    if(cosmo_ == NULL || redsh_ref_<0.| loscom2zred_.size()<1) {
-     char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
+     const char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
      cout<<bla<<endl; throw ParmError(bla);
    }
Index: /trunk/FrEROS/AnaLC/anafsv.cc
===================================================================
--- /trunk/FrEROS/AnaLC/anafsv.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/anafsv.cc	(revision 3572)
@@ -64,5 +64,5 @@
 
 
-char *Pgnm = "hanafsv";
+const char *Pgnm = "hanafsv";
 
 int main(int narg, char *arg[] )
Index: /trunk/FrEROS/AnaLC/courbe_nb.cc
===================================================================
--- /trunk/FrEROS/AnaLC/courbe_nb.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/courbe_nb.cc	(revision 3572)
@@ -7,5 +7,5 @@
 
 /*==============================================================*/
-FILE *CreCourbe(char *str)
+FILE *CreCourbe(const char *str)
 /*
 Pour ouvrir le fichier COURBE_NB_FILE avec le nom "str".
Index: /trunk/FrEROS/AnaLC/courbe_nb.h
===================================================================
--- /trunk/FrEROS/AnaLC/courbe_nb.h	(revision 3571)
+++ /trunk/FrEROS/AnaLC/courbe_nb.h	(revision 3572)
@@ -16,5 +16,5 @@
 
 FILE *CreCourbe(int et);
-FILE *CreCourbe(char *);
+FILE *CreCourbe(const char *str);
 void FillCourbe(int et,int coul
               ,float t,float flx,float eflx,float flb,float eflb
Index: /trunk/FrEROS/AnaLC/lcproc.cc
===================================================================
--- /trunk/FrEROS/AnaLC/lcproc.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/lcproc.cc	(revision 3572)
@@ -47,5 +47,5 @@
 
   // We have to check that  fgbad has been filled
-  if (fgbad.size() < nmes) 
+  if ((int)fgbad.size() < nmes) 
     for(int kb=fgbad.size(); kb<nmes; kb++) fgbad.push_back(0);
 
Index: /trunk/FrEROS/AnaLC/nbsreadu_base.cc
===================================================================
--- /trunk/FrEROS/AnaLC/nbsreadu_base.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/nbsreadu_base.cc	(revision 3572)
@@ -51,5 +51,5 @@
 
 // Create NTuple
-char *nament[NXNT] = {
+const char *nament[NXNT] = {
       "et","xref","flr","dm1","dm21","xp","yp","npt"
      ,"mean","sig","sigi"
Index: /trunk/FrEROS/AnaLC/nbsreadu_bosse.cc
===================================================================
--- /trunk/FrEROS/AnaLC/nbsreadu_bosse.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/nbsreadu_bosse.cc	(revision 3572)
@@ -59,5 +59,5 @@
 
 // Create NTuple
-char *nament[NXNT] = {
+const char *nament[NXNT] = {
       "etr","etb","fr","fb",
       "dmin1","dmin2","dm21","dm22",
Index: /trunk/FrEROS/AnaLC/nbsreadu_ppf.cc
===================================================================
--- /trunk/FrEROS/AnaLC/nbsreadu_ppf.cc	(revision 3571)
+++ /trunk/FrEROS/AnaLC/nbsreadu_ppf.cc	(revision 3572)
@@ -64,5 +64,5 @@
  // Fill TimeInfoU into NTuple
  const int nxtn = 12;
- char *nament[nxtn] =
+ const char *nament[nxtn] =
    {"ts","texp","fd","sfd","sx","sy","rho","dx","dy","absor","amass","fgcal"};
  r_8 xnt[nxtn];
@@ -94,5 +94,5 @@
  // Create NTuple for StarInfo
  const int nsti = 12;
- char *namentsti[nsti] =
+ const char *namentsti[nsti] =
    {"net","xref","fmean","fsig","fref","xp","yp","dm","dm2","dm2r","fgref","nbvois"};
  for(int ic=0;ic<NCOULMX;ic++) {
@@ -138,5 +138,5 @@
 
    const int nxtn = 15;
-   char *nament[nxtn] =
+   const char *nament[nxtn] =
      {"ic",
       "ts","fd","sx","sy","rho",
Index: /trunk/FrEROS/AnaLC/nomfits2.c
===================================================================
--- /trunk/FrEROS/AnaLC/nomfits2.c	(revision 3571)
+++ /trunk/FrEROS/AnaLC/nomfits2.c	(revision 3572)
@@ -93,5 +93,5 @@
 /*
 ++
-unsigned long int decode_zeza(char* s, int i1, int i2)
+unsigned long int decode_zeza(const char* s, int i1, int i2)
 	Pour coder (Rc) en entier decimal la chaine de caracteres
 	comprise entre `s[i1]' et `s[i2]' interpretee comme
@@ -99,5 +99,5 @@
 --
 */
-unsigned long int decode_zeza(char* s, int i1, int i2)
+unsigned long int decode_zeza(const char* s, int i1, int i2)
 {
   unsigned long int D, ibase = 1;
@@ -247,5 +247,5 @@
 /*
 ++
-int Test_NoCorrupt(char *flnm)
+int Test_NoCorrupt(const char *flnm)
 	Test pour voir si le fichier Fits de nom `flnm' n'est
 	pas corrompu.
@@ -260,5 +260,5 @@
 --
 */
-int Test_NoCorrupt(char *flnm)
+int Test_NoCorrupt(const char *flnm)
 {
 int lp=0;
Index: /trunk/FrEROS/AnaLC/nomfits2.h
===================================================================
--- /trunk/FrEROS/AnaLC/nomfits2.h	(revision 3571)
+++ /trunk/FrEROS/AnaLC/nomfits2.h	(revision 3572)
@@ -13,10 +13,10 @@
 /* --- fin ajout depuis Peida/LibsUtil/datime.h ----- */
 
-unsigned long int decode_zeza(char* s, int i1, int i2);
+unsigned long int decode_zeza(const char* s, int i1, int i2);
 char * dec2zeza(unsigned long z, char *s, int n);
 int qSort_fits2(const void *x1,const void *x2);
 
 /* CMV: test des conneries du serveur MG ! */
-int Test_NoCorrupt(char *flnm);
+int Test_NoCorrupt(const char *flnm);
 
 /* codage de la date/tsid dans timeinfo */
Index: /trunk/SophyaExt/FitsIOServer/Makefile
===================================================================
--- /trunk/SophyaExt/FitsIOServer/Makefile	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/Makefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o $(SOPHYAOBJP)swfitsdtable.o
+	 rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)swfitsdtable.o
 	rm -f $(SOPHYALIBP)libFitsIOServer.a
  
-$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o $(SOPHYAOBJP)swfitsdtable.o
+$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)swfitsdtable.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libextsophya.objlist
@@ -184,53 +184,4 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fiosinit.cc
  
-$(SOPHYAOBJP)fitsautoreader.o: fitsautoreader.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)machdefs.h fitsautoreader.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)anydataobj.h fitsfile.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h fitsinoutfile.h \
-  $(SOPHYAINCP)FitsIO/fitsio.h \
-  $(SOPHYAINCP)FitsIO/longnam.h fitshandler.h \
-  fitstarray.h $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h fitsspherehealpix.h \
-  $(SOPHYAINCP)spherehealpix.h \
-  $(SOPHYAINCP)sphericalmap.h \
-  $(SOPHYAINCP)smathconst.h \
-  $(SOPHYAINCP)pixelmap.h \
-  $(SOPHYAINCP)spherepos.h \
-  $(SOPHYAINCP)unitvector.h \
-  $(SOPHYAINCP)vector3d.h \
-  $(SOPHYAINCP)longlat.h \
-  $(SOPHYAINCP)utilgeom.h \
-  $(SOPHYAINCP)datatype.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)HEALPixUtils.h fitsntuple.h \
-  $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)ppersist.h fitsxntuple.h \
-  $(SOPHYAINCP)xntuple.h fitslocalmap.h \
-  $(SOPHYAINCP)localmap.h fbtntintf.h \
-  $(SOPHYAINCP)ntupintf.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsautoreader.cc
- 
 $(SOPHYAOBJP)fitsbntbllineRW.o: fitsbntbllineRW.cc \
   $(SOPHYAINCP)sopnamsp.h \
@@ -633,30 +584,4 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitstarray.cc
  
-$(SOPHYAOBJP)fitsxntuple.o: fitsxntuple.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)machdefs.h fitsxntuple.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)ppersist.h fitsfile.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)dvlist.h fitsinoutfile.h \
-  $(SOPHYAINCP)FitsIO/fitsio.h \
-  $(SOPHYAINCP)FitsIO/longnam.h fitshandler.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsxntuple.cc
- 
 $(SOPHYAOBJP)swfitsdtable.o: swfitsdtable.cc swfitsdtable.h \
   $(SOPHYAINCP)basedtable.h \
Index: /trunk/SophyaExt/FitsIOServer/fabtcolread.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fabtcolread.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fabtcolread.cc	(revision 3572)
@@ -189,5 +189,5 @@
   \return value into double
 */
-double FitsOpenFile::ReadKey(fitsfile *fitsptr,char *keyname)
+double FitsOpenFile::ReadKey(fitsfile *fitsptr,const char *keyname)
 {
  if(keyname==NULL || fitsptr==NULL) return 0.;
@@ -204,5 +204,5 @@
   \return value into long
 */
-long FitsOpenFile::ReadKeyL(fitsfile *fitsptr,char *keyname)
+long FitsOpenFile::ReadKeyL(fitsfile *fitsptr,const char *keyname)
 {
  if(keyname==NULL || fitsptr==NULL) return 0;
@@ -219,5 +219,5 @@
   \return value into long long
 */
-LONGLONG FitsOpenFile::ReadKeyLL(fitsfile *fitsptr,char *keyname)
+LONGLONG FitsOpenFile::ReadKeyLL(fitsfile *fitsptr,const char *keyname)
 {
  if(keyname==NULL || fitsptr==NULL) return 0;
@@ -234,5 +234,5 @@
   \return value into string
 */
-string FitsOpenFile::ReadKeyS(fitsfile *fitsptr,char *keyname)
+string FitsOpenFile::ReadKeyS(fitsfile *fitsptr,const char *keyname)
 {
  if(keyname==NULL || fitsptr==NULL) return (string)"";
@@ -529,5 +529,5 @@
   \return value into double
 */
-double FitsABTColRd::ReadKey(char *keyname)
+double FitsABTColRd::ReadKey(const char *keyname)
 {
  return FitsOpenFile::ReadKey(GetFitsPtr(),keyname);
@@ -539,5 +539,5 @@
   \return value into long
 */
-long FitsABTColRd::ReadKeyL(char *keyname)
+long FitsABTColRd::ReadKeyL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyL(GetFitsPtr(),keyname);
@@ -549,5 +549,5 @@
   \return value into long long
 */
-LONGLONG FitsABTColRd::ReadKeyLL(char *keyname)
+LONGLONG FitsABTColRd::ReadKeyLL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyLL(GetFitsPtr(),keyname);
@@ -559,5 +559,5 @@
   \return value into string
 */
-string FitsABTColRd::ReadKeyS(char *keyname)
+string FitsABTColRd::ReadKeyS(const char *keyname)
 {
  return FitsOpenFile::ReadKeyS(GetFitsPtr(),keyname);
@@ -1080,5 +1080,5 @@
   \return value into double
 */
-double FitsImg2DRd::ReadKey(char *keyname)
+double FitsImg2DRd::ReadKey(const char *keyname)
 {
  return FitsOpenFile::ReadKey(GetFitsPtr(),keyname);
@@ -1090,5 +1090,5 @@
   \return value into long
 */
-long FitsImg2DRd::ReadKeyL(char *keyname)
+long FitsImg2DRd::ReadKeyL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyL(GetFitsPtr(),keyname);
@@ -1100,5 +1100,5 @@
   \return value into long long
 */
-LONGLONG FitsImg2DRd::ReadKeyLL(char *keyname)
+LONGLONG FitsImg2DRd::ReadKeyLL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyLL(GetFitsPtr(),keyname);
@@ -1110,5 +1110,5 @@
   \return value into string
 */
-string FitsImg2DRd::ReadKeyS(char *keyname)
+string FitsImg2DRd::ReadKeyS(const char *keyname)
 {
  return FitsOpenFile::ReadKeyS(GetFitsPtr(),keyname);
@@ -1428,5 +1428,5 @@
   \return value into double
 */
-double FitsImg3DRd::ReadKey(char *keyname)
+double FitsImg3DRd::ReadKey(const char *keyname)
 {
  return FitsOpenFile::ReadKey(GetFitsPtr(),keyname);
@@ -1438,5 +1438,5 @@
   \return value into long
 */
-long FitsImg3DRd::ReadKeyL(char *keyname)
+long FitsImg3DRd::ReadKeyL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyL(GetFitsPtr(),keyname);
@@ -1448,5 +1448,5 @@
   \return value into long long
 */
-LONGLONG FitsImg3DRd::ReadKeyLL(char *keyname)
+LONGLONG FitsImg3DRd::ReadKeyLL(const char *keyname)
 {
  return FitsOpenFile::ReadKeyLL(GetFitsPtr(),keyname);
@@ -1458,5 +1458,5 @@
   \return value into string
 */
-string FitsImg3DRd::ReadKeyS(char *keyname)
+string FitsImg3DRd::ReadKeyS(const char *keyname)
 {
  return FitsOpenFile::ReadKeyS(GetFitsPtr(),keyname);
Index: /trunk/SophyaExt/FitsIOServer/fabtcolread.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fabtcolread.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fabtcolread.h	(revision 3572)
@@ -48,8 +48,8 @@
   void Print(void);
 
-  static double   ReadKey(fitsfile *fitsptr,char *keyname);
-  static long     ReadKeyL(fitsfile *fitsptr,char *keyname);
-  static LONGLONG ReadKeyLL(fitsfile *fitsptr,char *keyname);
-  static string   ReadKeyS(fitsfile *fitsptr,char *keyname);
+  static double   ReadKey(fitsfile *fitsptr,const char *keyname);
+  static long     ReadKeyL(fitsfile *fitsptr,const char *keyname);
+  static LONGLONG ReadKeyLL(fitsfile *fitsptr,const char *keyname);
+  static string   ReadKeyS(fitsfile *fitsptr,const char *keyname);
   static void   printerror(int sta);
 
@@ -78,8 +78,8 @@
   void ChangeBuffer(long blen=100,long bsens=1);
 
-  double    ReadKey(char *keyname);
-  long      ReadKeyL(char *keyname);
-  LONGLONG  ReadKeyLL(char *keyname);
-  string    ReadKeyS(char *keyname);
+  double    ReadKey(const char *keyname);
+  long      ReadKeyL(const char *keyname);
+  LONGLONG  ReadKeyLL(const char *keyname);
+  string    ReadKeyS(const char *keyname);
 
   double Read(LONGLONG n,bool usebuffer=true);
@@ -195,8 +195,8 @@
   virtual ~FitsImg2DRd();
 
-  double   ReadKey(char *keyname);
-  long     ReadKeyL(char *keyname);
-  LONGLONG ReadKeyLL(char *keyname);
-  string   ReadKeyS(char *keyname);
+  double   ReadKey(const char *keyname);
+  long     ReadKeyL(const char *keyname);
+  LONGLONG ReadKeyLL(const char *keyname);
+  string   ReadKeyS(const char *keyname);
 
   LONGLONG Read(TMatrix<uint_2>& data);
@@ -260,8 +260,8 @@
   virtual ~FitsImg3DRd();
 
-  double   ReadKey(char *keyname);
-  long     ReadKeyL(char *keyname);
-  LONGLONG ReadKeyLL(char *keyname);
-  string   ReadKeyS(char *keyname);
+  double   ReadKey(const char *keyname);
+  long     ReadKeyL(const char *keyname);
+  LONGLONG ReadKeyLL(const char *keyname);
+  string   ReadKeyS(const char *keyname);
 
   LONGLONG Read(TArray<uint_2>& data);
Index: /trunk/SophyaExt/FitsIOServer/fabtwriter.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fabtwriter.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fabtwriter.cc	(revision 3572)
@@ -105,5 +105,5 @@
 
 /*! Write a double value into Fits Header */
-void FitsWriter::WriteKey(const char *keyname,double val,char* comment)
+void FitsWriter::WriteKey(const char *keyname,double val,const char* comment)
 {
  if(keyname==NULL || strlen(keyname)<=0) return;
@@ -116,5 +116,5 @@
 
 /*! Write a long value into Fits Header */
-void FitsWriter::WriteKey(const char *keyname,long val,char* comment)
+void FitsWriter::WriteKey(const char *keyname,long val,const char* comment)
 {
  if(keyname==NULL || strlen(keyname)<=0) return;
@@ -127,5 +127,5 @@
 
 /*! Write a long long value into Fits Header */
-void FitsWriter::WriteKey(const char *keyname,LONGLONG val,char* comment)
+void FitsWriter::WriteKey(const char *keyname,LONGLONG val,const char* comment)
 {
  if(keyname==NULL || strlen(keyname)<=0) return;
@@ -138,5 +138,5 @@
 
 /*! Write a string value into Fits Header */
-void FitsWriter::WriteKey(const char *keyname,string val,char* comment)
+void FitsWriter::WriteKey(const char *keyname,string val,const char* comment)
 {
  if(keyname==NULL || strlen(keyname)<=0) return;
Index: /trunk/SophyaExt/FitsIOServer/fabtwriter.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fabtwriter.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fabtwriter.h	(revision 3572)
@@ -36,13 +36,13 @@
 
   //! Write a double value in Fits header.
-  void WriteKey(const char *keyname,double val,char* comment=NULL);
+  void WriteKey(const char *keyname,double val,const char* comment=NULL);
   //! Write a long value in Fits header.
-  void WriteKey(const char *keyname,long val,char* comment=NULL);
+  void WriteKey(const char *keyname,long val,const char* comment=NULL);
   //! Write a long long value in Fits header.
-  void WriteKey(const char *keyname,LONGLONG val,char* comment=NULL);
+  void WriteKey(const char *keyname,LONGLONG val,const char* comment=NULL);
   //! Write a string value in Fits header.
-  void WriteKey(const char *keyname,string val,char* comment=NULL);
+  void WriteKey(const char *keyname,string val,const char* comment=NULL);
   //! Write a character string value in Fits header.
-  inline void WriteKey(const char *keyname,char* val,char* comment=NULL)
+  inline void WriteKey(const char *keyname,const char* val,const char* comment=NULL)
                       {string dum=val; WriteKey(keyname,dum,comment);}
   //! Set debug level
@@ -93,5 +93,5 @@
   inline void SetExtName(string extname=string("")) {ExtName = extname;}
   //! Set the FITS table extension name
-  inline void SetExtName(char* extname="") {ExtName = extname;}
+  inline void SetExtName(const char* extname="") {ExtName = extname;}
 
   //! Add a new column to the FITS table and return its number (see addcol).
Index: unk/SophyaExt/FitsIOServer/fitsautoreader.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsautoreader.cc	(revision 3571)
+++ 	(revision )
@@ -1,269 +1,0 @@
-#include "sopnamsp.h"
-#include "pexceptions.h"
-#include "fitsautoreader.h"
-#include "dvlist.h"
-
-///////////////////////////////////////////////////////////////////////
-// ---- gestion de persistance I/O format fits--
-// objets
-////////////////////////////////////////////////////////////////////
-
-/*!
-  \class SOPHYA::FITS_AutoReader
-  \ingroup FitsIOServer
-  FITS reader with automatic mapping on SOPHYA objects.
-*/
-
-FITS_AutoReader::FITS_AutoReader() {InitNull();};
-FITS_AutoReader::FITS_AutoReader(const char inputfile[])
-{
-  InitNull();
-  inFits_  = new FitsInFile (inputfile);
-  filename_ = string(inputfile);
-}
-FITS_AutoReader::FITS_AutoReader(string const & inputfile)
-{
-  InitNull();
-  inFits_  = new FitsInFile (inputfile);
-  filename_ = inputfile;
-}
-FITS_AutoReader::~FITS_AutoReader()
-{
-  if (inFits_ != NULL) delete inFits_;
-  if (dobj_ != NULL) delete dobj_;
-}
-
-int FITS_AutoReader::NbBlocks()
-{
-  return inFits_->NbBlocks();
-}
-
- // parametre toutCharger : uniquement pour les BINTABLE et s'il ne
- // s'agit pas explicitement d'un objet SOPHYA, on charge toute la 
- // table en memoire sous forme d'un xntuple si toutCharger= true.
- // et si le nombre d'entrees est superieur a 1000.
- // sinon (c-a-d : il ne s'agit pas d'un objet connu de SOPHYA
- //                c'est une BINTABLE avec plus de 1000 entrees
- //                totuCharger = false)
- // on ouvre une FitsBTNtuIntf (lecture ulterieure, bufferisee, des valeurs)
-AnyDataObj* FITS_AutoReader::ReadObject(int hdunum, bool toutCharger) const
-{
-  if (hdunum<=0) 
-    {
-      throw PException(" FITS_AutoReader::ReadObject : hdu number must be positive");
-    }
-  inFits_->ReadHeader(hdunum);
-  if (inFits_->IsFitsEOF()) return NULL;
-  if (inFits_->IsFitsERROR())
-    {
-      throw IOExc("FITS_AutoReader::ReadObject: FITSIO error in reading");
-    }
-  DVList dvl=inFits_->DVListFromFits();
-  string nameObj = dvl.GetS("CONTENT");
-  //    cout << " SOPHYA object identified as: " << dvl.GetS("CONTENT") << endl;
-  if (nameObj == string("TArray") )
-    {
-      return newTArray();
-    }
-  else if  (nameObj == string("SphereHEALPix") )
-    {
-      return newSphereHEALPix();
-    }
-  else if  (nameObj == string("LocalMap") )
-    {
-      return newLocalMap();
-    }
-  else if  (nameObj == string("NTuple") )
-    {
-      return newNTuple();
-    }
-  else if  (nameObj == string("XNTuple") )
-    {
-      return newXNTuple();
-    }
-  // on n'a trouve aucun nom d'objet connu de SOPHYA, on fait une 
-  // recherche qualitative.
-  //
-  // si c'est une image fits, on cree un TArray
-  else if (inFits_->IsFitsImage())
-    {
-      return newTArray();
-    }
-  // si c'est une bintable on cherche le mot cle ORDERING pour identifier 
-  // une spherehealpix
-  else if (inFits_->IsFitsTable())
-    {
-      if (dvl.GetS("ORDERING") != string("")) return newSphereHEALPix();
-      // sinon on cherche ntuple ou xntuple
-      else
-	{
-	  int index=0;
-          int k;
-	  for (k=0; k < inFits_->NbColsFromFits(); k++) 
-	    {
-	      if (inFits_->ColTypeFromFits(k) != FitsFile::FitsDataType_float)
-		{
-		index = 1;
-		break;
-	      }
-	  }
-	if (index == 0)  return newNTuple();
-	else 
-	  {
-	    if (!toutCharger ) 
-	      {
-		int maxEntries=0;
-                int k;
-		for ( k=0; k < inFits_->NbColsFromFits(); k++) 
-		  {
-		    if (inFits_->NentriesFromFits(k) > maxEntries ) maxEntries =  inFits_->NentriesFromFits(k); 
-		  }
-		if ( maxEntries > 1000) return newFitsBTNtuIntf(hdunum);
-		else return newXNTuple();
-	      }
-	    else  return newXNTuple();
-
-	  }
-      }
-    }
-  else
-    {
-      cout << " WARNING ( FITS_AutoReader::ReadObject) : object not recognized as a  SOPHYA object" << endl;
-      return new DVList(dvl);
-    }
-  
-}
-
-AnyDataObj*  FITS_AutoReader::newTArray() const
-{
-      FitsFile::FitsDataType dtype = inFits_->ImageType();
-      switch (dtype)
-	{
-	case FitsFile::FitsDataType_double :
-	  {
-	    TArray<r_8>* matptr = new TArray<r_8>;
-	    FITS_TArray<r_8> fta(matptr);
-	    fta.Read(*inFits_, inFits_->currentHeaderIndex());
-	    return matptr;
-	  }
-	case FitsFile::FitsDataType_float :
-	  {
-	    TArray<r_4>* matptr = new TArray<r_4>;
-	    FITS_TArray<r_4> fta(matptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return matptr;
-	  }
-	case  FitsFile::FitsDataType_int :
-	  {
-	    TArray<int_4>* matptr = new TArray<int_4>;
-	    FITS_TArray<int_4> fta(matptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return matptr;
-	  }
-	default :
-	  cout << "type = " << (int) dtype << endl;
-	  throw IOExc("FITS_AutoReader::ReadObject : unsupported data type for TArray");
-	}
-}
-
-AnyDataObj*  FITS_AutoReader::newSphereHEALPix() const
-{
-      FitsFile::FitsDataType dtype;
-      if (inFits_->IsFitsTable()) dtype = inFits_->ColTypeFromFits(0);
-      else
-	{
-	  cout << " WARNING : Sperehealpix not binary table : unusual " << endl;
-	  dtype = inFits_->ImageType();
-	}
-      switch (dtype)
-	{
-	case FitsFile::FitsDataType_double :
-	  {
-	    SphereHEALPix<r_8>* sphptr = new SphereHEALPix<r_8>;
-	    FITS_SphereHEALPix<r_8> fta(sphptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return sphptr;
-	  }
-	case FitsFile::FitsDataType_float :
-	  {
-	    SphereHEALPix<r_4>* sphptr = new SphereHEALPix<r_4>;
-	    FITS_SphereHEALPix<r_4> fta(sphptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return sphptr;
-	  }
-        //cmv: Bon c'est quand meme sympa de pouvoir re-lire ce
-	// qu'on a ecrit !! Je fais cette modif mais a priori
-	// ce n'est que du sparadra car ca devrait planter
-	// sur certaines machines (int!=long).
-	case  FitsFile::FitsDataType_int :
-	case  FitsFile::FitsDataType_long :
-	  {
-	    SphereHEALPix<int_4>* sphptr = new SphereHEALPix<int_4>;
-	    FITS_SphereHEALPix<int_4> fta(sphptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return sphptr;
-	  }
-	default :
-	  cout << "type = " << (int) dtype << endl;
-	  throw IOExc("FITS_AutoReader::ReadObject : unsupported data type for SphereHEALpix");
-	}
-}
-
-AnyDataObj*  FITS_AutoReader::newLocalMap() const
-{
-      FitsFile::FitsDataType dtype;
-      if (inFits_->IsFitsTable()) dtype = inFits_->ColTypeFromFits(0);
-      else
-	{
-	  cout << " WARNING : Localmap not binary table : unusual " << endl;
-	  dtype = inFits_->ImageType();
-	}
-      switch (dtype)
-	{
-	case FitsFile::FitsDataType_double :
-	  {
-	    LocalMap<r_8>* locmptr = new LocalMap<r_8>;
-	    FITS_LocalMap<r_8> fta(locmptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return locmptr;
-	  }
-	case FitsFile::FitsDataType_float :
-	  {
-	    LocalMap<r_4>* locmptr = new LocalMap<r_4>;
-	    FITS_LocalMap<r_4> fta(locmptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return locmptr;
-	  }
-	case  FitsFile::FitsDataType_int :
-	  {
-	    LocalMap<int_4>* locmptr = new LocalMap<int_4>;
-	    FITS_LocalMap<int_4> fta(locmptr);
-	    fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-	    return locmptr;
-	  }
-	default :
-	  cout << "type = " << (int) dtype << endl;
-	  throw IOExc("FITS_AutoReader::ReadObject : unsupported data type for LocalMap");
-	}
-}
-NTuple* FITS_AutoReader::newNTuple() const
-{
-      NTuple* ntptr = new NTuple;
-      FITS_NTuple fta(ntptr);
-      fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-      return ntptr;
-}
-XNTuple* FITS_AutoReader::newXNTuple() const
-{
-      XNTuple* xntptr = new XNTuple;
-      FITS_XNTuple fta(xntptr);
-      fta.Read(*inFits_,  inFits_->currentHeaderIndex());
-      return xntptr;
-}
-
-FitsBTNtuIntf* FITS_AutoReader::newFitsBTNtuIntf(int hdunum) const
-{
-      FitsBTNtuIntf* btnptr = new FitsBTNtuIntf(filename_,hdunum);
-      return btnptr;
-}
-
Index: unk/SophyaExt/FitsIOServer/fitsautoreader.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsautoreader.h	(revision 3571)
+++ 	(revision )
@@ -1,69 +1,0 @@
-#ifndef FITSAUTOREADER_SEEN
-#define FITSAUTOREADER_SEEN
-
-
-// Guy Le Meur 11/2000
-
-#include "machdefs.h"
-#include "anydataobj.h"
-#include "fitsfile.h"
-#include "fitstarray.h"
-#include "fitsspherehealpix.h"
-#include "fitsntuple.h"
-#include "fitsxntuple.h"
-#include "fitslocalmap.h"
-#include "fbtntintf.h"
-
-namespace SOPHYA {
-///////////////////////////////////////////////////////////////////////
-// ------------- Classe pour la gestion de persistance I/O format fits--
-// des objets
-//////////////////////////////////////////////////////////////////////
-
-
-class FITS_AutoReader 
-{
-public:
-
-FITS_AutoReader();
-FITS_AutoReader(const char inputfile[]);
-FITS_AutoReader(string const & inputfile);
-virtual ~FITS_AutoReader();
- int NbBlocks();
-
- // parametre toutCharger : uniquement pour les BINTABLE et s'il ne
- // s'agit pas explicitement d'un objet SOPHYA, on charge toute la 
- // table en memoire sous forme d'un xntuple si toutCharger= true.
- // et si le nombre d'entrees est superieur a 1000.
- // sinon (c-a-d : il ne s'agit pas d'un objet connu de SOPHYA
- //                c'est une BINTABLE avec plus de 1000 entrees
- //                totuCharger = false)
- // on ouvre une FitsBTNtuIntf (lecture ulterieure, bufferisee, des valeurs)
-AnyDataObj* ReadObject(int hdunum, bool toutCharger = false) const;
-
-
-private :
-
-AnyDataObj* newTArray() const;
-AnyDataObj* newSphereHEALPix() const;
-AnyDataObj* newLocalMap() const;
-NTuple* newNTuple() const;
-XNTuple* newXNTuple() const;
- FitsBTNtuIntf* newFitsBTNtuIntf(int hdunum) const;
-inline void InitNull()
-   {
-     inFits_ = NULL;
-     dobj_ = NULL;
-     ownobj_ = false;
-   }
-
-
- string filename_;
-FitsInFile* inFits_;
-AnyDataObj* dobj_;
-bool ownobj_;
-
-};
-} // Fin du namespace
-
-#endif
Index: /trunk/SophyaExt/FitsIOServer/fitsblkrw.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsblkrw.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsblkrw.h	(revision 3572)
@@ -159,5 +159,5 @@
       string msg = "FitsBlockRW<std::string>::WriteColumnData() Error: " ;
       msg += buff;
-      sprintf(buff," kk=%ld",kk);  msg += buff;
+      sprintf(buff," kk=%ld",(long)kk);  msg += buff;
       throw FitsIOException(msg);
     }
@@ -187,5 +187,5 @@
       string msg = "FitsBlockRW<std::string>::ReadColumnData() Error: " ;
       msg += buff;
-      sprintf(buff," kk=%ld",kk);  msg += buff;
+      sprintf(buff," kk=%ld",(long)kk);  msg += buff;
       throw FitsIOException(msg);
     }
Index: /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc	(revision 3572)
@@ -64,5 +64,5 @@
       else if (ss == FitsFile::FitsDataType_char) SfitsCol.push_back(k);
       else {
-	cout << " FITS_XNTuple: colonne fits " << k << " type= " << (int) ss << endl;
+	cout << "FITS_BntblLineReader: colonne fits " << k << " type= " << (int) ss << endl;
 	throw  IOExc("type de champ inconnu");
       }
@@ -113,9 +113,9 @@
 
 
-FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int lc, int bc, int cc,  vector<string> names,DVList* ptr_dvl,  FitsFile::WriteMode wrm)
+FITS_BntblLineWriter::FITS_BntblLineWriter(const char inputfile[],int dc, int fc,int ic, int lc, int bc, int cc,  vector<string> names,DVList* ptr_dvl,  FitsFile::WriteMode wrm)
 {
   int k;
   int nbcols = dc+fc+ic+cc+lc+bc;
-  if (nbcols !=  names.size())
+  if (nbcols !=  (int)names.size())
     {
       cout << " WARNING: BnTblLineWriter:: length of vector of column names not equal to total number of columns" << endl;
Index: /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.h	(revision 3572)
@@ -6,5 +6,4 @@
 #include "dvlist.h"
 #include "fitsfile.h"
-//#include "xntuple.h"
 
 namespace SOPHYA {
@@ -66,5 +65,5 @@
 
 public:
- FITS_BntblLineWriter(char inputfile[],int dc, int fc, int ic, int lc, int bc,int cc, vector<string> names, DVList* dvl=NULL, FitsFile::WriteMode wrm = FitsFile::clear);
+ FITS_BntblLineWriter(const char inputfile[],int dc, int fc, int ic, int lc, int bc,int cc, vector<string> names, DVList* dvl=NULL, FitsFile::WriteMode wrm = FitsFile::clear);
 ~FITS_BntblLineWriter();
  void WriteNextLine( BnTblLine& WorkLine);
Index: /trunk/SophyaExt/FitsIOServer/fitsfile.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsfile.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsfile.cc	(revision 3572)
@@ -228,5 +228,5 @@
 */
 
-/*! \fn void  SOPHYA::FitsIOHandler::Read(char flnm[],int hdunum)
+/*! \fn void  SOPHYA::FitsIOHandler::Read(const char flnm[],int hdunum)
 
 this method is called from inherited objects : 
@@ -238,5 +238,5 @@
 calls the method 'ReadFromFits' from the inherited  object
 */ 
-void   FitsIOHandler::Read(char flnm[],int hdunum)
+void   FitsIOHandler::Read(const char flnm[],int hdunum)
 {
   FitsInFile ifts(flnm);
@@ -274,5 +274,5 @@
 
 */ 
-void FitsIOHandler::Write(char flnm[]) 
+void FitsIOHandler::Write(const char flnm[]) 
 
 {
@@ -327,5 +327,5 @@
 }
 
-void FitsFile::printerror(int& status, char* texte) 
+void FitsFile::printerror(int& status, const char* texte) 
   //*****************************************************/
   //* Print out cfitsio error messages and exit program */
@@ -338,5 +338,5 @@
   throw IOExc("FitsFile:: error FITSIO status");
 }
-void FitsFile::printerrorAndContinue(int& status, char* texte) 
+void FitsFile::printerrorAndContinue(int& status, const char* texte) 
   //*****************************************************/
   //* Print out cfitsio error messages and exit program */
@@ -1534,5 +1534,5 @@
   char dtype;
   char card[FLEN_CARD];  
-  char *comkey = "COMMENT";
+  const char *comkey = "COMMENT";
   char comment[FLEN_COMMENT];
 
@@ -2198,5 +2198,5 @@
       char comment[FLEN_COMMENT];
       char strval[FLEN_VALUE]= "";
-      char *comkey = "COMMENT";
+      const char *comkey = "COMMENT";
       //      fits_read_keyword(fptr_, keyname, strval, NULL, &status);
       //  if (status != 0 || strncmp(keyname,comkey,LEN_KEYWORD-1) == 0 ) 
@@ -2527,5 +2527,5 @@
       default :
 	{
-	  char *comkey = "COMMENT";
+	  const char *comkey = "COMMENT";
 	  if(strncmp(keyname,comkey,LEN_KEYWORD-1) == 0)
 	    {
Index: /trunk/SophyaExt/FitsIOServer/fitsfile.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsfile.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsfile.h	(revision 3572)
@@ -64,6 +64,6 @@
 
    virtual ~FitsIOHandler() {}
-   void   Read(char flnm[],int hdunum= 0);
-   void   Write(char flnm[]) ;
+   void   Read(const char flnm[],int hdunum= 0);
+   void   Write(const char flnm[]) ;
 
    //Implementation par defaut de l'interface FitsHandlerInterface
@@ -181,6 +181,6 @@
 void         ResetStatus(int& status) ; 
 static  void printerror(int&) ;
-static  void printerror(int&,char* texte) ;
-static  void printerrorAndContinue(int& status, char* texte);
+static  void printerror(int&,const char* texte) ;
+static  void printerrorAndContinue(int& status,const char* texte);
 inline void  InitNull() 
   {
Index: /trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc	(revision 3572)
@@ -157,5 +157,5 @@
 }
 /* -- Fonction utilitaire pour verifier le code d'erreur fitsio -- */
-static inline bool FitsCheckStatus(int st, char * emsg = NULL) {
+static inline bool FitsCheckStatus(int st, const char * emsg = NULL) {
   if (st) {
     fits_report_error(stderr, st);
@@ -272,5 +272,5 @@
 int FitsInOutFile::CurrentHDU()  const
 {
-  int status = 0;
+  //unused: int status = 0;
   int curhdu = 0;
   fits_get_hdu_num(FitsPtr() , &curhdu);
@@ -496,9 +496,10 @@
   int colnum, typecode;
   LONGLONG repeat, colw;   // $CHECK$ LONGLONG ???
-  int ncols = 0;
+  //unused: int ncols = 0;
   char colname[128];  // longueur max d'un nom de colonne
 
   while (status != COL_NOT_FOUND) {
-    fits_get_colname(FitsPtr(), CASEINSEN, "*", colname, &colnum, &status);
+    char dum[2]  = {'*','\0'};
+    fits_get_colname(FitsPtr(), CASEINSEN, dum, colname, &colnum, &status);
     if (status == COL_NOT_FOUND)  break;
     if ( (status != COL_NOT_UNIQUE) && (status != 0) ) {
@@ -665,5 +666,5 @@
 
   CheckFitsPtr(FitsPtr()); 
-  int status = 0;
+  //unused: int status = 0;
   DVList::ValList::const_iterator it;
   for(it = dvl.Begin(); it != dvl.End(); it++)  
Index: /trunk/SophyaExt/FitsIOServer/fitsioserver.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsioserver.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsioserver.h	(revision 3572)
@@ -19,5 +19,4 @@
 #include "fitsspherehealpix.h"
 #include "fitsntuple.h"
-// #include "fitsxntuple.h"
 #include "fitslocalmap.h"
 
Index: /trunk/SophyaExt/FitsIOServer/fitsmanager.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsmanager.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsmanager.cc	(revision 3572)
@@ -80,5 +80,5 @@
   int hfg = 0;
   int bhfg = 0;
-  int clev = 0;
+  //unused: int clev = 0;
   int blev = 0;
   for(it = hlistp->begin(); it != hlistp->end(); it++) {
@@ -196,5 +196,5 @@
       LONGLONG naxes[5] = {0,0,0,0,0};
       int naxis=5;
-      int imgtyp = is.GetImageHDUInfo(naxis, naxes);
+      //unused: int imgtyp = is.GetImageHDUInfo(naxis, naxes);
       os << ">> IMAGE_HDU:  naxis= " << naxis << " : ";
       for(int i=0; i<naxis; i++) {
@@ -212,5 +212,5 @@
       else os << ">> ASCII_TBL :  NRows= " << is.GetNbRows();
       os << " x NCols= " << ncols << endl;
-      for(int kk=0; kk<colnames.size(); kk++) {
+      for(size_t kk=0; kk<colnames.size(); kk++) {
 	os << "Col[" << kk+1 << "]  Name= " << colnames[kk] 
 	     << " Type= " << FitsTypes::DataTypeToTypeString(coltypes[kk])
Index: /trunk/SophyaExt/FitsIOServer/fitsntuple.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsntuple.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsntuple.h	(revision 3572)
@@ -53,5 +53,5 @@
 
 /*!
-fill the XNTuple only with lines from firstLine-th to (firstLine+numberOfLines-1)-th of the FITS-file inputfile.
+fill the NTuple only with lines from firstLine-th to (firstLine+numberOfLines-1)-th of the FITS-file inputfile.
 \param <firstLine>  first line  to be read (the first line of the file is numbered 0)
 \param <numberOfLines>  number of lines to be read
Index: /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc	(revision 3572)
@@ -27,5 +27,5 @@
   
 template <class T>
-FITS_SphereHEALPix<T>::FITS_SphereHEALPix(char inputfile[],int hdunum)
+FITS_SphereHEALPix<T>::FITS_SphereHEALPix(const char inputfile[],int hdunum)
 {
     dobj_= new SphereHEALPix<T>;
@@ -266,5 +266,5 @@
 
 template <class T>
-void FITS_SphereHEALPix<T>::Mollweide_picture_projection(char filename[])
+void FITS_SphereHEALPix<T>::Mollweide_picture_projection(const char filename[])
 {
   int ni = 300;
@@ -297,5 +297,5 @@
 }
 template <class T>
-void FITS_SphereHEALPix<T>::sinus_picture_projection(char filename[])
+void FITS_SphereHEALPix<T>::sinus_picture_projection(const char filename[])
 {
   int ni = 300;
Index: /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h	(revision 3572)
@@ -24,5 +24,5 @@
 
 FITS_SphereHEALPix();
-FITS_SphereHEALPix(char inputfile[],int hdunum=0); 
+FITS_SphereHEALPix(const char inputfile[],int hdunum=0); 
 FITS_SphereHEALPix(const SphereHEALPix<T>& obj);
 FITS_SphereHEALPix(SphereHEALPix<T>* obj);
@@ -35,6 +35,6 @@
 virtual FitsHandlerInterface* Clone();
 
-void Mollweide_picture_projection(char flnm[]);
-void sinus_picture_projection(char flnm[]);
+void Mollweide_picture_projection(const char flnm[]);
+void sinus_picture_projection(const char flnm[]);
 //void ReWriteFromFitsToFits(FitsInFile& headerin, FitsOutFile& os); 
 
Index: /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.cc	(revision 3572)
@@ -26,5 +26,5 @@
 
 template <class T>
-FITS_SphereThetaPhi<T>::FITS_SphereThetaPhi(char inputfile[],int hdunum)
+FITS_SphereThetaPhi<T>::FITS_SphereThetaPhi(const char inputfile[],int hdunum)
 {
     dobj_= new SphereThetaPhi<T>;
@@ -255,5 +255,5 @@
 
 template <class T>
-void FITS_SphereThetaPhi<T>::Mollweide_picture_projection(char filename[])
+void FITS_SphereThetaPhi<T>::Mollweide_picture_projection(const char filename[])
 {
   int ni = 300;
@@ -286,5 +286,5 @@
 }
 template <class T>
-void FITS_SphereThetaPhi<T>::sinus_picture_projection(char filename[])
+void FITS_SphereThetaPhi<T>::sinus_picture_projection(const char filename[])
 {
   int ni = 300;
Index: /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.h	(revision 3572)
@@ -22,5 +22,5 @@
 
 FITS_SphereThetaPhi();
-FITS_SphereThetaPhi(char inputfile[],int hdunum=0); 
+FITS_SphereThetaPhi(const char inputfile[],int hdunum=0); 
 FITS_SphereThetaPhi(const SphereThetaPhi<T>& obj);
 FITS_SphereThetaPhi(SphereThetaPhi<T>* obj);
@@ -33,6 +33,6 @@
 virtual FitsHandlerInterface* Clone();
 
-void Mollweide_picture_projection(char flnm[]);
-void sinus_picture_projection(char flnm[]);
+void Mollweide_picture_projection(const char flnm[]);
+void sinus_picture_projection(const char flnm[]);
 
 
Index: /trunk/SophyaExt/FitsIOServer/fitstarray.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitstarray.cc	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitstarray.cc	(revision 3572)
@@ -24,5 +24,5 @@
 
 template <class T>
-FITS_TArray<T>::FITS_TArray(char inputfile[],int hdunum)
+FITS_TArray<T>::FITS_TArray(const char inputfile[],int hdunum)
 {
   dobj_=NULL;
Index: /trunk/SophyaExt/FitsIOServer/fitstarray.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitstarray.h	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/fitstarray.h	(revision 3572)
@@ -25,5 +25,5 @@
 
 FITS_TArray();
-FITS_TArray(char inputfile[],int hdunum=0);
+FITS_TArray(const char inputfile[],int hdunum=0);
 FITS_TArray(const TArray<T> & obj);
 FITS_TArray(TArray<T> *obj);
Index: unk/SophyaExt/FitsIOServer/fitsxntuple.cc
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsxntuple.cc	(revision 3571)
+++ 	(revision )
@@ -1,399 +1,0 @@
-#include "sopnamsp.h"
-#include "pexceptions.h"
-#include "fitsxntuple.h"
-///////////////////////////////////////////////////////////
-//   Les objets delegues pour la gestion de persistance sur fichiers fits 
-//    pout XNTuple
-///////////////////////////////////////////////////////////
-
-/*!
-  \class SOPHYA::FITS_XNTuple
-  \ingroup FitsIOServer
-  FITS format I/O handler for SOPHYA::XNTuple objects.
-*/
-
-
-#define LONNOM 31 
-
-
-FITS_XNTuple::FITS_XNTuple()
-{
-  dobj_ = new XNTuple;
-  InitNull();
-  ownobj_ = true;
-}
-
-FITS_XNTuple::FITS_XNTuple(char inputfile[],int hdunum)
-{
-  dobj_ = new XNTuple;
-  InitNull();
-  ownobj_ = true; 
-
-  Read(inputfile,hdunum);
-}
-
-
-FITS_XNTuple::FITS_XNTuple(const XNTuple & obj) 
-{ 
-  dobj_ = new XNTuple(obj);
-  InitNull();
-  ownobj_ = true; 
-}
-FITS_XNTuple::FITS_XNTuple(XNTuple* obj) 
-{ 
-  dobj_ = obj;
-  InitNull();
-  ownobj_ = false; 
-}
-FITS_XNTuple::~FITS_XNTuple()
-{
-  if (ownobj_ && dobj_ != NULL) delete dobj_;
-}
-
-
-void FITS_XNTuple::ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum)
-{
-  fistLineToBeRead_ = firstLine;
-  numberOfLinesToBeRead_ = numberOfLines;
-  Read(inputfile,hdunum);
-}
-
-
- 
-void FITS_XNTuple::ReadFromFits(FitsInFile& is)
-{   
-  if (!is.IsFitsTable())
-    {
-      throw PException("ReadFromFits: the fits file seems not to be a bintable nor ASCII table");
-    }
-  int nbcols, nbentries;
-  nbcols = is.NbColsFromFits();
-  nbentries = 0;
-  int k;
-  for (k=0; k<nbcols; k++) nbentries=max( nbentries, is.NentriesFromFits(k) );
-
-  //
-  // pour mettre les colonnes dans l'ordre double, float, int, char :
-  // tableau de correspondance 
-  // DfitsCol(j)= numero dans le fichier fits de la  jeme variable double du 
-  // xntuple;
-  // FfitsCol(j)= numero dans le fichier fits de la  jeme variable float du 
-  // xntuple;
-  // etc.
-  vector<int> DfitsCol;
-  vector<int> FfitsCol;
-  vector<int> IfitsCol;
-  vector<int> SfitsCol;
-  for (k=0; k<nbcols;k++)
-    {
-
-      FitsFile::FitsDataType ss= is.ColTypeFromFits(k);
-      switch (ss) 
-	{
-	case  FitsFile::FitsDataType_double :
-	  {
-	    DfitsCol.push_back(k);
-	    break;
-	  }
-	case FitsFile::FitsDataType_float :
-	  {
-	    FfitsCol.push_back(k);
-	    break;
-	  }
-	case FitsFile::FitsDataType_int :
-	  {
-	    IfitsCol.push_back(k);
-	    break;
-	  }
-	case FitsFile::FitsDataType_long :
-	  {
-	    IfitsCol.push_back(k);
-	    break;
-	  }
-	case FitsFile::FitsDataType_byte :
-	  {
-	    IfitsCol.push_back(k);
-	    break;
-	  }
-	case FitsFile::FitsDataType_char :
-	  {
-	    SfitsCol.push_back(k);
-	    break;
-	  }
-	default :
-	  {
-	    cout << " FITS_XNTuple: colonne fits " << k << " type= " << (int) ss << endl;
-	    throw  IOExc("type de champ inconnu");
-	  }
-	}
-    }
-  char ** ColName = new char*[nbcols];
-  int compt=0;
-  for (k=0; k<DfitsCol.size(); k++)
-    {
-      ColName[compt] = new char[LONNOM+1]; 
-      strncpy(ColName[compt], is.ColNameFromFits(DfitsCol[k]).c_str(), LONNOM);
-      ColName[compt++][ LONNOM] =  '\0';
-    }
-  for (k=0; k<FfitsCol.size(); k++)
-    {
-      ColName[compt] = new char[LONNOM+1]; 
-      strncpy(ColName[compt], is.ColNameFromFits(FfitsCol[k]).c_str(), LONNOM);
-      ColName[compt++][ LONNOM] =  '\0';
-    }
-  for (k=0; k<IfitsCol.size(); k++)
-    {
-      ColName[compt] = new char[LONNOM+1]; 
-      strncpy(ColName[compt], is.ColNameFromFits(IfitsCol[k]).c_str(), LONNOM);
-      ColName[compt++][ LONNOM] =  '\0';
-    }
-  for (k=0; k<SfitsCol.size(); k++)
-    {
-      ColName[compt] = new char[LONNOM+1]; 
-      strncpy(ColName[compt], is.ColNameFromFits(SfitsCol[k]).c_str(), LONNOM);
-      ColName[compt++][LONNOM] =  '\0';
-    }
-  int ND = DfitsCol.size();
-  int NF = FfitsCol.size();
-  int NI = IfitsCol.size();
-  int NS = SfitsCol.size();
-  if(dobj_ == NULL) 
-    { 
-      dobj_= new XNTuple(ND, NF, NI, NS,ColName);
-      ownobj_ = true;      
-    }
-  else 
-    {
-      if (ownobj_)
-	{
-	  (*dobj_)= XNTuple(ND, NF, NI, NS,ColName);
-	}
-      else
-	{
-	  if (ND != dobj_->NDVar() || NF != dobj_->NFVar() ||  NI != dobj_->NIVar() || NS != dobj_->NSVar())
-	    {
-	      //	      cout << " WARNING : FITS_XNTuple : XNTuple reconfigured " << endl;
-	      (*dobj_)= XNTuple(ND, NF, NI, NS,ColName);
-	    }
-	}
-    }
-
-  for (k=0; k<nbcols;k++) 
-    {
-      delete [] ColName[k];
-    }
-  delete [] ColName;
-
-    r_8* dligne;
-    r_4* fligne;
-    int_4* iligne;
-    char** cligne;
-
-  if (ND>0) dligne = new double[ND];
-  else dligne=NULL;
-  if (NF>0) fligne = new float[NF];
-  else fligne=NULL;
-  if (NI) iligne = new int[NI];
-  else iligne=NULL;
-  if (NS) 
-    {
-      cligne = new char*[NS];
-      int  taille_des_chaines=0;
-      for (k=0; k< NS; k++)  taille_des_chaines = max( taille_des_chaines, is.ColStringLengthFromFits(SfitsCol[k]) );
-      for (k=0; k<NS; k++) cligne[k]=new char[taille_des_chaines+1];
-    }
-  else cligne=NULL;
-  int firstln, lastln;
-  if (numberOfLinesToBeRead_ > 0) 
-    {
-      firstln = fistLineToBeRead_;
-      lastln = firstln + numberOfLinesToBeRead_;
-    }
-  else
-    {
-      firstln = 0;
-      lastln  = nbentries;
-    }
-  int numLigne;
-  for (numLigne=firstln; numLigne < lastln; numLigne++)
-    {
-      const FitsFile::BufferLine& bfligne = is.GetBufferLine(numLigne);
-      int k;
-      int rang;
-      int dcount =0;
-      int fcount =0;
-      int icount =0;
-      int ccount = 0;
-      for (k=0; k<nbcols;k++)
-	{
-	  rang = bfligne.identificateur()[k].second;
-	  switch (bfligne.identificateur()[k].first)
-	    {
-	    case  FitsFile::FitsDataType_double :
-	      {
-		dligne[dcount++] =  bfligne.r_8Array(rang);
-		break;
-	      }
-	    case  FitsFile::FitsDataType_float :
-	      {
-		fligne[fcount++] =  bfligne.r_4Array(rang);
-		break;
-	      }
-	    case  FitsFile::FitsDataType_short :
-	      {
-		iligne[icount++] =  bfligne.int_2Array(rang);
-		break;
-	      }
-	    case  FitsFile::FitsDataType_int :
-	      {
-		iligne[icount++] =  bfligne.int_4Array(rang);
-		break;
-	      }
-	    case  FitsFile::FitsDataType_long :
-	      {
-		iligne[icount++] =  (int_4)bfligne.int_8Array(rang);
-		break;
-	      }
-	    case  FitsFile::FitsDataType_byte :
-	      {
-		iligne[icount++] =  (int_4)bfligne.u_charArray(rang);
-		break;
-	      }
-	    case FitsFile::FitsDataType_char :
-	      {
-		strncpy( cligne[ccount++], bfligne.stringArray(rang).c_str(),bfligne.stringArray(rang).length());
-		break;
-	      }
-
-	    default:
-	      {  
-		throw PException(" FITS_XNTuple::ReadFromFits : unsupported FITS data type");
-	      }
-	    }
-	
-	}
-      //      is.GetBinTabLine(numLigne, dligne, fligne, iligne, cligne );
-      //      dobj_->Fill((r_8*)dligne, (r_4*)fligne, (int_4*)iligne, cligne);    
-      dobj_->Fill(dligne, fligne, iligne, cligne);    
-    }
-    delete [] dligne;
-    delete [] fligne;
-    delete [] iligne;
-    for (k=0; k< SfitsCol.size(); k++) delete []  cligne[k];
-    delete [] cligne; 
-  dobj_->Info()=is.DVListFromFits();
-
-}
-void FITS_XNTuple::WriteToFits(FitsOutFile& os) 
-{
-
-  if(dobj_ == NULL) 
-    {
-      cout << " WriteToFits:: dobj_= null " << endl;
-      return;
-    }
-
-  // table will have 'ncols'  columns
-  int ncols = dobj_->NVar(); 
-  // table will have 'nrows' rows
-  int nrows = dobj_->NEntry();
-  //  cout << " FITS_XNTuple::WriteToFits : nombre de lignes a ecrire " << nrows << endl;
-  // get names and values from the join DVList object
-  DVList dvl= dobj_->Info();
-  // extension name
-  string extname("XNTuple_Binary_tbl"); 
-  vector<string> Noms(ncols);   
-  int k;
-  for (k=0; k< ncols; k++)
-    {
-      Noms[k] = dobj_->NomIndex(k) ;
-    }
-  string types;
-  for (k=0; k<dobj_->NDVar();k++)
-    {
-      types+='D';
-    }
-  for (k=0; k<dobj_->NFVar();k++)
-    {
-      types+='E';
-    }
-  for (k=0; k<dobj_->NIVar();k++)
-    {
-      types+='J';
-    }
-  for (k=0; k<dobj_->NSVar();k++)
-    {
-      types+='A';
-    }            
-  vector<int> StringSizes(dobj_->NSVar());
-  for (k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
-  dvl["Content"]= "XNTuple";
-  dvl.SetComment("Content", "name of SOPHYA object");
-  os.makeHeaderBntblOnFits(types, Noms, nrows, ncols, &dvl, extname,StringSizes); 
-   
-  int compt=0; 
-   if (dobj_->NDVar() > 0) 
-     {
-       double* dcolumn = new double[nrows];
-       for (k=0; k<dobj_->NDVar();k++)
-	 {
-           int j;
-	   for(j = 0; j < nrows; j++) dcolumn[j]= dobj_->GetDVal(j,compt);
-	   os.PutColToFits(compt, nrows, dcolumn);
-	   compt++;
-	 }
-       delete [] dcolumn;
-     }
-
-   if (dobj_->NFVar() > 0)
-     {
-       float* fcolumn = new float[nrows];
-       for (k=0; k<dobj_->NFVar();k++)
-	 {
-           int j;
-	   for(j = 0; j < nrows; j++) fcolumn[j]= dobj_->GetFVal(j,compt);
-	   os.PutColToFits(compt, nrows, fcolumn);
-	   compt++;
-	 }
-       delete [] fcolumn;
-     }
-
-   if (dobj_->NIVar() > 0)
-     { 
-       int_4* icolumn = new int_4[nrows];
-       for (k=0; k<dobj_->NIVar();k++)
-	 {
-           int j; 
-	   for(j = 0; j < nrows; j++) icolumn[j]= dobj_->GetIVal(j,compt);
-	   //	   for(j = 0; j < nrows; j++) cout << icolumn[j] << endl;;
-
-	   os.PutColToFits(compt, nrows, icolumn);
-	   compt++;
-	 }
-       delete [] icolumn;
-     }
-
-   if (dobj_->NSVar() > 0)
-     {
-      char**  ccolumn = new char*[nrows];
-      for (k=0; k<dobj_->NSVar();k++)
-	{
-	  int j;
-	  for(j = 0; j < nrows; j++)
-	    {
-	      string s= dobj_->GetSVal(j,compt);
-	      ccolumn[j] = new char[dobj_->mStrSz+1];
-	      strcpy(ccolumn[j],s.c_str());
-	    }
-	  os.PutColToFits(compt, nrows, ccolumn);
-	  compt++;
-	  for(j = 0; j < nrows; j++)
-	    {
-	      delete [] ccolumn[j];
-	      ccolumn[j] = NULL;
-	    }
-
-	}
-      delete [] ccolumn;
-     }
-}
Index: unk/SophyaExt/FitsIOServer/fitsxntuple.h
===================================================================
--- /trunk/SophyaExt/FitsIOServer/fitsxntuple.h	(revision 3571)
+++ 	(revision )
@@ -1,79 +1,0 @@
-// Guy Le Meur 03/2000
-
-
-#ifndef FITSXNTuple_SEEN
-#define FITSXNTuple_SEEN
-#include "machdefs.h"
-#include "xntuple.h"
-#include "anydataobj.h"
-#include "ppersist.h"
-#include "fitsfile.h"
-
-namespace SOPHYA {
-///////////////////////////////////////////////////////////
-//   Les objets delegues pour la gestion de persistance sur fichiers fits 
-//   pour XNTuple
-///////////////////////////////////////////////////////////
-
-class  FITS_XNTuple : public FitsIOHandler  
-{
-
-public:
-FITS_XNTuple();
-FITS_XNTuple(char inputfile[],int hdunum=0);
-FITS_XNTuple(const XNTuple & obj);
-FITS_XNTuple(XNTuple* obj);
-~FITS_XNTuple();
-
-virtual   AnyDataObj* DataObj() { return(dobj_); }
-virtual   void        SetDataObj(AnyDataObj & o) 
-  {   
-    XNTuple* po = dynamic_cast<  XNTuple* >(& o); 
-    if (po == NULL) return;
-    if (ownobj_ && dobj_) delete dobj_;  
-    dobj_ = po; 
-    ownobj_ = false; 
-  }    
-
-
-/*!
-fill the XNTuple only with lines from firstLine-th to (firstLine+numberOfLines-1)-th of the FITS-file inputfile.
-\param <firstLine>  first line  to be read (the first line of the file is numbered 0)
-\param <numberOfLines>  number of lines to be read
-*/
-void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=0);
-inline operator XNTuple() { return(*dobj_); }
-inline XNTuple * getObj() { return(dobj_); }
-
-protected:
-
-  // implementation de FitsFile
- virtual void  ReadFromFits(FitsInFile& is);
-virtual void    WriteToFits(FitsOutFile& os) ;
-
- private :
-
-
-inline void InitNull()
-   {
-     fistLineToBeRead_= -1;
-     numberOfLinesToBeRead_= -1;
-   }
-
-  // attributs de classe
-  XNTuple* dobj_;
-  bool    ownobj_;
-  int fistLineToBeRead_;
-  int numberOfLinesToBeRead_;
-};
-//////////////////////////////////////////////////////////////////
-
-inline FitsOutFile& operator << (FitsOutFile& fios, XNTuple & nt)
-  { FITS_XNTuple fih(&nt); fih.Write(fios); return (fios); }
-
-inline FitsInFile& operator >> (FitsInFile& fiis, XNTuple & nt)
-  { FITS_XNTuple fih(&nt); fih.Read(fiis); return (fiis); }
-
-} // Fin du namespace
-
-#endif
Index: /trunk/SophyaExt/FitsIOServer/objlist.list
===================================================================
--- /trunk/SophyaExt/FitsIOServer/objlist.list	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/objlist.list	(revision 3572)
@@ -5,5 +5,4 @@
 fbtntintf.o
 fiosinit.o
-fitsautoreader.o
 fitsbntbllineRW.o
 fitsfile.o
@@ -19,4 +18,3 @@
 fitsspherethetaphi.o
 fitstarray.o
-fitsxntuple.o
 swfitsdtable.o
Index: /trunk/SophyaExt/FitsIOServer/smakefile
===================================================================
--- /trunk/SophyaExt/FitsIOServer/smakefile	(revision 3571)
+++ /trunk/SophyaExt/FitsIOServer/smakefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o $(SOPHYAOBJP)swfitsdtable.o
+	 rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)swfitsdtable.o
 	rm -f $(SOPHYALIBP)libFitsIOServer.a
  
-$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o $(SOPHYAOBJP)swfitsdtable.o
+$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fiosinit.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitsgenedata.o $(SOPHYAOBJP)fitshdtable.o $(SOPHYAOBJP)fitshisterr.o $(SOPHYAOBJP)fitshistos.o $(SOPHYAOBJP)fitsinoutfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsmanager.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)swfitsdtable.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libextsophya.objlist
@@ -184,53 +184,4 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fiosinit.cc
  
-$(SOPHYAOBJP)fitsautoreader.o: fitsautoreader.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)machdefs.h fitsautoreader.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)anydataobj.h fitsfile.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h fitsinoutfile.h \
-  $(SOPHYAINCP)FitsIO/fitsio.h \
-  $(SOPHYAINCP)FitsIO/longnam.h fitshandler.h \
-  fitstarray.h $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h fitsspherehealpix.h \
-  $(SOPHYAINCP)spherehealpix.h \
-  $(SOPHYAINCP)sphericalmap.h \
-  $(SOPHYAINCP)smathconst.h \
-  $(SOPHYAINCP)pixelmap.h \
-  $(SOPHYAINCP)spherepos.h \
-  $(SOPHYAINCP)unitvector.h \
-  $(SOPHYAINCP)vector3d.h \
-  $(SOPHYAINCP)longlat.h \
-  $(SOPHYAINCP)utilgeom.h \
-  $(SOPHYAINCP)datatype.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)HEALPixUtils.h fitsntuple.h \
-  $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)ppersist.h fitsxntuple.h \
-  $(SOPHYAINCP)xntuple.h fitslocalmap.h \
-  $(SOPHYAINCP)localmap.h fbtntintf.h \
-  $(SOPHYAINCP)ntupintf.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsautoreader.cc
- 
 $(SOPHYAOBJP)fitsbntbllineRW.o: fitsbntbllineRW.cc \
   $(SOPHYAINCP)sopnamsp.h \
@@ -633,30 +584,4 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitstarray.cc
  
-$(SOPHYAOBJP)fitsxntuple.o: fitsxntuple.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)machdefs.h fitsxntuple.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)ppersist.h fitsfile.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)dvlist.h fitsinoutfile.h \
-  $(SOPHYAINCP)FitsIO/fitsio.h \
-  $(SOPHYAINCP)FitsIO/longnam.h fitshandler.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsxntuple.cc
- 
 $(SOPHYAOBJP)swfitsdtable.o: swfitsdtable.cc swfitsdtable.h \
   $(SOPHYAINCP)basedtable.h \
Index: /trunk/SophyaExt/IFFTW/fftw3server.cc
===================================================================
--- /trunk/SophyaExt/IFFTW/fftw3server.cc	(revision 3571)
+++ /trunk/SophyaExt/IFFTW/fftw3server.cc	(revision 3572)
@@ -209,5 +209,5 @@
   sa_size_t n = in.NElts();
   sa_size_t ncs = n/2+1;
-  sa_size_t nc = (n%2 != 0) ? n/2+1 : n/2;
+  //unused: sa_size_t nc = (n%2 != 0) ? n/2+1 : n/2;
   if (out.NElts() != ncs)
     throw SzMismatchError("FFTWServer::ReShapetoCompl() - Wrong output array size !");
@@ -398,5 +398,5 @@
   sa_size_t n = in.NElts();
   sa_size_t ncs = n/2+1;
-  sa_size_t nc = (n%2 != 0) ? n/2+1 : n/2;
+  //unused: sa_size_t nc = (n%2 != 0) ? n/2+1 : n/2;
   if (out.NElts() != ncs)
     throw SzMismatchError("FFTWServer::ReShapetoCompl() - Wrong output array size !");
Index: /trunk/SophyaExt/LinAlg/intflapack.cc
===================================================================
--- /trunk/SophyaExt/LinAlg/intflapack.cc	(revision 3571)
+++ /trunk/SophyaExt/LinAlg/intflapack.cc	(revision 3572)
@@ -178,5 +178,5 @@
 extern "C" {
 // Le calculateur de workingspace
-  int_4 ilaenv(int_4 *ispec,char *name,char *opts,int_4 *n1,int_4 *n2,int_4 *n3,int_4 *n4,
+  int_4 ilaenv(int_4 *ispec,const char *name,const char *opts,int_4 *n1,int_4 *n2,int_4 *n3,int_4 *n4,
                 int_4 nc1,int_4 nc2);
 
@@ -300,5 +300,5 @@
 ////////////////////////////////////////////////////////////////////////////////////
 template <class T>
-int_4 LapackServer<T>::ilaenv_en_C(int_4 ispec,char *name,char *opts,int_4 n1,int_4 n2,int_4 n3,int_4 n4)
+int_4 LapackServer<T>::ilaenv_en_C(int_4 ispec,const char *name,const char *opts,int_4 n1,int_4 n2,int_4 n3,int_4 n4)
 {
  int_4 nc1 = strlen(name), nc2 = strlen(opts), rc=0;
@@ -519,5 +519,5 @@
   int_4 info;
 
-  int_4 minmn = (m < n) ? m : n;
+  //unused: int_4 minmn = (m < n) ? m : n;
   int_4 maxmn = (m > n) ? m : n;
   int_4 maxmnrhs = (nrhs > maxmn) ? nrhs : maxmn;
@@ -788,5 +788,5 @@
   int_4 m = a.Size(rowa);
   int_4 n = a.Size(cola);
-  int_4 maxmn = (m > n) ? m : n;
+  //unused: int_4 maxmn = (m > n) ? m : n;
   int_4 minmn = (m < n) ? m : n;
 
Index: /trunk/SophyaExt/LinAlg/intflapack.h
===================================================================
--- /trunk/SophyaExt/LinAlg/intflapack.h	(revision 3571)
+++ /trunk/SophyaExt/LinAlg/intflapack.h	(revision 3572)
@@ -40,5 +40,5 @@
   int SVDDriver(TArray<T>& a, TArray<T> & s, 
 		TArray<T>* up=NULL, TArray<T> * vtp=NULL);
-  int_4 ilaenv_en_C(int_4 ispec,char *name,char *opts,int_4 n1,int_4 n2,int_4 n3,int_4 n4);
+  int_4 ilaenv_en_C(int_4 ispec,const char *name,const char *opts,int_4 n1,int_4 n2,int_4 n3,int_4 n4);
   int_4 type2i4(void *val,int nbytes);
 
Index: /trunk/SophyaExt/XAstroPack/mollweide.cc
===================================================================
--- /trunk/SophyaExt/XAstroPack/mollweide.cc	(revision 3571)
+++ /trunk/SophyaExt/XAstroPack/mollweide.cc	(revision 3572)
@@ -48,5 +48,5 @@
  \endverbatim
 */
-double MollWeide_XY(double longitude,double latitude,double* xmoll,double*ymoll)
+double MollWeide_XY(double longitude,double latitude,double& xmoll,double& ymoll)
 {
  int i,niter=2;
@@ -90,6 +90,6 @@
 
  t0 *= asgn;
- *xmoll = 2.*M_SQRT2*(longitude-M_PI)/M_PI*cos(t0);
- *ymoll = M_SQRT2*sin(t0);
+ xmoll = 2.*M_SQRT2*(longitude-M_PI)/M_PI*cos(t0);
+ ymoll = M_SQRT2*sin(t0);
 
  return t0;
@@ -118,9 +118,9 @@
  \endverbatim
 */
-double MollWeide_LL(double xmoll,double ymoll,double* longitude,double* latitude)
+double MollWeide_LL(double xmoll,double ymoll,double& longitude,double& latitude)
 {
  double t,a,eps=1.e-20;
 
- *longitude = *latitude = -999.;
+ longitude = latitude = -999.;
  if(xmoll<-2*M_SQRT2 || xmoll>2*M_SQRT2) return(-901.);
  if(ymoll<-M_SQRT2 || ymoll>M_SQRT2) return(-902.);
@@ -130,9 +130,9 @@
 
  a = (2.*t+sin(2.*t))/M_PI; if(a<-1.) a=-1.; else if(a>1.) a=1.;
- *latitude = asin(a);
+ latitude = asin(a);
 
  a= cos(t);
  if(fabs(a)<eps) return(-903.);
- *longitude = M_PI*(xmoll/(2.*M_SQRT2*a)+1.);
+ longitude = M_PI*(xmoll/(2.*M_SQRT2*a)+1.);
 
  return(t);
Index: /trunk/SophyaExt/XAstroPack/mollweide.h
===================================================================
--- /trunk/SophyaExt/XAstroPack/mollweide.h	(revision 3571)
+++ /trunk/SophyaExt/XAstroPack/mollweide.h	(revision 3572)
@@ -1,5 +1,5 @@
 #ifndef MOLLWEIDE_H_SEEN
 #define MOLLWEIDE_H_SEEN
-double MollWeide_XY(double longitude,double latitude,double* xmoll,double* ymoll);
-double MollWeide_LL(double xmoll,double ymoll,double* longitude,double* latitude);
+double MollWeide_XY(double longitude,double latitude,double& xmoll,double& ymoll);
+double MollWeide_LL(double xmoll,double ymoll,double& longitude,double& latitude);
 #endif
Index: /trunk/SophyaExt/XAstroPack/tstmollweide.cc
===================================================================
--- /trunk/SophyaExt/XAstroPack/tstmollweide.cc	(revision 3571)
+++ /trunk/SophyaExt/XAstroPack/tstmollweide.cc	(revision 3572)
@@ -20,5 +20,5 @@
    a = 2.*tvrai+sin(2.*tvrai);
    lat = asin(a/M_PI);
-   tcalc = MollWeide_XY(0.,lat,&x,&y);
+   tcalc = MollWeide_XY(0.,lat,x,y);
    if(fabs(tcalc-tvrai)>tll) {tll = fabs(tcalc-tvrai); txy=tvrai;}
    if(file) fprintf(file,"%e %e %e %e\n",tvrai,tcalc,a,tcalc-tvrai);
@@ -28,6 +28,6 @@
 
  for(lon=0.;lon<360.;lon+=2.5) for(lat=-90.;lat<=90.1;lat+=2.5) {
-   txy = MollWeide_XY(lon*M_PI/180.,lat*M_PI/180.,&x,&y);
-   tll = MollWeide_LL(x,y,&longitude,&latitude);
+   txy = MollWeide_XY(lon*M_PI/180.,lat*M_PI/180.,x,y);
+   tll = MollWeide_LL(x,y,longitude,latitude);
    longitude *= 180./M_PI;
    latitude  *= 180./M_PI;
Index: /trunk/SophyaLib/BaseTools/dvlist.cc
===================================================================
--- /trunk/SophyaLib/BaseTools/dvlist.cc	(revision 3571)
+++ /trunk/SophyaLib/BaseTools/dvlist.cc	(revision 3572)
@@ -115,5 +115,5 @@
 /* --Methode-- */
 /*! Copy constructor - Object initialized using the PPF file \b flnm */
-DVList::DVList(char *flnm)
+DVList::DVList(const char *flnm)
 {
 PInPersist s(flnm);
@@ -192,5 +192,5 @@
 // int_8   GetI(string const& key, int_8  def=-1)
 // r_8     GetD(string const& key, r_8 def=-9.e19)
-// string  GetS(string const& key, char* def="")
+// string  GetS(string const& key, const char* def="")
 //	Retourne la valeur de la variable de nom "key" et de type entier, réél, 
 //	chaine de caracteres.
@@ -245,5 +245,5 @@
 /*! Returns the value corresponding to name \b key, converted to string
     Default value \b def is returned if name \b key not found */
-string      DVList::GetS(string const& key, char* def) const
+string      DVList::GetS(string const& key, const char* def) const
 {
 ValList::const_iterator it = mvlist.find(key);
@@ -265,5 +265,5 @@
 // void  SetD(string const& key, r_8 val)
 // void  SetZ(string const& key, complex<r_8> val)
-// void  SetS(string const& key, char*  val)
+// void  SetS(string const& key, const char*  val)
 // void  SetS(string const& key, string val)
 //	Crée la variable de nom "key", de type entier, double, complexe, string et 
@@ -322,5 +322,5 @@
 /* --Methode-- */
 /*! Appends or sets the string value \b val in the list with name \b key */
-void        DVList::SetS(string const& key, char const* val)
+void        DVList::SetS(string const& key, const char * val)
 {
 MuTyV div(val);
Index: /trunk/SophyaLib/BaseTools/dvlist.h
===================================================================
--- /trunk/SophyaLib/BaseTools/dvlist.h	(revision 3571)
+++ /trunk/SophyaLib/BaseTools/dvlist.h	(revision 3572)
@@ -25,5 +25,5 @@
                     DVList();
                     DVList(const DVList&);
-                    DVList(char *flnm);
+                    DVList(const char *flnm);
 
   virtual           ~DVList();
@@ -35,12 +35,12 @@
 
   //! Returns the number of elements (variables) in DVList object 
-  inline int	    Size() { return(mvlist.size()); }
+  inline size_t     Size() const { return(mvlist.size()); }
   //! Returns the number of elements (variables) in DVList object 
-  inline int	    NVar() { return(mvlist.size()); }
+  inline size_t     NVar() const { return(mvlist.size()); }
 
   int_8             GetI(string const& key, int_8 def=-1) const;
   r_8               GetD(string const& key, r_8 def=-9.e19) const;
   complex<r_8>      GetZ(string const& key, complex<r_8> def=-9.e19) const;
-  string            GetS(string const& key, char* def="") const;
+  string            GetS(string const& key, const char* def="") const;
   string            GetComment(string const& key) const;
 
@@ -51,5 +51,5 @@
   void              SetD(string const& key, r_8 val);
   void              SetZ(string const& key, complex<r_8> val);
-  void              SetS(string const& key, char const*  val);
+  void              SetS(string const& key, const char *  val);
   void              SetS(string const& key, string const& val);
   void              SetT(string const& key, TimeStamp const& val);
Index: /trunk/SophyaLib/BaseTools/ppfbinstream.cc
===================================================================
--- /trunk/SophyaLib/BaseTools/ppfbinstream.cc	(revision 3571)
+++ /trunk/SophyaLib/BaseTools/ppfbinstream.cc	(revision 3572)
@@ -511,5 +511,5 @@
 	GetI8(i8);  // nb objets toplevel
 	GetU8(ui8); // nb de nametag
-	for(int kt=0; kt<ui8; kt++) {
+	for(uint_8 kt=0; kt<ui8; kt++) {
 	  GetRawI4(i4);
 	  s->seekg(i4,ios::cur);
@@ -994,5 +994,5 @@
   int_4 tsz;
   GetRawI4(tsz);
-  if (tsz != sz)
+  if (tsz != (int_4)sz)
     throw FileFormatExc("PPFBinaryInputStream::GetPosTagTable Size mismatch ");
   for(int kk=0; kk<tsz; kk++)
@@ -1036,5 +1036,5 @@
   // Pour indenter lors de l'impression 
   #define _MXINDENT_ 10 
-  char * indents[_MXINDENT_+1] = {"","  ", "    ", "      ", "        ", "          ",
+  const char * indents[_MXINDENT_+1] = {"","  ", "    ", "      ", "        ", "          ",
 				    "            ", "              ", "                ",
 				    "                  ", "                    "};
@@ -1150,5 +1150,5 @@
 	  GetI8s(stats,8); 
 	  GetRawU8(ui8); // nb de nametag
-	  for(int kt=0; kt<ui8; kt++) {
+	  for(uint_8 kt=0; kt<ui8; kt++) {
 	    string tname;
 	    GetRawI8(i8);
Index: /trunk/SophyaLib/BaseTools/sophyainit.cc
===================================================================
--- /trunk/SophyaLib/BaseTools/sophyainit.cc	(revision 3571)
+++ /trunk/SophyaLib/BaseTools/sophyainit.cc	(revision 3572)
@@ -193,5 +193,5 @@
 double SophyaInitiator::GetVersion(string& svers)
 {
-  char* compiler = 0;
+  const char* compiler = 0;
   #ifdef __GNUG__
   compiler = "gcc " __VERSION__;
Index: /trunk/SophyaLib/BaseTools/sversion.h
===================================================================
--- /trunk/SophyaLib/BaseTools/sversion.h	(revision 3571)
+++ /trunk/SophyaLib/BaseTools/sversion.h	(revision 3572)
@@ -3,6 +3,6 @@
 
 #define SOPHYA_VERSION   2.1
-#define SOPHYA_REVISION  25
-#define SOPHYA_TAG       "V_Sep2008"
+#define SOPHYA_REVISION  30
+#define SOPHYA_TAG       "V_Fev2009"
 
 #endif
Index: /trunk/SophyaLib/HiStats/Makefile
===================================================================
--- /trunk/SophyaLib/HiStats/Makefile	(revision 3571)
+++ /trunk/SophyaLib/HiStats/Makefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o $(SOPHYAOBJP)xntuple.o
+	 rm -f $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o
 	rm -f $(SOPHYALIBP)libHiStats.a
  
-$(SOPHYALIBP)libHiStats.a : $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o $(SOPHYAOBJP)xntuple.o
+$(SOPHYALIBP)libHiStats.a : $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -228,7 +228,6 @@
   $(SOPHYAINCP)utils.h hisprof.h histerr.h \
   hist2err.h $(SOPHYAINCP)tmatrix.h ntuple.h \
-  ntupintf.h $(SOPHYAINCP)dvlist.h xntuple.h \
-  datatable.h basedtable.h \
-  $(SOPHYAINCP)segdatablock.h \
+  ntupintf.h $(SOPHYAINCP)dvlist.h datatable.h \
+  basedtable.h $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)thsafeop.h swppfdtable.h \
   $(SOPHYAINCP)swsegdb.h \
@@ -384,20 +383,2 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  swppfdtable.cc
  
-$(SOPHYAOBJP)xntuple.o: xntuple.cc $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)perrors.h xntuple.h \
-  $(SOPHYAINCP)machdefs.h ntupintf.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  xntuple.cc
- 
Index: /trunk/SophyaLib/HiStats/histats.h
===================================================================
--- /trunk/SophyaLib/HiStats/histats.h	(revision 3571)
+++ /trunk/SophyaLib/HiStats/histats.h	(revision 3572)
@@ -9,5 +9,4 @@
 #include "hist2err.h"
 #include "ntuple.h"
-#include "xntuple.h"
 #include "datatable.h"
 #include "swppfdtable.h"
Index: /trunk/SophyaLib/HiStats/histinit.cc
===================================================================
--- /trunk/SophyaLib/HiStats/histinit.cc	(revision 3571)
+++ /trunk/SophyaLib/HiStats/histinit.cc	(revision 3572)
@@ -12,5 +12,4 @@
 #include "hist2err.h"
 #include "ntuple.h"
-#include "xntuple.h"
 #include "datatable.h"
 #include "swppfdtable.h"
@@ -39,5 +38,4 @@
   - Histo2DErr
   - NTuple
-  - XNTuple
   - DataTable
   - SwPPFDataTable
@@ -70,6 +68,4 @@
   PPRegister(ObjFileIO<NTuple>);
   DObjRegister(ObjFileIO<NTuple>, NTuple);
-  PPRegister(ObjFileIO<XNTuple>);
-  DObjRegister(ObjFileIO<XNTuple>, XNTuple);
 
   PPRegister(ObjFileIO<BaseDataTable>);
Index: /trunk/SophyaLib/HiStats/histos.cc
===================================================================
--- /trunk/SophyaLib/HiStats/histos.cc	(revision 3571)
+++ /trunk/SophyaLib/HiStats/histos.cc	(revision 3572)
@@ -1550,5 +1550,5 @@
 
 // Ecriture entete pour identifier facilement
-sprintf(strg,"V_2 mBins=%6d  NEnt=%15d  errok=%1d",dobj->mBins,dobj->nEntries,errok);
+sprintf(strg,"V_2 mBins=%6d  NEnt=%15llu  errok=%1d",dobj->mBins,dobj->nEntries,errok);
 os.PutLine(strg);
 sprintf(strg,"binw=%g  mMin=%g mMax=%g",dobj->binWidth,dobj->mMin,dobj->mMax);
Index: /trunk/SophyaLib/HiStats/ntuple.cc
===================================================================
--- /trunk/SophyaLib/HiStats/ntuple.cc	(revision 3571)
+++ /trunk/SophyaLib/HiStats/ntuple.cc	(revision 3572)
@@ -26,5 +26,5 @@
    #include "ntuple.h"
    // ...
-   char * names[3] = {"XPos", "YPos", "Val"};
+   const char * names[3] = {"XPos", "YPos", "Val"};
    // NTuple (Table) creation with 3 columns (double precision)
    NTuple  nt(3, names);
@@ -73,8 +73,8 @@
 
 
-//! Constructor with specification of number of columns and column name
+//! Constructor with specification of number of columns and column names
 /*!
   \param nvar : Number of columns in the table 
-  \param noms : Array of column names (length(name) < 8 characters) 
+  \param noms : Array of column names
   \param blk : Optional argument specifying number of table lines
   in a given data block
@@ -90,33 +90,35 @@
 //--
 {
-mNVar = mNEnt = mBlk = mNBlk = 0;
-mVar = NULL;
-mVarD = NULL;
-mInfo = NULL;
-mThS = NULL; 
-if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
-mNVar = nvar;
-mVar = new r_4[nvar];
-mVarD = new r_8[nvar];
-if (blk < 10) blk = 10;
-mBlk = blk;
-
-if (fgdouble) {
-  r_8* pt = new r_8[nvar*blk];
-  mNBlk = 1;
-  mPtrD.push_back(pt);
-  mFgDouble = true;
-}
-else { 
-  r_4* pt = new r_4[nvar*blk];
-  mNBlk = 1;
-  mPtr.push_back(pt);
-  mFgDouble = false;
-}
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with char** noms"); 
+Initialize(nvar,blk,fgdouble);
 for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
 return;
 }
 
-//! Constructor with specification of number of columns and column name
+
+//! Constructor with specification of number of columns and column names
+/*!
+  \param nvar : Number of columns in the table 
+  \param noms : Array of column names
+  \param blk : Optional argument specifying number of table lines
+  in a given data block
+  \param fgdouble : if \b true: internal data kept as double precision values (r_8),
+  simple precision (r_4) otherwise
+ */
+//++
+NTuple::NTuple(int nvar, const char** noms, int blk, bool fgdouble)
+//
+//	Createur d'un ntuple de `nvar' variables dont les
+//	noms sont dans le tableau de chaines de caracteres `noms'
+//	avec `blk' d'evenements par blocks.
+//--
+{
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with const char** noms"); 
+Initialize(nvar,blk,fgdouble);
+for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+return;
+}
+
+//! Constructor with specification of number of columns and column names as a string vector
 /*!
   \param noms : Array of column names (length(name) < 8 characters) 
@@ -128,4 +130,16 @@
 NTuple::NTuple(vector<string>& noms, int blk, bool fgdouble)
 {
+int nvar = noms.size();
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with vector<string>& noms");
+Initialize(nvar,blk,fgdouble);
+for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+return;
+}
+
+
+/* --Methode-- */
+/* Initialisation pour Createurs (fonction privee) */
+void NTuple::Initialize(int nvar, int blk, bool fgdouble)
+{
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
@@ -133,6 +147,4 @@
 mInfo = NULL;
 mThS = NULL; 
-int nvar = noms.size();
-if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
 mNVar = nvar;
 mVar = new r_4[nvar];
@@ -153,5 +165,5 @@
   mFgDouble = false;
 }
-for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+
 return;
 }
@@ -206,4 +218,5 @@
 Clean();
 }
+
 /* --Methode-- */ 
 /*!
@@ -494,5 +507,5 @@
 //--
 {
-char * tt = "float"; 
+const char * tt = "float"; 
 if (mFgDouble) tt = "double";
 os << "NTuple T=" << tt << " : NVar= " << mNVar << " NEnt=" << mNEnt  
Index: /trunk/SophyaLib/HiStats/ntuple.h
===================================================================
--- /trunk/SophyaLib/HiStats/ntuple.h	(revision 3571)
+++ /trunk/SophyaLib/HiStats/ntuple.h	(revision 3572)
@@ -30,4 +30,5 @@
   NTuple();
   NTuple(int nvar, char** noms, int blk=512, bool fgdouble=true);
+  NTuple(int nvar, const char** noms, int blk=512, bool fgdouble=true);
   NTuple(vector<string>& noms, int blk=512, bool fgdouble=true);
   NTuple(const NTuple& NT);
@@ -96,4 +97,5 @@
 
 private:
+  void Initialize(int nvar, int blk, bool fgdouble);
   void  Clean();
 
Index: /trunk/SophyaLib/HiStats/objlist.list
===================================================================
--- /trunk/SophyaLib/HiStats/objlist.list	(revision 3571)
+++ /trunk/SophyaLib/HiStats/objlist.list	(revision 3572)
@@ -12,3 +12,2 @@
 proxtuple.o
 swppfdtable.o
-xntuple.o
Index: /trunk/SophyaLib/HiStats/proxtuple.cc
===================================================================
--- /trunk/SophyaLib/HiStats/proxtuple.cc	(revision 3571)
+++ /trunk/SophyaLib/HiStats/proxtuple.cc	(revision 3572)
@@ -41,5 +41,5 @@
   if (_tuple==0) {
     char** names=new char* [N];
-    for (int i=0;i<N;i++) names[i]=const_cast<char*>(_name[i].c_str());
+    for (int i=0;i<N;i++) names[i]=const_cast<char *>(_name[i].c_str());
     _tuple=new NTuple(N,names);
     delete[] names;
@@ -52,4 +52,3 @@
   _val.clear();
 
-
 }
Index: /trunk/SophyaLib/HiStats/smakefile
===================================================================
--- /trunk/SophyaLib/HiStats/smakefile	(revision 3571)
+++ /trunk/SophyaLib/HiStats/smakefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o $(SOPHYAOBJP)xntuple.o
+	 rm -f $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o
 	rm -f $(SOPHYALIBP)libHiStats.a
  
-$(SOPHYALIBP)libHiStats.a : $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o $(SOPHYAOBJP)xntuple.o
+$(SOPHYALIBP)libHiStats.a : $(SOPHYAOBJP)basedtable.o $(SOPHYAOBJP)datatable.o $(SOPHYAOBJP)fio_dtable.o $(SOPHYAOBJP)hisprof.o $(SOPHYAOBJP)hist2err.o $(SOPHYAOBJP)histerr.o $(SOPHYAOBJP)histinit.o $(SOPHYAOBJP)histos2.o $(SOPHYAOBJP)histos.o $(SOPHYAOBJP)ntupintf.o $(SOPHYAOBJP)ntuple.o $(SOPHYAOBJP)proxtuple.o $(SOPHYAOBJP)swppfdtable.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -228,7 +228,6 @@
   $(SOPHYAINCP)utils.h hisprof.h histerr.h \
   hist2err.h $(SOPHYAINCP)tmatrix.h ntuple.h \
-  ntupintf.h $(SOPHYAINCP)dvlist.h xntuple.h \
-  datatable.h basedtable.h \
-  $(SOPHYAINCP)segdatablock.h \
+  ntupintf.h $(SOPHYAINCP)dvlist.h datatable.h \
+  basedtable.h $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)thsafeop.h swppfdtable.h \
   $(SOPHYAINCP)swsegdb.h \
@@ -384,20 +383,2 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  swppfdtable.cc
  
-$(SOPHYAOBJP)xntuple.o: xntuple.cc $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)perrors.h xntuple.h \
-  $(SOPHYAINCP)machdefs.h ntupintf.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  xntuple.cc
- 
Index: unk/SophyaLib/HiStats/xntuple.cc
===================================================================
--- /trunk/SophyaLib/HiStats/xntuple.cc	(revision 3571)
+++ 	(revision )
@@ -1,1018 +1,0 @@
-#include <string.h>
-#include "ppersist.h"
-#include "perrors.h"
-#include "xntuple.h"
-#ifdef Darwin
-#include <unistd.h>
-#endif
-
-namespace SOPHYA {
-
-#define LENNAME 31 
-#define MAXLEN 128
-#define BADVAL -1.e19
-
-/*!
-   \class XNTuple
-   \ingroup HiStats
-   NTuple class (a Table or 2-D data set) with the possibility of having
-   columns with int, float or string type content. In addition, this class
-   can handle large data sets, using swap space on disk.
-
-   \sa SOPHYA::BaseDataTable SOPHYA::DataTable SOPHYA::SwPPFDataTable
-
-   \deprecated 
-   This class is being deprecated. Use classes derived from SOPHYA::BaseDataTable 
-   whenever possible
-
-
-   \code
-   #include "xntuple.h"
-   // ...
-   char * names[4] = {"X", "X2", "XInt","XStr"};
-   // XNTuple (Table) creation with 4 columns, of integer, 
-   // double(2) and string type
-   XNTuple  xnt(2,0,1,1, names);
-   // Filling the NTuple
-   r_8 xd[2];
-   int_4 xi[2];
-   char xss[2][32];
-   char * xs[2] = {xss[0], xss[1]} ;
-   for(int i=0; i<50; i++) {
-     xi[0] = i;  xd[0] = i+0.5;  xd[1] = xd[0]*xd[0];
-     sprintf(xs[0],"X=%g", xd[0]);
-     xnt.Fill(xd, NULL, xi, xs);
-   }
-   // Printing table info
-   cout << xnt ;
-   // Saving object into a PPF file
-   POutPersist po("xnt.ppf");
-   po << xnt ;
-   \endcode
-   
-*/
-
-//++
-// Class	XNTuple
-// Lib		Outils++ 
-// include	xntuple.h
-//
-//	Classe de ntuples
-//--
-//++
-// Links	Parents
-// PPersist
-// NTupleInterface
-//--
-//++
-// Links	Voir aussi
-// NTuple
-//--
-
-
-char* XNTuple::glob_swp = NULL ; 
-long int  XNTuple::NbNT = 0 ; 
-
-
-NTBlk::NTBlk(int ndvar, int nfvar, int nivar, int nsvar, int strsz, int sz) 
-    : sw(0), // pas swappe 
-      swoff(-1), 
-      ddata(NULL), fdata(NULL), 
-      idata(NULL), sdata(NULL)
-{
-    if(ndvar) ddata = new r_8[ndvar*sz] ; 
-    if(nfvar) fdata = new r_4[nfvar*sz] ; 
-    if(nivar) idata = new int_4[nivar*sz] ; 
-    if(nsvar) sdata = new char[nsvar*(strsz+1)*sz] ; 
-}
-
-NTBlk::~NTBlk()
-{
-    free() ; 
-}
-
-void NTBlk::free() 
-{
-    if(ddata) delete[] ddata ; ddata = NULL ; 
-    if(fdata) delete[] fdata ; fdata = NULL ; 
-    if(idata) delete[] idata ; idata = NULL ; 
-    if(sdata) delete[] sdata ; sdata = NULL ; 
-}
-
-// 
-// relit bloc ds fichier swap 
-// (seulement si bloc n'est plus en memoire) 
-// 
-void XNTuple::read_blk(NTBlk* blk) const 
-{
-    // deja en memoire ? 
-    if( !blk->sw ) return ;  
-    
-    blk->free() ; 
-    
-    // On va --> blk 
-    fseek(swf, blk->swoff, SEEK_SET) ; 
-    
-    if(mD) { 
-	blk->ddata = new r_8[mD*mBlkSz] ; 
-	fread(blk->ddata, sizeof(r_8), mD*mBlkSz, swf) ; 
-    }
-    if(mF) { 
-	blk->fdata = new r_4[mF*mBlkSz] ; 
-	fread(blk->fdata, sizeof(r_4), mF*mBlkSz, swf) ; 
-    }
-    if(mI) { 
-	blk->idata = new int_4[mI*mBlkSz] ; 
-	fread(blk->idata, sizeof(int_4), mI*mBlkSz, swf) ; 
-    }
-    if(mS) { 
-	blk->sdata = new char[mS*(mStrSz+1)*mBlkSz] ; 
-	fread(blk->sdata, sizeof(char), mS*mBlkSz*(mStrSz+1), swf) ; 
-    }
-}
-
-// 
-// swappe le bloc present en memoire 
-// depuis le + longtemps 
-// 
-void XNTuple::swap() const 
-{
-    // fichier de swap ouvert ? 
-    if(!swf) { 
-	swf_name = new char[swp.length()+64] ; 
-	strncpy(swf_name, swp.c_str(), swp.length()+1) ; 
-	strcat(swf_name, "NTupleXXXXXX") ; 
-	//	swf_name = strdup("NTupleXXXXXX") ; 
-	mktemp(swf_name) ; 
-	swf = fopen(swf_name, "w+") ; 
-	if(!swf) throw IOExc("XNTuple::swap() - Error opening swap File");
-    }
-    
-    // bloc a swapper 
-    NTBlk* blk = sw.front() ; 
-    
-    // bloc dans fichiers de swap ? 
-    //    if( blk->swoff > 0 ) 
-    write_blk(blk) ; 
-    blk->free() ; 
-    
-    blk->sw = 1 ; // on marque le bloc swappe 
-    sw.pop_front() ; // on le vire de la liste de swap 
-    mNSwBlk++ ; 
-}
-
-
-// 
-// unswap() 
-// 
-void XNTuple::get_blk(int i) const 
-{
-    if(i<0 || i>=mNBlk) return ; 
-    read_blk(ptr[i]) ; 
-    ptr[i]->sw = 0 ; 
-    sw.push_back(ptr[i]) ; 
-    mNSwBlk-- ; 
-}
-
-
-// 
-// ecrit le bloc en bout de fichier 
-// (seulement si swoff < 0 ) 
-// 
-void XNTuple::write_blk(NTBlk* blk) const 
-{
-    // deja swappe ? 
-    if( blk->swoff >= 0 ) return ; 
-    fseek(swf, 0, SEEK_END) ; 
-    // position debut du bloc 
-    blk->swoff = ftell(swf) ; 
-    if(blk->ddata) fwrite(blk->ddata, sizeof(r_8), mD*mBlkSz, swf) ; 
-    if(blk->fdata) fwrite(blk->fdata, sizeof(r_4),  mF*mBlkSz, swf) ; 
-    if(blk->idata) fwrite(blk->idata, sizeof(int_4),  mI*mBlkSz, swf) ; 
-    if(blk->sdata) fwrite(blk->sdata, sizeof(char),   mS*mBlkSz*(mStrSz+1), swf) ; 
-}
-
-
-void  XNTuple::add_blk() 
-{
-    // l'ancien bloc en ecriture peut maintenant 
-    // etre swappe (s'il existe) 
-    if(mBlk>=0) sw.push_back(ptr[mBlk]) ; 
-    
-    // si pas de place, on swappe 
-    if( mNBlk+1 >= mMaxBlk ) swap() ; 
-    
-    // nouveau bloc 
-    NTBlk* tmp = new NTBlk(mD, mF, mI, mS, mStrSz, mBlkSz) ; 
-    ptr.push_back(tmp) ; 
-    
-    //    mNBlk++ ; 
-    //    mOff = 0 ; 
-    //    mBlk++ ; 
-}
-
-
-XNTuple::XNTuple()
-    : mNEnt(0), mNBlk(0), mNSwBlk(0), 
-      mBlkSz(0), mBlk(-1), mOff(0), 
-      mMaxBlk(0), mStrSz(0), 
-      mD(0), mF(0), mI(0), mS(0), 
-      mVarD(NULL), mMin(NULL), mMax(NULL), 
-      mNVars(0), mNames(NULL), 
-  swf(NULL), swf_name(NULL), mInfo(NULL)
-{
-    if(!glob_swp) SetSwapPath() ; 
-    swp = glob_swp ; 
-    NbNT++ ; 
-}
-
-//++
-// Titre	Constructeurs
-//--
-//++
-// XNTuple(int ndvar, int nfvar, int nivar, int nsvar, char** vnames, -
-//	   int blk=512, int maxblk=100, int strsz=30)
-//	Constructeur - Création d'un XNTuple de "ndvar" variables de type "r_8", -
-//                      "nfvar" de type "r_4", "nivar" de type "int" et "nsvar" de type -
-//                      "char*". 
-//|            * "blk"    = taille blocs de données (en nombre d'entrées) 
-//|            * "maxblk" = nombre max de blocs présents en mémoire (non swappés) 
-//|            * "strsz"  = taille des données de type char* 
-// XNTuple(XNTuple const& nt)
-//	Constructeur de copie.
-// XNTuple(string const& flnm)
-//	Constructeur - lecture à partir d'un fichier PPersist.
-//--
-
-//! Constructor with specification colum types and names
-/*!
-  \param ndvar : Number of columns with type double (r_8)
-  \param nfvar : Number of columns with type float (r_4)
-  \param nivar : Number of columns with type integer (int_4)
-  \param nsvar : Number of columns with type string
-  \param vnames : Column names (in the order r_8 r_4 int_4 string)
-  (colum names are limited to 31 characters)
-  \param blk : data block size (in number of table lines)
-  \param maxblk : Maximum number of data block in memory
-  \param strsz : string length (for string type columns)
- */
-XNTuple::XNTuple(int ndvar, int nfvar, int nivar, int nsvar, 
-		   char** vnames, 
-		   int blk, int maxblk, int strsz)
-    : mNEnt(0), mNBlk(0), mNSwBlk(0), 
-      mBlkSz(blk), mBlk(-1), mOff(0), 
-      mMaxBlk(maxblk), mStrSz(strsz), 
-      mD(ndvar), mF(nfvar), mI(nivar), mS(nsvar), 
-      mVarD(NULL), mMin(NULL), mMax(NULL), 
-      mNVars(ndvar+nfvar+nivar+nsvar), mNames(NULL), 
-      swf(NULL), swf_name(NULL), mInfo(NULL)
-{
-    if(!glob_swp) SetSwapPath() ; 
-    swp = glob_swp ; 
-    
-    mVarD = new r_8[mNVars] ; 
-    mMin  = new r_8[mD+mF+mI] ; 
-    int i;
-    for(i = 0 ; i < (mD+mF+mI) ; i++) mMin[i] =  9E19 ; 
-    mMax  = new r_8[mD+mF+mI] ; 
-    for(i = 0 ; i < (mD+mF+mI) ; i++) mMax[i] = -9E19 ; 
-    
-    if(mNVars) mNames = new char[mNVars*(LENNAME+1)] ; 
-    memset(mNames, 0, mNVars*(LENNAME+1));
-    for(i = 0 ; i < mNVars ; i++)
-      strncpy(mNames+i*(LENNAME+1), vnames[i], LENNAME);
-
-    NbNT++ ; 
-}
-
-
-
-//! Constructor with table initialized from a PPF file
-XNTuple::XNTuple(string const& flnm) 
-    : mNEnt(0), mNBlk(0), mNSwBlk(0), 
-      mBlkSz(0), mBlk(-1), mOff(0), 
-      mMaxBlk(0), mStrSz(0), 
-      mD(0), mF(0), mI(0), mS(0), 
-      mVarD(NULL), mMin(NULL), mMax(NULL), 
-      mNVars(0), mNames(NULL), 
-      swf(NULL), swf_name(NULL), mInfo(NULL)
-{
-    if(!glob_swp) SetSwapPath() ; 
-    swp = glob_swp ; 
-    
-    PInPersist s(flnm);
-    ObjFileIO<XNTuple> fiont(this);
-    fiont.Read(s);
-    NbNT++ ; 
-}
-
-
-//! Copy constructor - Copies the table definition and associated data 
-XNTuple::XNTuple(XNTuple const& nt) 
-    : mNEnt(0), mNBlk(0), mNSwBlk(0), 
-      mBlkSz(0), mBlk(-1), mOff(0), 
-      mMaxBlk(0), mStrSz(0), 
-      mD(0), mF(0), mI(0), mS(0), 
-      mVarD(NULL), mMin(NULL), mMax(NULL), 
-      mNVars(0), mNames(NULL), 
-      swf(NULL), swf_name(NULL), mInfo(NULL) 
-{
-    if(!glob_swp) SetSwapPath() ; 
-    swp = glob_swp ; 
-    Copy(nt) ; 
-    NbNT++ ; 
-}
-
-
-
-XNTuple::~XNTuple()
-{
-    clean() ; 
-    NbNT-- ; 
-    if(NbNT==0) {delete[] glob_swp ; glob_swp = NULL;} 
-}
-
-
-
-//! Clear the data table definition and deletes the associated data
-void XNTuple::clean()
-{
-    // On libere tous les blocs 
-    for(int i = 0 ; i < mNBlk ; i++) 
-	if(!ptr[i]->sw) delete ptr[i] ; 
-    ptr.erase(ptr.begin(), ptr.end()) ; 
-    sw.erase(sw.begin(), sw.end()) ; 
-    
-    // on ferme le fichier de swap 
-    if(swf) { 
-      fclose(swf) ; swf = NULL ; 
-      remove(swf_name) ; 
-      delete swf_name ; swf_name = NULL ; 
-    }
-    // tout le monde remis a 0 
-    mNEnt   = 0 ;     mNBlk   = 0 ; 
-    mNSwBlk = 0 ;     mBlkSz  = 0 ;  
-    mBlk    = -1 ;    mOff    = 0 ; 
-    mMaxBlk = 0 ;     mStrSz  = 0 ; 
-    mD      = 0 ;     mF      = 0 ; 
-    mI      = 0 ;     mS      = 0 ; 
-    mNVars  = 0 ; 
-    
-    
-    if(mVarD) { delete[] mVarD ; mVarD = NULL ; } 
-    if(mMin)  { delete[] mMin  ; mMin  = NULL ; } 
-    if(mMax)  { delete[] mMax  ; mMax  = NULL ; } 
-
-    if(mNames) {delete[] mNames ; mNames = NULL ; }
-    if (mInfo) delete mInfo;
-
-}
-
-
-//++
-// Titre	Méthodes
-//--
-//++
-//  void Fill(r_8* d_data, r_4* f_data, int* i_data, char** s_data) 
-//	Remplissage d'une ligne dans le NTuple
-//  void Show(ostream& os) const 
-//	Impression de la liste des variables avec min-max sur le flot "os"
-//  void Show() const 
-//	Identique à "Show(cout)"
-//  XNTuple&   operator = (XNTuple const& nt) 
-//	Opérateur égal (=) , copie "nt" dans le premier NTuple
-//--
-//! Appends an entry (line) to the table
-/*!
-  \param d_data : double (r_8) line elements
-  \param f_data : float (r_4) line elements
-  \param i_data : integer (int_4) line elements
-  \param s_data : string line elements
- */
-void XNTuple::Fill(r_8* d_data, r_4* f_data, int_4* i_data, char** s_data) 
-{
-    // place disponible dans bloc courant ? 
-    if( mOff==mBlkSz || mOff==0 ) {
-	add_blk() ; mOff = 0 ; mNBlk++ ; mBlk++ ; 
-    }
-    
-    if( mD && !ptr[mBlk]->ddata || 
-	mF && !ptr[mBlk]->fdata || 
-	mI && !ptr[mBlk]->idata || 
-	mS && !ptr[mBlk]->sdata )
-          throw ParmError("XNTuple::Fill(...) Missing (NULL) argument ");
-    
-    r_8 x ; 
-    // copie variables et update mMin, mMax 
-    if(mD) {
-	memcpy(ptr[mBlk]->ddata+mOff*mD, d_data, mD*sizeof(r_8)) ; 
-	for(int i = 0 ; i < mD ; i++) {
-	    x = d_data[i] ; 
-	    if(x<mMin[i]) mMin[i] = x ; 
-	    if(x>mMax[i]) mMax[i] = x ; 
-	}
-    }
-    
-    if(mF) {
-	memcpy(ptr[mBlk]->fdata+mOff*mF, f_data, mF*sizeof(r_4)) ; 
-	for(int i = 0 ; i < mF ; i++) {
-	    x = f_data[i] ; 
-	    if(x<mMin[i+mD]) mMin[i+mD] = x ; 
-	    if(x>mMax[i+mD]) mMax[i+mD] = x ; 
-	}
-    }
-
-    if(mI) {
-	memcpy(ptr[mBlk]->idata+mOff*mI, i_data, mI*sizeof(int_4)) ; 
-	for(int i = 0 ; i < mI ; i++) {
-	    x = i_data[i] ; 
-	    if(x<mMin[i+mD+mF]) mMin[i+mD+mF] = x ; 
-	    if(x>mMax[i+mD+mF]) mMax[i+mD+mF] = x ; 
-	}
-    }
-    for(int i = 0 ; i < mS ; i++) 
-	memcpy(ptr[mBlk]->sdata+(mOff*mS+i)*(mStrSz+1), 
-	       s_data[i], (strlen(s_data[i])+1)*sizeof(char)) ; 
-    mOff++ ; 
-    mNEnt++ ; 
-}
-
-// 
-// A quel index correspond mon nom ? 
-// 
-int XNTuple::IndexNom(char const* nom) const 
-{
-    int i ; 
-    for(i = 0 ; i < (mD+mF+mI+mS) ; i++)
-	if( !strncmp( mNames+i*(LENNAME+1), nom, LENNAME+1) ) 
-	    return i ; 
-    return -1 ; 
-}
-
-string XNTuple::NomIndex(int k) const 
-{
-    if( k<0 || k>=mNVars ) return "" ; 
-    return mNames + k*(LENNAME+1) ; 
-}
-
-
-// 
-// 
-// 
-r_8 XNTuple::GetDVal(int i, int k) const 
-{
-    if( i<0 || i>=mNEnt || k<0 || k>=mD ) 
-        throw RangeCheckError("XNTuple::GetDVal() Invalid line/column index");
-    
-    // Bloc ? 
-    int blk = (int)(i/mBlkSz) ; 
-    int off = i%mBlkSz ; 
-    
-    // bloc swappe ? 
-    if( ptr[blk]->sw ) { get_blk(blk) ; swap() ; } 
-    return ptr[blk]->ddata[off*mD+k] ; 
-}
-
-// 
-// 
-// 
-r_4 XNTuple::GetFVal(int i, int k) const 
-{
-    if( i<0 || i>=mNEnt || k<mD || k>=(mD+mF) ) 
-        throw RangeCheckError("XNTuple::GetFVal() Invalid line/column index");
-    k -= mD ; 
-    
-    // Bloc ? 
-    int blk = (int)(i/mBlkSz) ; 
-    int off = i%mBlkSz ; 
-    
-    // bloc swappe ? 
-    if( ptr[blk]->sw ) { get_blk(blk) ; swap() ; } 
-    return ptr[blk]->fdata[off*mF+k] ; 
-}
-
-// 
-// 
-// 
-int_4 XNTuple::GetIVal(int i, int k) const 
-{
-    if( i<0 || i>=mNEnt || k<(mD+mF) || k>=(mD+mF+mI) )
-        throw RangeCheckError("XNTuple::GetIVal() Invalid line/column index");
-
-    k -= (mD+mF) ; 
-
-    // Bloc ? 
-    int blk = (int)(i/mBlkSz) ; 
-    int off = i%mBlkSz ; 
-    
-    // bloc swappe ? 
-    if( ptr[blk]->sw ) { get_blk(blk) ; swap() ; } 
-
-    return ptr[blk]->idata[off*mI+k] ; 
-}
-
-// 
-// 
-// 
-string  XNTuple::GetSVal(int i, int k) const 
-{
-    if( i<0 || i>=mNEnt || k<(mD+mF+mI) || k>=(mD+mF+mI+mS) )
-        throw RangeCheckError("XNTuple::GetSVal() Invalid line/column index");
-
-    k -= (mD+mF+mI) ; 
-    
-    // Bloc ? 
-    int blk = (int)(i/mBlkSz) ; 
-    int off = i%mBlkSz ; 
-    
-    // bloc swappe ? 
-    if( ptr[blk]->sw ) { get_blk(blk) ; swap() ; } 
-    
-    // copie de la chaine 
-    // string ret = strdup(ptr[blk]->sdata + (off*mS+k)*(mStrSz+1)) ; // $CHECK$ EA fuite de memoire
-       // attention, strdup fait un malloc et on ne fait jamais de free...
-       // a quoi sert ce strdup ?????????
-    string ret = ptr[blk]->sdata + (off*mS+k)*(mStrSz+1) ; 
-    //    return ptr[blk]->sdata[k] ; 
-    return ret ; 
-}
-
-
-// 
-// Copie bloc a bloc, avec meme parametres 
-//  
-void XNTuple::Copy(XNTuple const& nt) 
-{
-    clean() ; 
-    // Parametres 
-    mNEnt = nt.mNEnt ; 
-    mBlkSz = nt.mBlkSz ; 
-    mOff = nt.mOff ; 
-    mMaxBlk = nt.mMaxBlk ; 
-    mStrSz = nt.mStrSz ; 
-    mD = nt.mD ; 
-    mF = nt.mF ; 
-    mI = nt.mI ; 
-    mS = nt.mS ; 
-    mNVars = nt.mNVars ; 
-    
-    // noms 
-    if(mNVars) {
-	mNames = new char[mNVars*(LENNAME+1)] ; 
-        mVarD = new r_8[mNVars];
-	memcpy(mNames, nt.mNames, mNVars*(LENNAME+1)*sizeof(char)) ; 
-    }
-    // MinMax 
-    if(nt.mMin) { 
-	mMin = new r_8[(mD+mF+mI)] ; 
-	memcpy(mMin, nt.mMin, (mD+mF+mI)*sizeof(r_8)) ; 
-    }
-    if(nt.mMax) { 
-	mMax = new r_8[(mD+mF+mI)] ; 
-	memcpy(mMax, nt.mMax, (mD+mF+mI)*sizeof(r_8)) ; 
-    }
-    
-    //dup blocs 
-    mNBlk = 0 ; 
-    mBlk  = -1 ; 
-    for(int i = 0 ; i < nt.mNBlk ; i++) {
-	add_blk() ; mBlk++ ; mNBlk++ ; 
-	// si nt.ptr[i] swappe, on le relit 
-	if(nt.ptr[i]->sw) nt.read_blk(nt.ptr[i]) ; 
-	if(mD) 
-	    memcpy(ptr[i]->ddata, nt.ptr[i]->ddata, mD*mBlkSz*sizeof(r_8)) ; 
-	if(mF)
-	    memcpy(ptr[i]->fdata, nt.ptr[i]->fdata, mF*mBlkSz*sizeof(r_4)) ; 
-	if(mI)
-	    memcpy(ptr[i]->idata, nt.ptr[i]->idata, mF*mBlkSz*sizeof(int_4)) ; 
-	if(mS)
-	    memcpy(ptr[i]->sdata, nt.ptr[i]->sdata, mS*mBlkSz*sizeof(char)*(mStrSz+1)) ; 
-	if(nt.ptr[i]->sw) nt.ptr[i]->free() ; 
-    }
-
-    // DVList Info block 
-    if(nt.mInfo!=NULL) {mInfo = new DVList; *mInfo = *(nt.mInfo);}
-
-}
-
-//++
-// DVList& Info()
-//	Renvoie une référence sur l'objet DVList Associé
-//--
-
-//! Returns the associated DVList object
-DVList&  XNTuple::Info()
-{
-  if (mInfo == NULL)  mInfo = new DVList;
-  return(*mInfo);
-}
-
-void XNTuple::Print(int num, int nmax) const 
-{
-    printf("XNTuple::Print() : \n") ; 
-    printf("  Entrees = %d, Blocs  = %d, Bloc Size = %d\n", 
-	   mNEnt, mNBlk, mBlkSz) ; 
-    int i,j;
-    printf("  D_Vars  = %d : ", mD) ; 
-    for(i = 0 ; i < mD ; i++) 
-	printf("%s ", NomIndex(i).c_str() ) ; 
-    printf("\n") ; 
-    
-    printf("  F_Vars  = %d : ", mF) ; 
-    for(i = 0 ; i < mF ; i++) 
-	printf("%s ", NomIndex(i+mD).c_str() ) ; 
-    printf("\n") ; 
-    
-    printf("  I_Vars  = %d : ", mI) ; 
-    for(i = 0 ; i < mI ; i++) 
-	printf("%s ", NomIndex(i+mD+mF).c_str() ) ; 
-    printf("\n") ; 
-    
-    printf("  S_Vars  = %d : ", mS) ; 
-    for(i = 0 ; i < mS ; i++) 
-	printf("%s ", NomIndex(i+mD+mF+mI).c_str() ) ; 
-    printf("\n") ; 
-    
-    for(i = num ; i < num+nmax ; i++) {
-	for(j = 0 ; j < mD ; j++) printf("%f ", GetDVal(i,j)) ; 
-	printf(" -- ") ; 
-	for(j = 0 ; j < mF ; j++) printf("%f ", GetFVal(i,j+mD)) ; 
-	printf(" -- ") ; 
-	for(j = 0 ; j < mI ; j++) printf("%d ", GetIVal(i,j+mD+mF)) ; 
-	printf(" -- ") ; 
-	for(j = 0 ; j < mS ; j++) printf("%s ", GetSVal(i,j+mD+mF+mI).c_str()) ; 
-	printf("\n") ; 
-    }
-}
-
-
-//! Prints table definition and number of entries 
-void   XNTuple::Show(ostream& os) const 
-{
-    os << "XNTuple: NVar= " << mNVars << " NEnt= " << mNEnt 
-       << " (BlkSz,NBlk= " << mBlkSz << ", " << mNBlk << ")" 
-       << " (mNSwBlk= " << mNSwBlk << ")" << endl ; 
-    os << "(Sw File= " ; if(swf_name) os << swf_name ; os << ")" << endl ; 
-    
-    char* buff = new char[80] ; 
-    sprintf(buff, "Variables   :  Type         Min         Max  \n") ; 
-    os << buff ; 
-    
-    r_8 min, max ;
-    int i; 
-    for(i = 0 ; i < mD ; i++) {
-	GetMinMax(i, min, max) ; 
-	sprintf(buff, "  %-10s:   D    %12.6g   %12.6g \n", 
-		NomIndex(i).c_str(), min, max) ; 
-	os << buff ; 
-    }
-    for(i = 0 ; i < mF ; i++) {
-	GetMinMax(i+mD, min, max) ; 
-	sprintf(buff, "  %-10s:   F    %12.6g   %12.6g \n", 
-		NomIndex(i+mD).c_str(), min, max) ; 
-	os << buff ; 
-    }
-    for(i = 0 ; i < mI ; i++) {
-	GetMinMax(i+mD+mF, min, max) ; 
-	sprintf(buff, "  %-10s:   I    %12.6g   %12.6g \n", 
-		NomIndex(i+mD+mF).c_str(), min, max) ; 
-	os << buff ; 
-    }
-    for(i = 0 ; i < mS ; i++) {
-	sprintf(buff, "  %-10s:   S      -----        ----- \n", 
-		NomIndex(i+mD+mF+mI).c_str()) ; 
-	os << buff ; 
-    }
-    delete[] buff ; 
-}
-
-//! NOT YET IMPLEMENTED ! - Fills table from an ascii file
-int    XNTuple::FillFromASCIIFile(string const& fn, r_8 ddval,  r_4 dfval,
-                                        int dival, const char * dsval)
-//	Remplit le ntuple a partir d'un fichier ASCII.
-//	Renvoie le nombre de lignes ajoutees.
-{
-// a faire
-return(0);
-}
-
-
-//! Defines swap file path for XNTuple objects (Default=$TMPDIR or /tmp/)
-void  XNTuple::SetSwapPath(char* p) 
-{
-    if (p == NULL) {
-      p = getenv("TMPDIR");
-      if (p == NULL) p = "/tmp/";
-    }
-    if(!glob_swp) glob_swp = new char[MAXLEN+2] ; 
-    strncpy(glob_swp,p,MAXLEN);
-    if(glob_swp[strlen(glob_swp)] != '/') strcat(glob_swp,"/");
-}
-
-// 
-// 
-// Interface NTuple 
-// 
-// 
-sa_size_t XNTuple::NbLines() const
-{
-    return(NEntry());
-}
-
-sa_size_t XNTuple::NbColumns() const
-{
-    return(NVar());
-}
-
-r_8* XNTuple::GetLineD(sa_size_t n) const 
-{
-    // memcpy() impossible
-    // il faut faire des GetVal 
-    int i;
-    for(i = 0 ; i < mD ; i++) 
-	mVarD[i] = GetDVal(n, i) ; 
-    for(i = 0 ; i < mF ; i++) 
-	mVarD[i+mD] = (r_8)GetFVal(n, i+mD) ; 
-    for(i = 0 ; i < mI ; i++) 
-	mVarD[i+mD+mF] = (r_8)GetIVal(n, i+mD+mF) ; 
-    for(i = 0 ; i < mS ; i++) 
-	mVarD[i+mD+mF+mI] = atof(GetSVal(n, i+mD+mF+mI).c_str()) ; 
-    return mVarD ; 
-}
-
-
-r_8  XNTuple::GetCell(sa_size_t n, sa_size_t k) const 
-{
-    if( k<0 || k>=(mD+mF+mI+mS) ) return BADVAL ; 
-    if(k<mD) return GetDVal(n,k) ; 
-    if(k<(mF+mD)) return GetFVal(n,k) ; 
-    if(k<(mF+mD+mI)) return GetIVal(n,k) ; 
-    if(k<(mD+mF+mI+mS)) return atof(GetSVal(n,k).c_str()) ; 
-    return BADVAL ; 
-}
-
-
-r_8  XNTuple::GetCell(sa_size_t n, string const& nom) const 
-{
-    int k = IndexNom(nom.c_str()) ; 
-    if(k<0) return BADVAL ; 
-    if(k<mD) return GetDVal(n,k) ; 
-    if(k<(mF+mD)) return GetFVal(n,k) ; 
-    if(k<(mF+mD+mI)) return GetIVal(n,k) ; 
-    if(k<(mD+mF+mI+mS)) return atof(GetSVal(n,k).c_str()) ; 
-    return BADVAL ; 
-}
-
-string   XNTuple::GetCelltoString(sa_size_t n, sa_size_t k) const
-{
-    char buff[32];
-    if(k<0) return (""); 
-    else if(k<mD) 
-      { sprintf(buff, "%g", GetDVal(n,k)); return(buff) ; } 
-    else if(k<(mF+mD)) 
-      { sprintf(buff, "%g", (double)GetFVal(n,k)); return(buff) ; } 
-    else if(k<(mF+mD+mI)) 
-      { sprintf(buff, "%d", GetIVal(n,k)); return(buff) ; } 
-    else if(k<(mD+mF+mI+mS)) 
-      return(GetSVal(n,k).c_str()) ; 
-    return("");
-}
-
-void XNTuple::GetMinMax(sa_size_t k, double& min, double& max)  const
-{
-    min = 9E19 ; max = -9E19 ; 
-    // variables string non traitees 
-    if( k<0 || k>=(mD+mF+mI) ) return ; 
-    
-    min = mMin[k] ; 
-    max = mMax[k] ; 
-    return ; 
-}
-
-
-void XNTuple::GetMinMax(string const & nom, double& min, double& max)   const
-{
-    GetMinMax(IndexNom(nom.c_str()), min, max) ; 
-}
-
-
-sa_size_t XNTuple::ColumnIndex(string const& nom) const 
-{
-    return IndexNom(nom.c_str()) ; 
-}
-
-
-string XNTuple::ColumnName(sa_size_t k) const 
-{
-    return NomIndex(k) ; 
-}
-
-
-string XNTuple::VarList_C(const char* nomx) const 
-{
-    string rets = "" ; 
-    rets += "/* r_8 type variables */ \n";
-    // variables r_8 
-    int i;
-    for(i = 0 ; i < mD ; i++) {
-	if( i>0 && (i%5)==0 ) rets += ";" ; 
-	if( (i%5)==0 ) rets+="\ndouble " ; 
-	else rets += ", " ; 
-	rets += NomIndex(i) ; 
-    }
-    if(mD) rets += ";" ; 
-    
-    // variables r_4 
-    rets += "/* r_4 type variables */ \n";
-    for(i = 0 ; i < mF ; i++) {
-	if( i>0 && (i%5)==0 ) rets += ";" ; 
-	if( (i%5)==0 ) rets+="\ndouble " ; 
-	else rets += ", " ; 
-	rets += NomIndex(i+mD) ; 
-    }
-    if(mF) rets += ";" ; 
-    
-    // variables int 
-    rets += "/* int type variables */ \n";
-    for(i = 0 ; i < mI ; i++) {
-	if( i>0 && (i%5)==0 ) rets += ";" ; 
-	if( (i%5)==0 ) rets+="\ndouble " ; 
-	else rets += ", " ; 
-	rets += NomIndex(i+mD+mF) ; 
-    }
-    if(mI) rets += ";" ; 
-    
-    // variables string
-    rets += "/* string type variables */ \n"; 
-    for(i = 0 ; i < mS ; i++) {
-	if( i>0 && (i%5)==0 ) rets += ";" ; 
-	if( (i%5)==0 ) rets+="\ndouble " ; 
-	else rets += ", " ; 
-	rets += NomIndex(i+mD+mF+mI) ; 
-    }
-    if(mS) rets += "; \n" ; 
-
-    if(nomx) {
-	char buff[256] ; 
-	for(i = 0 ; i < mNVars ; i++) {
-	    sprintf(buff, "%s=%s[%d]; ", NomIndex(i).c_str(), nomx, i) ; 
-	    rets+=buff ; 
-	    if( (i%3 == 0) && (i>0) ) rets += "\n" ; 
-	}
-    }
-    return rets ; 
-}
-
-
-string XNTuple::LineHeaderToString() const 
-{
-    char buff[32];
-    string rets=" Num    ";
-    for(int i=0; i<mNVars; i++) {
-	sprintf(buff, "%8s ", NomIndex(i).c_str() );
-	rets += buff;
-    }
-    rets += '\n';
-    return(rets);
-
-}
-
-
-string XNTuple::LineToString(sa_size_t n) const 
-{
-    char buff[32];
-    r_8* val;
-    val = GetLineD(n);
-    sprintf(buff,"%6d: ",n); 
-    string rets=buff;
-    int i;
-    for(i=0; i<(mD+mF+mI); i++) {
-	sprintf(buff, "%8.3g ", val[i]);
-	rets += buff;
-    }
-    
-    for(i = mD+mF+mI ; i < mNVars ; i++) {
-	sprintf(buff, "%8s ", GetSVal(n,i).c_str() ) ; 
-	rets += buff ; 
-    }
-    
-    rets += '\n';
-    return(rets);
-}
-
-/*!
-   \class ObjFileIO<XNTuple>
-   \ingroup HiStats
-   Persistence (serialisation) handler for class XNTuple
-*/
-
-DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void   ObjFileIO<XNTuple>::WriteSelf(POutPersist& ppout) const 
-{
-  if (dobj == NULL)   return;
-//  On ecrit 3 uint_4 .... 
-//  0: Numero de version,  1 : non nul -> has info,  2 : reserve
-  uint_4 itab[3];
-  itab[0] = 1;  // Numero de version a 1
-  itab[1] = itab[2] = 0;
-  if (dobj->mInfo)  itab[1] = 1;
-  ppout.Put(itab,3);
-  if (dobj->mInfo)  if (dobj->mInfo)  ppout << (*(dobj->mInfo));
-
-  // variables internes 
-  ppout.PutI4(dobj->mNEnt) ; 
-  ppout.PutI4(dobj->mNBlk) ; 
-  ppout.PutI4(dobj->mBlkSz) ; 
-  ppout.PutI4(dobj->mBlk) ; 
-  ppout.PutI4(dobj->mOff) ; 
-  ppout.PutI4(dobj->mMaxBlk) ; 
-  ppout.PutI4(dobj->mStrSz) ; 
-  ppout.PutI4(dobj->mD) ; 
-  ppout.PutI4(dobj->mF) ; 
-  ppout.PutI4(dobj->mI) ; 
-  ppout.PutI4(dobj->mS) ; 
-  ppout.PutI4(dobj->mNVars) ; 
-    
-  // Noms 
-  ppout.PutBytes(dobj->mNames, dobj->mNVars*(LENNAME+1)) ; 
-
-  // MinMax 
-  ppout.PutR8s(dobj->mMin, (dobj->mD+dobj->mF+dobj->mI)) ; 
-  ppout.PutR8s(dobj->mMax, (dobj->mD+dobj->mF+dobj->mI)) ; 
-    
-  // Ecriture blocs N'ecrire que si datas existent 
-  for(int i = 0 ; i < dobj->mNBlk ; i++) {
-    // si bloc swappe, on le relit en douce ... 
-    if( dobj->ptr[i]->sw )  dobj->read_blk(dobj->ptr[i]) ; 
-    ppout.PutR8s(dobj->ptr[i]->ddata, dobj->mD*dobj->mBlkSz) ; 
-    ppout.PutR4s(dobj->ptr[i]->fdata, dobj->mF*dobj->mBlkSz) ; 
-    ppout.PutI4s(dobj->ptr[i]->idata, dobj->mI*dobj->mBlkSz) ; 
-    ppout.PutBytes(dobj->ptr[i]->sdata, dobj->mS*dobj->mBlkSz*(dobj->mStrSz+1)) ; 
-    if(dobj->ptr[i]->sw) dobj->ptr[i]->free() ; 
-    }
-}
-
-
-DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void   ObjFileIO<XNTuple>::ReadSelf(PInPersist& ppin) 
-{
-  if (dobj == NULL) dobj = new XNTuple;
-  else    dobj->clean() ; 
-//  On lit 3 uint_4 .... 
-//  0: Numero de version,  1 : non nul -> has info,  2 : reserve
-  uint_4 itab[3];
-  ppin.Get(itab,3);
-  if (itab[1] != 0) { // Lecture eventuelle du DVList Info
-    if (dobj->mInfo == NULL)  dobj->mInfo = new DVList;
-    ppin >> (*(dobj->mInfo));
-  }
-
-  ppin.GetI4(dobj->mNEnt) ; 
-  ppin.GetI4(dobj->mNBlk) ; 
-  ppin.GetI4(dobj->mBlkSz) ; 
-  ppin.GetI4(dobj->mBlk) ; 
-  ppin.GetI4(dobj->mOff) ; 
-  ppin.GetI4(dobj->mMaxBlk) ; 
-  ppin.GetI4(dobj->mStrSz) ; 
-  ppin.GetI4(dobj->mD) ; 
-  ppin.GetI4(dobj->mF) ; 
-  ppin.GetI4(dobj->mI) ; 
-  ppin.GetI4(dobj->mS) ; 
-  ppin.GetI4(dobj->mNVars) ; 
-    
-  // Noms 
-  dobj->mNames = new char[dobj->mNVars*(LENNAME+1)] ;
-  dobj->mVarD = new r_8[dobj->mNVars]; 
-  ppin.GetBytes(dobj->mNames, dobj->mNVars*(LENNAME+1)) ; 
-
-  // MinMax 
-  dobj->mMin = new r_8[dobj->mD+dobj->mF+dobj->mI] ; 
-  ppin.GetR8s(dobj->mMin, dobj->mD+dobj->mF+dobj->mI) ; 
-  dobj->mMax = new r_8[dobj->mD+dobj->mF+dobj->mI] ; 
-  ppin.GetR8s(dobj->mMax, dobj->mD+dobj->mF+dobj->mI) ; 
-    
-  // lecture Blocs 
-  int nblk = dobj->mNBlk ; 
-  dobj->mBlk = -1 ; dobj->mNBlk = 0 ; 
-  for(int i = 0 ; i < nblk ; i++) {
-    dobj->add_blk() ; dobj->mBlk++ ; dobj->mNBlk++ ; 
-    ppin.GetR8s(dobj->ptr[i]->ddata, dobj->mD*dobj->mBlkSz) ; 
-    ppin.GetR4s(dobj->ptr[i]->fdata, dobj->mF*dobj->mBlkSz) ; 
-    ppin.GetI4s(dobj->ptr[i]->idata, dobj->mI*dobj->mBlkSz) ; 
-    ppin.GetBytes(dobj->ptr[i]->sdata, dobj->mS*dobj->mBlkSz*(dobj->mStrSz+1)) ; 
-  } 
-}
-
-
-
-
-
-#ifdef __CXX_PRAGMA_TEMPLATES__
-#pragma define_template ObjFileIO<XNTuple>
-#endif
-
-#if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
-template class ObjFileIO<XNTuple>;
-#endif
-
-} // FIN namespace SOPHYA 
Index: unk/SophyaLib/HiStats/xntuple.h
===================================================================
--- /trunk/SophyaLib/HiStats/xntuple.h	(revision 3571)
+++ 	(revision )
@@ -1,179 +1,0 @@
-// -*- C++ -*- 
-// 
-// XNTuple 
-// 
-// N. Regnault 03/98 
-//             07/99 (NTupleInterface)
-// 
-// 
-#ifndef XNTUPLE_H_SEEN
-#define XNTUPLE_H_SEEN
-
-#include "machdefs.h"
-
-#include <string.h>
-#include <vector>
-#include <list>
-#include <map>
-
-#include "ntupintf.h"
-#include "ppersist.h"
-#include "dvlist.h"
-#include "objfio.h"
-
-
-namespace SOPHYA {
-// 
-// Bloc de donnees 
-// 
-//! \cond  Pour ne pas inclure dans la documentation
-struct NTBlk
-{
-    NTBlk(int ndvar, int nfvar, int nivar, int nsvar, int strsz, int sz) ; 
-    ~NTBlk() ; 
-    
-    void free() ;     // ne libere que les zones de donnees 
-
-    int      sw ;     // swappe ? 
-    long int swoff ;  // offset dans fichier de swap 
-    r_4*     fdata ;  
-    r_8*     ddata ;  
-    int_4*   idata ;  
-    char*    sdata ;  
-} ; 
-//! \endcond
-//  Forward class declaration for Fits handler
-class FITS_XNTuple;
-
-//! Class for creation and management of data sets organised as a table
-class XNTuple : public AnyDataObj , public NTupleInterface {
-public:
-  //    enum {classId = ClassId_XNTuple };
-
-    XNTuple() ; 
-    XNTuple(int ndvar, int nfvar, int nivar, int nsvar, 
-	    char** vnames, 
-	    int blk=512, int maxblk=100, int strsz=30) ; 
-    XNTuple(XNTuple const& nt) ; 
-    XNTuple(string const & flnm); 
-    virtual           ~XNTuple();
-    
-    void              Fill(r_8* d_data, r_4* f_data, int_4* i_data, char** sdata);
-    
-    inline int_4      NEntry() const { return mNEnt ; } 
-    inline int_4      NDVar() const  { return mD ; } 
-    inline int_4      NFVar() const  { return mF ; } 
-    inline int_4      NIVar() const  { return mI ; } 
-    inline int_4      NSVar() const  { return mS ; } 
-    inline int_4      NVar() const   { return mNVars ; } 
-    int               IndexNom(char const* nom) const ; 
-    string            NomIndex(int k) const ; 
-    
-    r_8               GetDVal(int i, int k) const ; 
-    r_4               GetFVal(int i, int k) const ; 
-    int_4             GetIVal(int i, int k) const ; 
-    string            GetSVal(int i, int k) const ; 
-    //    MuTyV             GetVal(char const* nom) ; 
-    
-    void              Copy(XNTuple const& nt) ; 
-    inline XNTuple&   operator=(XNTuple const& nt) { Copy(nt) ; return *this ; } 
-    
-    void              Print(int num, int nmax=1) const ;
-    void              Show(ostream& os) const ; 
-    inline void       Show() const { Show(cout) ; } 
-
-    DVList&           Info() ; 
-
-// Remplissage depuis fichier ASCII 
-   int		      FillFromASCIIFile(string const& fn, r_8 ddfval=0., r_4 dfval=0.,
-                                        int dival=0, const char * dsval="");
-        
-    static  void      SetSwapPath(char* p=NULL) ; 
-    string&           SwapPath() { return swp ; } 
-    
-// Declaration de l interface NTuple
-    virtual sa_size_t NbLines() const ;
-    virtual sa_size_t NbColumns() const ;
-    virtual r_8 *     GetLineD(sa_size_t n) const ;
-    virtual r_8	      GetCell(sa_size_t n, sa_size_t k) const ;
-    virtual r_8	      GetCell(sa_size_t n, string const & nom) const ;
-    virtual string    GetCelltoString(sa_size_t n, sa_size_t k) const ;
-    virtual void      GetMinMax(sa_size_t k, double& min, double& max)   const ; 
-    virtual void      GetMinMax(string const & nom, double& min, double& max)   const ; 
-    virtual sa_size_t ColumnIndex(string const & nom)  const ;
-    virtual string    ColumnName(sa_size_t k) const;
-    virtual string    VarList_C(const char* nomx=NULL) const ;
-    virtual string    LineHeaderToString() const;
-    virtual string    LineToString(sa_size_t n) const;  
-
-//  Pour la gestion de persistance
-    friend class ObjFileIO<XNTuple> ;
-
-
-  // pour fichiers FITS
-    friend class FITS_XNTuple;
-
-
-private:
-
-
-
-    void    clean();    // remet tout a zero 
-    void    swap() const ;    // swappe le + ancien blk en memoire 
-    void    read_blk(NTBlk*) const ;  // relit le bloc 
-    void    write_blk(NTBlk*) const ; // ecrit un bloc 
-    void    get_blk(int i) const ;  // == unswap() 
-    void    add_blk() ; // ajout d'un nouveau bloc 
-    
-    int_4   mNEnt ;   // nb total d'entrees 
-    int_4   mNBlk ;   // nb total de blocs 
-    mutable int_4   mNSwBlk ; // nb blocs swappes 
-    int_4   mBlkSz ;  // taille bloc 
-    int_4   mBlk ;    // bloc courant en ecriture 
-    int_4   mOff ;    // offset dans bloc en ecriture ; pointe sur le premiere case vide 
-    int_4   mMaxBlk ; // nb max de blocs autorises en memoire 
-    int_4   mStrSz ;  // taille des variables char** 
-    int_4   mNVars ;  // mD + mF + mI + mS 
-    int_4   mD, mF, mI, mS ; // nb variables de chaque type 
-    
-    r_8* mVarD, *mMin, *mMax ; 
-    
-    // 
-    // Noms + Prefix --> indiquer le type 
-    // 
-    //    char* mDNames, *mFNames, *mINames, *mSNames ; 
-    char* mNames ; 
-    //    typedef less<string> SCmp ; 
-    //    map<string,int,SCmp> mNames ; 
-    
-    // Donnees 
-    mutable vector<NTBlk*> ptr ; 
-    mutable list<NTBlk*> sw ; // liste --> swap() 
-
-    mutable FILE* swf ; // fichier --> swap 
-    mutable char* swf_name ; 
-    string  swp ; // swap_path 
-
-    DVList* mInfo;        // Infos (variables) attachees au NTuple
-
-    static  char*  glob_swp ; // swap_path global 
-    static  long int NbNT ; 
-}; 
-
-/*! Prints table information on stream \b s (nt.Show(os)) */
-inline ostream& operator << (ostream& s, XNTuple const & nt)
-  {  nt.Show(s);  return(s);  }
-
-/*! Writes the object in the POutPersist stream \b os */
-inline POutPersist& operator << (POutPersist& os, XNTuple & obj)
-{ ObjFileIO<XNTuple> fio(&obj);  fio.Write(os);  return(os); }
-/*! Reads the object from the PInPersist stream \b is */
-inline PInPersist& operator >> (PInPersist& is, XNTuple & obj)
-{ ObjFileIO<XNTuple> fio(&obj); is.SkipToNextObject(); fio.Read(is); return(is); }
-
-// Classe pour la gestion de persistance
-// ObjFileIO<XNTuple>
-} // namespace SOPHYA
-
-#endif
-
Index: /trunk/SophyaLib/NTools/Makefile
===================================================================
--- /trunk/SophyaLib/NTools/Makefile	(revision 3571)
+++ /trunk/SophyaLib/NTools/Makefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)imageop.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o
+	 rm -f $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)imageop.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)slinparbuff.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o
 	rm -f $(SOPHYALIBP)libNTools.a
  
-$(SOPHYALIBP)libNTools.a : $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o
+$(SOPHYALIBP)libNTools.a : $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)slinparbuff.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -39,5 +39,6 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)sopemtx.h fftservintf.h \
+  $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h fftservintf.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)tmatrix.h \
@@ -640,4 +641,10 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  simplex.cc
  
+$(SOPHYAOBJP)slinparbuff.o: slinparbuff.cc \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)machdefs.h slinparbuff.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  slinparbuff.cc
+ 
 $(SOPHYAOBJP)tabmath.o: tabmath.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h tabmath.h peida.h \
@@ -677,5 +684,6 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)sopemtx.h fftservintf.h \
+  $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h fftservintf.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)tmatrix.h \
Index: /trunk/SophyaLib/NTools/datatypes.cc
===================================================================
--- /trunk/SophyaLib/NTools/datatypes.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/datatypes.cc	(revision 3572)
@@ -9,5 +9,5 @@
 
 /* Nouvelle-Fonction */
-char * DataName(PBaseDataTypes typ)
+const char * DataName(PBaseDataTypes typ)
 {
 switch (typ)
@@ -33,5 +33,5 @@
 
 /* Nouvelle-Fonction */
-char * DataLongName(PBaseDataTypes typ)
+const char * DataLongName(PBaseDataTypes typ)
 {
 switch (typ)
Index: /trunk/SophyaLib/NTools/datatypes.h
===================================================================
--- /trunk/SophyaLib/NTools/datatypes.h	(revision 3571)
+++ /trunk/SophyaLib/NTools/datatypes.h	(revision 3572)
@@ -23,6 +23,6 @@
 inline PBaseDataTypes DataType(r_8)    {return kr_8;}
 
-char * DataName(PBaseDataTypes);
-char * DataLongName(PBaseDataTypes);
+const char * DataName(PBaseDataTypes);
+const char * DataLongName(PBaseDataTypes);
 int    DataSize(PBaseDataTypes);
 
Index: /trunk/SophyaLib/NTools/dates.cc
===================================================================
--- /trunk/SophyaLib/NTools/dates.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/dates.cc	(revision 3572)
@@ -39,5 +39,5 @@
 TimeZone::TimeZone()
 {
-  char* p = getenv("ACQ_TZ");
+  const char* p = getenv("ACQ_TZ");
 #if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
   if (!p) p = const_cast<char *>("France");
Index: /trunk/SophyaLib/NTools/functab.cc
===================================================================
--- /trunk/SophyaLib/NTools/functab.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/functab.cc	(revision 3572)
@@ -53,8 +53,8 @@
   Dx = (r_8)(XMax-XMin)/(r_8)(NTab-1);
   Tabul = new r_8[NTab+2];
-  for(int_4 i=0;i<NTab+2;i++) Tabul[i] = 0.;
+  for(uint_4 i=0;i<NTab+2;i++) Tabul[i] = 0.;
   PInterpL = PInterpP[0] = PInterpP[1] = NULL;
   if(!Tabul) return;
-  for(int_4 i=0;i<NTab;i++) Tabul[i+1] = func(XMin + i*Dx);
+  for(uint_4 i=0;i<NTab;i++) Tabul[i+1] = func(XMin + i*Dx);
   Tabul[0] = Tabul[1];
   Tabul[NTab+1] = Tabul[NTab];
@@ -106,5 +106,5 @@
     if(PInterpL) delete [] PInterpL;
     PInterpL = new r_8[NTab+2];
-    for(int_4 i=0;i<NTab+1;i++)
+    for(uint_4 i=0;i<NTab+1;i++)
       PInterpL[i] = (Tabul[i+1]-Tabul[i])/Dx;
     PInterpL[NTab+1] = 0.;
@@ -116,5 +116,5 @@
     PInterpP[0] = new r_8[NTab+2];
     PInterpP[1] = new r_8[NTab+2];
-    for(int_4 i=1;i<=NTab;i++) {
+    for(uint_4 i=1;i<=NTab;i++) {
       PInterpP[0][i] = (Tabul[i+1]+Tabul[i-1]-2.*Tabul[i])/(2.*Dx*Dx);
       PInterpP[1][i] = (Tabul[i+1]-Tabul[i-1])/(2.*Dx);
Index: /trunk/SophyaLib/NTools/generalfit.cc
===================================================================
--- /trunk/SophyaLib/NTools/generalfit.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/generalfit.cc	(revision 3572)
@@ -279,5 +279,5 @@
   Pour ecrire les iterations dans le fichier filename
 */
-void GeneralFit::WriteStep(char *filename)
+void GeneralFit::WriteStep(const char *filename)
 {
 
Index: /trunk/SophyaLib/NTools/generalfit.h
===================================================================
--- /trunk/SophyaLib/NTools/generalfit.h	(revision 3571)
+++ /trunk/SophyaLib/NTools/generalfit.h	(revision 3572)
@@ -53,5 +53,5 @@
   ~GeneralFit();
 
-  void            WriteStep(char *filename = NULL);
+  void            WriteStep(const char *filename = NULL);
   void            SetDebug(int level = 0);
   void            SetMaxStep(int n = 100);
Index: /trunk/SophyaLib/NTools/ntools.h
===================================================================
--- /trunk/SophyaLib/NTools/ntools.h	(revision 3571)
+++ /trunk/SophyaLib/NTools/ntools.h	(revision 3572)
@@ -15,4 +15,5 @@
 #include "poly.h"
 #include "datatypes.h"
+#include "slinparbuff.h"
 
 #include "cimage.h"
Index: /trunk/SophyaLib/NTools/objlist.list
===================================================================
--- /trunk/SophyaLib/NTools/objlist.list	(revision 3571)
+++ /trunk/SophyaLib/NTools/objlist.list	(revision 3572)
@@ -31,4 +31,5 @@
 simplesort.o
 simplex.o
+slinparbuff.o
 tabmath.o
 toeplitzMatrix.o
Index: /trunk/SophyaLib/NTools/pclassids.h
===================================================================
--- /trunk/SophyaLib/NTools/pclassids.h	(revision 3571)
+++ /trunk/SophyaLib/NTools/pclassids.h	(revision 3572)
@@ -30,5 +30,4 @@
    ClassId_HistoErr = 0x0204,
    ClassId_NTuple   = 0x0210,
-   ClassId_XNTuple  = 0x0211,
 
    ClassId_GeneralFitData  = 0x0290,
Index: /trunk/SophyaLib/NTools/poly.cc
===================================================================
--- /trunk/SophyaLib/NTools/poly.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/poly.cc	(revision 3572)
@@ -710,5 +710,5 @@
 Poly2& Poly2::operator *= (double a)
 {
-  for (uint_4 i=0; i<NElts(); i++) Element(i) *= a;
+  for (int_4 i=0; i<NElts(); i++) Element(i) *= a;
   return *this;
 }
Index: /trunk/SophyaLib/NTools/simplex.cc
===================================================================
--- /trunk/SophyaLib/NTools/simplex.cc	(revision 3571)
+++ /trunk/SophyaLib/NTools/simplex.cc	(revision 3572)
@@ -366,5 +366,5 @@
   int ilo, ihi, inhi;
   int move = 0;
-  char* smov[6] = { "None", "Reflection", "ReflecExpand", "ContractHigh", "ContractLow", "ExpandHigh" };
+  const char* smov[6] = { "None", "Reflection", "ReflecExpand", "ContractHigh", "ContractLow", "ExpandHigh" };
   int movcnt[6] = {0,0,0,0,0,0};
 
@@ -511,5 +511,5 @@
 int MinZSimplex::StopReason(string& s)
 {
-  char* sr[5] = { "NoConverg, MaxIterReached", "OK, fm<Tol0", "OK, Df/f<Tol1", 
+  const char* sr[5] = { "NoConverg, MaxIterReached", "OK, fm<Tol0", "OK, Df/f<Tol1", 
 		  "OK, [Df/f max]Iter<Tol2" "Error - Wrong StopReason" };
   int stop = mStop;
Index: /trunk/SophyaLib/NTools/slinparbuff.h
===================================================================
--- /trunk/SophyaLib/NTools/slinparbuff.h	(revision 3571)
+++ /trunk/SophyaLib/NTools/slinparbuff.h	(revision 3572)
@@ -1,8 +1,2 @@
-#include "machdefs.h"
-#include <iostream>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <algorithm>
 #include "pexceptions.h"
 
@@ -17,307 +11,29 @@
   friend class SLinParBuffMerger;
 
-  //***************************************************************** 
-  SLinParBuff(uint_4 lenbuf,uint_4 nresynch=0
-             ,r_8 x0=0.,r_8 y0=0.,bool autoxy0=false)
-  // ---- Createur
-  {
-    if(lenbuf==0) throw RangeCheckError("SLinParBuff: lenbuf==0 !");
-    mLenBuf = lenbuf;
-    mNResynch = nresynch;
-    mX = new r_8[mLenBuf]; mY = new r_8[mLenBuf];
-    mX0 = x0; mY0 = y0; mAutoXY0 = autoxy0;
-    Reset();
-  }
+  SLinParBuff(uint_4 lenbuf,uint_4 nresynch=0,r_8 x0=0.,r_8 y0=0.,bool autoxy0=false);
+  SLinParBuff(SLinParBuff& slp);
+  SLinParBuff(void);
+  virtual ~SLinParBuff();
 
-  SLinParBuff(SLinParBuff& slp)
-  // ---- Createur par copie
-  {
-    mLenBuf = slp.mLenBuf;
-    mNResynch = slp.mNResynch;
+  void GetX0Y0(r_8& x0,r_8& y0);
+  bool GetAutoX0Y0();
+  void SetX0Y0(r_8 x0=0.,r_8 y0=0.);
+  void SetAutoX0Y0(bool autoxy0=false);
 
-    mX = mY = NULL;
-    if(mLenBuf) {
-      mX = new r_8[mLenBuf]; mY = new r_8[mLenBuf];
-      for(uint_4 i=0;i<mLenBuf;i++) {mX[i]=slp.mX[i]; mY[i]=slp.mY[i];}
-    }
-
-    mX0 = slp.mX0; mY0 = slp.mY0; mAutoXY0 = slp.mAutoXY0;
-    mNCur = slp.mNCur; mIDeb = slp.mIDeb; mIResynch = slp.mIResynch;
-    mNResynchEff = slp.mNResynchEff; mNPush = slp.mNPush; mNPop = slp.mNPop;
-
-    mSx = slp.mSx; mSy = slp.mSy;
-    mSx2 = slp.mSx2; mSy2 = slp.mSy2; mSxy = slp.mSxy;
-    mSx3 = slp.mSx3; mSx2y = slp.mSx2y;
-    mSx4 = slp.mSx4;
-  }
-
-  SLinParBuff(void)
-  // ---- Createur par defaut
-  {
-    mLenBuf = 0; mNResynch = 0;
-    mX = mY = NULL;
-    mX0 = mY0 = 0.; mAutoXY0 = false;
-    Reset();
-  }
-
-  virtual ~SLinParBuff()
-  // ---- Destructeur
-  {
-    if(mX) delete [] mX; if(mY) delete [] mY;
-  }
-
-  //***************************************************************** 
-  inline void GetX0Y0(r_8& x0,r_8& y0) {x0 = mX0; y0 = mY0;}
-  inline bool GetAutoX0Y0() {return mAutoXY0;}
-
-  inline void SetX0Y0(r_8 x0=0.,r_8 y0=0.)
-  // ---- Stabilite numerique, centrage des x,y en mX0,mY0
-  {
-    mX0 = x0; mY0 = y0; mAutoXY0 = false;
-    ReComputeSum();
-  }
-
-  inline void SetAutoX0Y0(bool autoxy0=false)
-  // ---- Stabilite numerique, centrage automatique a <x> et <y>
-  //      a chaque ReComputeSum
-  {
-    mAutoXY0 = autoxy0;
-    ReComputeSum();
-  }
-
-  inline void Reset(void)
-  // ---- Reset des sommes et des compteurs
-  {
-    mSx=mSy=mSx2=mSy2=mSxy=mSx3=mSx2y=mSx4=0.;
-    mNCur = mIDeb = mIResynch = mNResynchEff = mNPush = mNPop = 0;
-    //if(mX) for(uint_4 i=0;i<mLenBuf;i++) mX[i] = 0.;
-    //if(mY) for(uint_4 i=0;i<mLenBuf;i++) mY[i] = 0.;
-  }
-
-  //***************************************************************** 
-  inline uint_4 Pop(void)
-  // ---- Pour enlever la donnee la plus ancienne
-  {
-    if(mNCur==0) return mNCur;
-    r_8 x=mX[mIDeb]-mX0, y=mY[mIDeb]-mY0; r_8 x2 = x*x;
-    mSx  -= x;     mSy   -= y;
-    mSx2 -= x2;    mSy2  -= y*y;   mSxy -= x*y;
-    mSx3 -= x2*x;  mSx2y -= x2*y;
-    mSx4 -= x2*x2;
-    mNCur--; mNPop++;
-    if(mNCur==0) {Reset(); return mNCur;}
-    mIDeb++; if(mIDeb==mLenBuf) mIDeb=0;
-    return mNCur;
-  }
-
-  inline uint_4 Push(r_8 x,r_8 y)
-  // ---- Pour ajouter une donnee, la donnee la plus ancienne
-  //      est enlevee si le buffer est deja plein.
-  {
-    uint_4 ifill;
-    if(mNCur==mLenBuf) {
-      r_8 X=mX[mIDeb]-mX0, Y=mY[mIDeb]-mY0; r_8 X2 = X*X;
-      mSx  -= X;     mSy   -=Y;
-      mSx2 -= X2;    mSy2  -=Y*Y;   mSxy -= X*Y;
-      mSx3 -= X2*X;  mSx2y -=X*X*Y;
-      mSx4 -= X2*X2;
-      ifill = mIDeb;
-      mIDeb++; if(mIDeb==mLenBuf) mIDeb=0;
-    } else {
-      ifill = (mIDeb+mNCur)%mLenBuf;
-      mNCur++;
-    }
-    mX[ifill] = x; mY[ifill] = y;
-    x -= mX0; y -= mY0; r_8 x2 = x*x;
-    mSx += x; mSy += y;
-    mSx2 += x2; mSy2 += y*y; mSxy += x*y;
-    mSx3 += x2*x; mSx2y += x2*y;
-    mSx4 += x2*x2;
-    mNPush++;
-    // Il faut re-synchroniser pour eviter les derives numeriques
-    mIResynch++; if(mIResynch == mNResynch) ReComputeSum();
-    return mNCur;
-  }
-
-  //***************************************************************** 
-  inline uint_4 ReComputeSum(void)
-  // ---- Pour re-synchroniser (eviter les derives numeriques).
-  {
-    if(mNCur==0) return 0;
-    // Re-centrage automatique a la moyenne demande:
-    // Attention, mSx = sum(x-mX0) ==> nouvel mX0 = mSx/N + mX0(ancien)
-    if(mAutoXY0) {mX0 = mSx/(r_8)mNCur + mX0; mY0 = mSy/(r_8)mNCur + mY0;}
-    mSx=mSy=mSx2=mSy2=mSxy=mSx3=mSx2y=mSx4=0.;
-    for(uint_4 i=mIDeb;i<mIDeb+mNCur;i++) {
-      uint_4 ii = i%mLenBuf;
-      r_8 x=mX[ii]-mX0, y=mY[ii]-mY0; r_8 x2 = x*x;
-      mSx  += x;     mSy   += y;
-      mSx2 += x2;    mSy2  += y*y;   mSxy += x*y;
-      mSx3 += x2*x;  mSx2y += x2*y;
-      mSx4 += x2*x2;
-    }
-    mIResynch=0;
-    mNResynchEff++;
-    return mNCur;
-  }
-
-  //***************************************************************** 
-  // ---- Retourne le nombre de points
+  void Reset(void);
+  uint_4 Pop(void);
+  uint_4 Push(r_8 x,r_8 y);
   inline uint_4 NPoints(void) {return mNCur;}
 
-  inline r_8 Compute(r_8& mean,bool recomputeXi2=false)
-  // ---- Calcul <y>, Var(y)
-  //   recomputeXi2=true : recalcule le xi2 (sigma) avec la courbe et les points
-  {
-    mean=0.;
-    if(mNCur==0) return -1.;
-    // Moyenne
-    mean  = mSy/(r_8) mNCur;
-    // Sigma
-    r_8 sigma;
-    if(recomputeXi2) {
-      sigma=0.;
-      for(uint_4 i=mIDeb;i<mIDeb+mNCur;i++) {
-        uint_4 ii = i%mLenBuf;
-        r_8 s = mean - (mY[ii]-mY0);
-	sigma += s*s;
-      }
-      sigma /= (r_8) mNCur;
-    } else {
-      sigma = mSy2/(r_8) mNCur - mean*mean;
-    }
-    // gestion du decalage
-    mean += mY0;
+  r_8 SumX(void) {return mSx+mNCur*mX0;}
+  r_8 SumY(void) {return mSy+mNCur*mY0;}
 
-    if(sigma>0.) return sqrt(sigma);
-    if(sigma<0.) return -sqrt(-sigma);
-    return sigma;
-  }
+  uint_4 ReComputeSum(void);
+  r_8 Compute(r_8& mean,bool recomputeXi2=false);
+  r_8 Compute(r_8& a0,r_8 &a1,bool recomputeXi2=false);
+  r_8 Compute(r_8& a0,r_8 &a1,r_8 &a2,bool recomputeXi2=false);
 
-  inline r_8 Compute(r_8& a0,r_8 &a1,bool recomputeXi2=false)
-  // ---- Calcul y=a0+a1*x et slin=Var(y-(a0+a1*x))=sqrt(<dy^2>)
-  //   recomputeXi2=true : recalcule le xi2 avec la courbe et les points
-  {
-    a0=a1=0.;
-    if(mNCur==0) return -1.;
-    // Fit lineaire
-    r_8 w = mNCur*mSx2 - mSx*mSx;
-    if(w==0. || mNCur==1) return -2.;
-    a0 = (mSx2*mSy - mSx*mSxy)/w;
-    a1 = (mNCur*mSxy - mSx*mSy )/w;
-    // Sigma par rapport Fit lineaire 
-    // (On a XI2=mNCur*slin**2 dans notre cas ou les erreurs=1)
-    r_8 slin;
-    if(recomputeXi2) {
-      slin=0.;
-      for(uint_4 i=mIDeb;i<mIDeb+mNCur;i++) {
-        uint_4 ii = i%mLenBuf;
-        r_8 s = a0+a1*(mX[ii]-mX0) - (mY[ii]-mY0);
-	slin += s*s;
-      }
-      slin /= (r_8) mNCur;
-    } else {
-      slin = (mSy2 +a0*a0*mNCur +a1*a1*mSx2 -2.*a0*mSy -2.*a1*mSxy +2.*a0*a1*mSx)
-             / (r_8)mNCur;
-    }
-    // gestion du decalage y-y0 = a0 + a1*(x-x0)
-    a0 = mY0 + a0 - a1*mX0;
-
-    if(slin>0.) return sqrt(slin);
-    if(slin<0.) return -sqrt(-slin);
-    return slin;
-  }
-
-  inline r_8 Compute(r_8& a0,r_8 &a1,r_8 &a2,bool recomputeXi2=false)
-  // ---- Calcul y=a0+a1*x+a2*x^2 et spar=Var(y-(a0+a1*x+a2*x^2))=sqrt(<dy^2>)
-  //   recomputeXi2=true : recalcule le xi2 avec la courbe et les points
-  {
-    a0=a1=a2=0.;
-    if(mNCur==0) return -1.;
-    // Fit parabolique
-    r_8 w = mSx2*(mSx2*mSx2-mSx3*mSx) -mSx*(mSx3*mSx2-mSx4*mSx) +mNCur*(mSx3*mSx3-mSx4*mSx2);
-    if(w==0. || mNCur<=2) return -2.;
-    a2 =  (mSy*(mSx2*mSx2-mSx3*mSx)  - mSxy*(mSx*mSx2-mSx3*mNCur)  + mSx2y*(mSx*mSx-mSx2*mNCur) )/w;
-    a1 = -(mSy*(mSx3*mSx2-mSx4*mSx)  - mSxy*(mSx2*mSx2-mSx4*mNCur) + mSx2y*(mSx2*mSx-mSx3*mNCur))/w;
-    a0 =  (mSy*(mSx3*mSx3-mSx4*mSx2) - mSxy*(mSx2*mSx3-mSx4*mSx)   + mSx2y*(mSx2*mSx2-mSx3*mSx) )/w;
-    // Sigma par rapport Fit parabolique
-    // (On a XI2=mNCur*spar**2 dans notre cas ou les erreurs=1)
-    // Le calcul direct du Xi2 n'est pas precis
-    r_8 spar;
-    if(recomputeXi2) {
-      spar=0.;
-      for(uint_4 i=mIDeb;i<mIDeb+mNCur;i++) {
-        uint_4 ii = i%mLenBuf;
-        r_8 s = a0+(a1+a2*(mX[ii]-mX0))*(mX[ii]-mX0) - (mY[ii]-mY0);
-	spar += s*s;
-      }
-      spar /= (r_8) mNCur;
-    } else {
-      spar = (mSy2 +a0*a0*mNCur +a1*a1*mSx2 +a2*a2*mSx4 -2.*mSy*a0 -2.*a1*mSxy
-              -2.*a2*mSx2y +2.*a0*a1*mSx +2.*a0*a2*mSx2 +2.*a1*a2*mSx3)
-             / (r_8) mNCur;
-    }
-    // gestion du decalage y-y0 = a0 + a1*(x-x0) + a2*(x-x0)^2
-    a0 = mY0 + a0 - a1*mX0 + a2*mX0*mX0;
-    a1 = a1 - 2.*a2*mX0;
-
-    if(spar>0.) return sqrt(spar);
-    if(spar<0.) return -sqrt(-spar);
-    return spar;
-  }
-
-  //***************************************************************** 
-  void Print(int lp=0)
-  // ---- Print de l'etat de la classe
-  //      lp = 0 : parametres
-  //           1 :            + sommes
-  //           2 :                     + tableaux
-  {
-    cout<<"SLinParBuff(LenBuf="<<mLenBuf<<",NResynch="<<mNResynch
-        <<",auto_xy0="<<mAutoXY0
-        <<"): mX0="<<mX0<<" mY0="<<mY0<<" mNCur="<<mNCur<<endl
-        <<"           NPush="<<mNPush<<" NPop="<<mNPop
-        <<" NSynchro="<<mNResynchEff<<endl;
-    if(mNCur==0) return;
-    if(lp>=2) {
-      cout<<"X:";
-      if(mX) for(uint_4 i=0;i<mNCur;i++) {
-        uint_4 ii = (mIDeb+i)%mLenBuf;
-        cout<<" "<<mX[ii]; if(i%10==9 || i==mNCur-1) cout<<endl;
-      }
-      if(mY) cout<<"Y:";
-      for(uint_4 i=0;i<mNCur;i++) {
-        uint_4 ii = (mIDeb+i)%mLenBuf;
-        cout<<" "<<mY[ii]; if(i%10==9 || i==mNCur-1) cout<<endl;
-      }
-    }
-    if(lp>=1) {
-      cout<<"...IDeb="<<mIDeb<<" IResynch="<<mIResynch<<endl;
-      cout<<"   Sx="<<mSx<<" Sx2="<<mSx2<<" Sx3="<<mSx3<<" Sx4="<<mSx4<<endl
-          <<"   Sy="<<mSy<<" Sy2="<<mSy2<<" Sxy="<<mSxy<<" Sx2y="<<mSx2y<<endl;
-    }
-  }
-
-  void PrintCompute(int lp=0)
-  // ---- Print des valeurs numeriques calculees
-  //      lp = 0 : valeurs calculees
-  //           1 :             + sommes
-  {
-    bool recompute = (mX==NULL || mY==NULL) ? false: true;
-    r_8 mean;
-    r_8 sigma = Compute(mean,recompute), sigmar = Compute(mean,false);
-    cout<<"SLinParBuff: n="<<NPoints()<<" mean="<<mean
-        <<" sigma="<<sigma<<" (raw="<<sigmar<<")"<<endl;
-    r_8 a0,a1,a2;
-    r_8 slin  = Compute(a0,a1,recompute), slinr  = Compute(a0,a1,false);
-    cout<<"             a0="<<a0<<" a1="<<a1
-        <<" slin="<<slin<<" (raw="<<slinr<<")"<<endl;
-    r_8 spar = Compute(a0,a1,a2,recompute), sparr = Compute(a0,a1,a2,false);
-    cout<<"             a0="<<a0<<" a1="<<a1<<" a2="<<a2
-        <<" spar="<<spar<<" (raw="<<sparr<<")"<<endl;
-    if(lp<1) return;
-    cout<<"...Sx="<<mSx<<" Sx2="<<mSx2<<" Sx3="<<mSx3<<" Sx4="<<mSx4<<endl
-        <<"   Sy="<<mSy<<" Sy2="<<mSy2<<" Sxy="<<mSxy<<" Sx2y="<<mSx2y<<endl;
-  }
+  void Print(int lp=0);
+  void PrintCompute(int lp=0);
 
 protected:
@@ -329,4 +45,5 @@
   uint_4 mNResynchEff, mNPush, mNPop;
 };
+
 
 ///////////////////////////////////////////////////////////////////
@@ -343,46 +60,14 @@
 class SLinParBuffMerger {
 public:
-  SLinParBuffMerger(void) {mFirst=true; mSlp.Reset();}
-  SLinParBuffMerger(SLinParBuff& s,bool recompute=false)
-                   {mFirst=true; mSlp.Reset(); Add(s,recompute);}
-  virtual ~SLinParBuffMerger(void) {}
-  inline uint_4  NPoints(void) {return mSlp.NPoints();}
+  SLinParBuffMerger(void);
+  SLinParBuffMerger(SLinParBuff& s,bool recompute=false);
+  virtual ~SLinParBuffMerger(void);
+
+  inline uint_4 NPoints(void) {return mSlp.NPoints();}
   inline void Reset(void) {mSlp.Reset(); mFirst=true;}
-  inline void Add(SLinParBuff& s,bool recompute=false)
-  {
-    bool changex0y0=false, AutoXY0_Save; r_8 X0_Save,Y0_Save;
-    if(mFirst) {
-      // Cas ou c'est le premier SLinParBuff additionne.
-      mSlp.mX0=s.mX0; mSlp.mY0=s.mY0; mFirst=false;
-    } else if(mSlp.mX0!=s.mX0 || mSlp.mY0!=s.mY0) {
-      // Attention: pour merger il faut avoir les memes mX0,mY0
-      changex0y0=true;
-      X0_Save=s.mX0; Y0_Save=s.mY0; AutoXY0_Save=s.mAutoXY0;
-      s.mX0=mSlp.mX0; s.mY0=mSlp.mY0; s.mAutoXY0=false;
-      recompute=true;
-    }
-    if(recompute) s.ReComputeSum();
-    mSlp.mNCur += s.mNCur;
-    mSlp.mSx   += s.mSx;
-    mSlp.mSy   += s.mSy;
-    mSlp.mSx2  += s.mSx2;
-    mSlp.mSy2  += s.mSy2;
-    mSlp.mSxy  += s.mSxy;
-    mSlp.mSx3  += s.mSx3;
-    mSlp.mSx2y += s.mSx2y;
-    mSlp.mSx4  += s.mSx4;
-    // Dans le cas ou on a change les X0,Y0, on remet en etat
-    if(changex0y0) {
-      s.mX0=X0_Save; s.mY0=Y0_Save;
-      s.ReComputeSum();
-      s.mAutoXY0=AutoXY0_Save;
-    }
-  }
-  inline r_8 Compute(r_8& mean)
-              {return mSlp.Compute(mean);}
-  inline r_8 Compute(r_8& a0,r_8 &a1)
-              {return mSlp.Compute(a0,a1);}
-  inline r_8 Compute(r_8& a0,r_8 &a1,r_8 &a2)
-              {return mSlp.Compute(a0,a1,a2);}
+  void Add(SLinParBuff& s,bool recompute=false);
+  inline r_8 Compute(r_8& mean) {return mSlp.Compute(mean);}
+  inline r_8 Compute(r_8& a0,r_8 &a1) {return mSlp.Compute(a0,a1);}
+  inline r_8 Compute(r_8& a0,r_8 &a1,r_8 &a2) {return mSlp.Compute(a0,a1,a2);}
   inline void Print(int lp=0) {mSlp.Print(lp);}
   inline void PrintCompute(int lp=0) {mSlp.PrintCompute(lp);}
Index: /trunk/SophyaLib/NTools/smakefile
===================================================================
--- /trunk/SophyaLib/NTools/smakefile	(revision 3571)
+++ /trunk/SophyaLib/NTools/smakefile	(revision 3572)
@@ -4,8 +4,8 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)imageop.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o
+	 rm -f $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)imageop.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)slinparbuff.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o
 	rm -f $(SOPHYALIBP)libNTools.a
  
-$(SOPHYALIBP)libNTools.a : $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o
+$(SOPHYALIBP)libNTools.a : $(SOPHYAOBJP)cimage.o $(SOPHYAOBJP)cspline.o $(SOPHYAOBJP)datatypes.o $(SOPHYAOBJP)dates.o $(SOPHYAOBJP)datime.o $(SOPHYAOBJP)difeq.o $(SOPHYAOBJP)dynccd.o $(SOPHYAOBJP)fct1dfit.o $(SOPHYAOBJP)fct2dfit.o $(SOPHYAOBJP)fftmayer_r4.o $(SOPHYAOBJP)fftmayer_r8.o $(SOPHYAOBJP)fftmserver.o $(SOPHYAOBJP)fftpackc.o $(SOPHYAOBJP)fftpserver.o $(SOPHYAOBJP)fftservintf.o $(SOPHYAOBJP)FSAppIrrSmpl.o $(SOPHYAOBJP)functab.o $(SOPHYAOBJP)generaldata.o $(SOPHYAOBJP)generalfit.o $(SOPHYAOBJP)generalfunc.o $(SOPHYAOBJP)integ.o $(SOPHYAOBJP)matxop.o $(SOPHYAOBJP)median.o $(SOPHYAOBJP)nbmath.o $(SOPHYAOBJP)nbtri.o $(SOPHYAOBJP)ntoolsinit.o $(SOPHYAOBJP)objfitter.o $(SOPHYAOBJP)perandom.o $(SOPHYAOBJP)poly.o $(SOPHYAOBJP)rk4cdifeq.o $(SOPHYAOBJP)simplesort.o $(SOPHYAOBJP)simplex.o $(SOPHYAOBJP)slinparbuff.o $(SOPHYAOBJP)tabmath.o $(SOPHYAOBJP)toeplitzMatrix.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -641,4 +641,10 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  simplex.cc
  
+$(SOPHYAOBJP)slinparbuff.o: slinparbuff.cc \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)machdefs.h slinparbuff.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  slinparbuff.cc
+ 
 $(SOPHYAOBJP)tabmath.o: tabmath.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h tabmath.h peida.h \
Index: /trunk/SophyaLib/SUtils/datacards.cc
===================================================================
--- /trunk/SophyaLib/SUtils/datacards.cc	(revision 3571)
+++ /trunk/SophyaLib/SUtils/datacards.cc	(revision 3572)
@@ -1,4 +1,4 @@
 //
-// $Id: datacards.cc,v 1.10 2004-09-10 09:54:48 cmv Exp $
+// $Id: datacards.cc,v 1.11 2009-02-07 21:49:59 cmv Exp $
 //
 //
@@ -217,5 +217,5 @@
 DataCards::GetKey(int num) const
 {
-  if ((num < 0) || (num >= cards.size()) )  return("");
+  if ((num < 0) || (num >= (int)cards.size()) )  return("");
   int k = 0;
   CardList::const_iterator i;
@@ -234,5 +234,5 @@
   DataCards::CardList::const_iterator it = FindKeyC(key);
   if (it == cards.end()) return(rs);
-  for (int k=0; k<(*it).tokens.size(); k++) {
+  for (size_t k=0; k<(*it).tokens.size(); k++) {
     rs += ' ';  rs += (*it).tokens[k];
   }
@@ -246,5 +246,5 @@
   DataCards::CardList::const_iterator it = FindKeyC(key);
   if (it == cards.end()) return(def);
-  if ( (numero < 0) || (numero >= (*it).tokens.size()) )  return def;
+  if ( (numero < 0) || (numero >= (int)((*it).tokens.size())) )  return def;
   return (*it).tokens[numero];
 }
@@ -308,5 +308,5 @@
 DataCards::ApplyPF(CrdPF & cpf, string const& key, string const& toks)
 {
-int l,lk;
+size_t l,lk;
 int rc = 0;
 // On verifie si le "pattern" correspond
Index: /trunk/SophyaLib/SUtils/strutilxx.cc
===================================================================
--- /trunk/SophyaLib/SUtils/strutilxx.cc	(revision 3571)
+++ /trunk/SophyaLib/SUtils/strutilxx.cc	(revision 3572)
@@ -13,5 +13,5 @@
 // considering char "sep" as a separator.
 // Vector is filled from its end (no reset done).
-// Tp write a "sep" char, use \'sep'
+// To write a "sep" char, use \'sep'
 // Warning: separator "sep" could not be set to '\'
 // Ex: sep=' ': s="aaa   bbb cc d " -> vs=(aaa,bbb,cc,d)
@@ -55,10 +55,10 @@
 // - Fill "vs" at the end: NO RESET IS DONE
 // - If ',' is the separator, ",,," is c
-// That routine is much more rapid than FillVStringFrString altouch less general
+// That routine is much more rapid than FillVStringFrString although less general
 //           (ex no '\' gestion is done)
 {
  uint_4 ls = s.size();
  if(ls<=0) return;
- bool sep_non_blanc = (separator==' ')? false: true;
+ //bool sep_non_blanc = (separator==' ')? false: true;
  char *str = new char[ls+2];
 
Index: /trunk/SophyaLib/SUtils/utils.cc
===================================================================
--- /trunk/SophyaLib/SUtils/utils.cc	(revision 3571)
+++ /trunk/SophyaLib/SUtils/utils.cc	(revision 3572)
@@ -1,5 +1,5 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: utils.cc,v 1.2 2004-09-10 09:54:49 cmv Exp $
+// $Id: utils.cc,v 1.3 2009-02-07 21:49:59 cmv Exp $
 //
 
@@ -15,5 +15,5 @@
   int i;   // THINK C ne veut pas du int i dans chaque for...
   if (dest < source)
-    for (i=0; i<n; i++)
+    for (i=0; i<(int)n; i++)
       ((char*)dest)[i] = ((char*)source)[i];
   else 
Index: /trunk/SophyaLib/Samba/Makefile
===================================================================
--- /trunk/SophyaLib/Samba/Makefile	(revision 3571)
+++ /trunk/SophyaLib/Samba/Makefile	(revision 3572)
@@ -12,24 +12,24 @@
  
 $(SOPHYAOBJP)alm.o: alm.cc $(SOPHYAINCP)sopnamsp.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)stsrand.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)ndatablock.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)smathconst.h \
   $(SOPHYAINCP)triangmtx.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
   $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)utilarr.h \
@@ -93,8 +93,9 @@
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)tvector_tsnl.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)smathconst.h \
   $(SOPHYAINCP)triangmtx.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)nbconst.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lambdaBuilder.cc
@@ -198,10 +199,11 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
-  $(SOPHYAINCP)fftservintf.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)fftservintf.h \
+  $(SOPHYAINCP)stsrand.h alm.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
   $(SOPHYAINCP)tvector.h lambdaBuilder.h \
   $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  sphericaltransformserver.cc
Index: /trunk/SophyaLib/Samba/bruit.cc
===================================================================
--- /trunk/SophyaLib/Samba/bruit.cc	(revision 3571)
+++ /trunk/SophyaLib/Samba/bruit.cc	(revision 3572)
@@ -220,8 +220,7 @@
 //--
 {
-int i,j;
 printf("OOFNoise::Print()  MemL=%d  Tau= %g \n", mMemL, mTau);
 printf("OOFNoise::Print() Vecteur de Dynamique / Etat : \n");
-for(i=0; i<mMemL-1; i+=2) 
+for(int i=0; i<mMemL-1; i+=2) 
   printf("%d:   D=%g  S=%g   | %d:  D=%g  S=%g \n", i, 
          mDyn[i], mState[i], i+1, mDyn[i], mState[i]);   
@@ -311,9 +310,8 @@
 //--
 {
-int i,j;
-printf("EXPNoise::Print()  MemL=%d  Tau= %g \n", mMemL, mTau);
+printf("EXPNoise::Print()  MemL=%ld  Tau= %g \n", mMemL, mTau);
 printf("EXPNoise::Print() Vecteur de Dynamique / Etat : \n");
-for(i=0; i<mMemL-1; i+=2) 
-  printf("%d:   D=%g  S=%g   | %d:  D=%g  S=%g \n", i, 
+for(long int i=0; i<mMemL-1; i+=2) 
+  printf("%ld:   D=%g  S=%g   | %ld:  D=%g  S=%g \n", i, 
          mDyn[i], mState[i], i+1, mDyn[i], mState[i]);   
 
@@ -608,9 +606,9 @@
 //--
 {
-int i,j,rc=0;
+int rc=0;
 printf("MemNoise::Print()  MemL=%d  Tau= %g \n", mMemL, mTau);
 printf("mNtirage= %d , mMemPos= %d , mMemNeg= %d \n",mNtirage,mMemPos,mMemNeg);
 // printf("MemNoise::Print() Vecteur de Dynamique / Etat : \n");
-/* for(i=0; i<mMemL-1; i+=2) 
+/* for(int i=0; i<mMemL-1; i+=2) 
   printf("%d:   D=%g  S=%g   | %d:  D=%g  S=%g \n", i, 
          mDyn[i], mState[i], i+1, mDyn[i], mState[i]);   
Index: /trunk/SophyaLib/Samba/lambdaBuilder.cc
===================================================================
--- /trunk/SophyaLib/Samba/lambdaBuilder.cc	(revision 3571)
+++ /trunk/SophyaLib/Samba/lambdaBuilder.cc	(revision 3572)
@@ -137,5 +137,5 @@
   register r_8 lam_0, lam_1, lam_2;
 
-  int_4 l, m, k;
+  int_4 m, k;
 
   for (m=0; m<=mmax;m++)   {
@@ -194,5 +194,5 @@
   register r_8 lam_0, lam_1, lam_2;
   
-  int_4 l, m, k;
+  int_4 m, k;
 
   for (m=0; m<=mmax;m++)  {
@@ -235,5 +235,5 @@
   register r_8 lam_0, lam_1, lam_2;
   
-  int_4 l, m, k;
+  int_4 m, k;
 
   for (m=0; m<=mmax;m++)  {
Index: /trunk/SophyaLib/Samba/smakefile
===================================================================
--- /trunk/SophyaLib/Samba/smakefile	(revision 3571)
+++ /trunk/SophyaLib/Samba/smakefile	(revision 3572)
@@ -12,24 +12,24 @@
  
 $(SOPHYAOBJP)alm.o: alm.cc $(SOPHYAINCP)sopnamsp.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)stsrand.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)ndatablock.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)smathconst.h \
   $(SOPHYAINCP)triangmtx.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
   $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)utilarr.h \
@@ -93,8 +93,9 @@
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)tvector_tsnl.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)smathconst.h \
   $(SOPHYAINCP)triangmtx.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)nbconst.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lambdaBuilder.cc
@@ -198,10 +199,11 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
-  $(SOPHYAINCP)fftservintf.h alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)fftservintf.h \
+  $(SOPHYAINCP)stsrand.h alm.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
   $(SOPHYAINCP)tvector.h lambdaBuilder.h \
   $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  sphericaltransformserver.cc
Index: /trunk/SophyaLib/Samba/sphericaltransformserver.cc
===================================================================
--- /trunk/SophyaLib/Samba/sphericaltransformserver.cc	(revision 3571)
+++ /trunk/SophyaLib/Samba/sphericaltransformserver.cc	(revision 3572)
@@ -211,5 +211,4 @@
   int_4 nlmax=alm.Lmax();
   int_4 nmmax=nlmax;
-  int_4 nsmax=0;
   // le Resize est suppose mettre a zero
   map.Resize(pixelSizeIndex);
@@ -521,5 +520,5 @@
   
   alm.ReSizeToLmax(nlmax);
-  for (int_4 ith = 0; ith < map.NbThetaSlices(); ith++)
+  for (uint_4 ith = 0; ith < map.NbThetaSlices(); ith++)
     {
       r_8 phi0;
@@ -917,5 +916,5 @@
       throw SzMismatchError("SphericalTransformServer::DecomposeToAlm: map Q and map U have not same size ");
     }
-  for (int_4 ith = 0; ith < mapq.NbThetaSlices(); ith++)
+  for (uint_4 ith = 0; ith < mapq.NbThetaSlices(); ith++)
     {
       r_8 phi0;
@@ -1119,5 +1118,5 @@
   Bm<complex<T> > b_m_theta_u(nmmax);
 
-  for (int_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
+  for (uint_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
     {
       int_4 nph;
@@ -1228,5 +1227,5 @@
   Bm<complex<T> > b_m_theta_p(nmmax);
   Bm<complex<T> > b_m_theta_m(nmmax);
-  for (int_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
+  for (uint_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
     {
       int_4 nph;
Index: /trunk/SophyaLib/SkyMap/fiolocalmap.cc
===================================================================
--- /trunk/SophyaLib/SkyMap/fiolocalmap.cc	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/fiolocalmap.cc	(revision 3572)
@@ -167,5 +167,4 @@
   int_4 nSzX= dobj->Size_x();
   int_4 nSzY= dobj->Size_y();
-  int_4 nPix= dobj->NbPixels();
  
   if(dobj->ptrInfo()) 
@@ -183,5 +182,4 @@
   os.PutI4(nSzX);
   os.PutI4(nSzY);
-  //  os.PutI4(nPix);
 
   if(dobj->LocalMap_isDone())
Index: /trunk/SophyaLib/SkyMap/localmap.cc
===================================================================
--- /trunk/SophyaLib/SkyMap/localmap.cc	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/localmap.cc	(revision 3572)
@@ -256,5 +256,4 @@
     throw(SzMismatchError("LocalMap<T>::CopyElt(const LocalMap<T>&) SizeMismatch")) ;
       recopierVariablesSimples(a);     
-  int k;
   pixels_ = a.pixels_;
   return(*this);
@@ -349,6 +348,4 @@
   double csTheta = cos(theta);
   double snTheta = sin(theta);
-  double csPhi   = cos(phi);
-  double snPhi   = sin(phi); 
   double csPhiMPhiC = cos (phi - phiC_);
   double snPhiMPhiC = sin (phi - phiC_);
@@ -585,5 +582,5 @@
   double sin_phi_axeZ;
 
-  double cth,sth, cdeltaPhi, phi, cphi, sphi;
+  double cth,sth, cdeltaPhi, phi;
 
   if ( snthC_ <= 0.) // carte centree au pole 
Index: /trunk/SophyaLib/SkyMap/spherehealpix.cc
===================================================================
--- /trunk/SophyaLib/SkyMap/spherehealpix.cc	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/spherehealpix.cc	(revision 3572)
@@ -177,15 +177,14 @@
   nPix_ = a.nPix_;
   omeg_ = a.omeg_;
-  int k;
   if (fgring_ == a.fgring_) 
-    for (k=0; k< nPix_; k++) pixels_(k) = a.pixels_(k);
+    for (int_4 k=0; k< nPix_; k++) pixels_(k) = a.pixels_(k);
   else {
-    if (fgring_)  for (k=0; k< nPix_; k++) 
+    if (fgring_)  for (int_4 k=0; k< nPix_; k++) 
       pixels_(k) = a.pixels_(ring2nest(nSide_, k));
-    else  for (k=0; k< nPix_; k++) 
+    else  for (int_4 k=0; k< nPix_; k++) 
       pixels_(k) = a.pixels_(nest2ring(nSide_, k));			     
   }
-  for (k=0; k< a.sliceBeginIndex_.Size(); k++) sliceBeginIndex_(k) = a.sliceBeginIndex_(k);
-  for (k=0; k< a.sliceLenght_.Size(); k++) sliceLenght_(k) = a.sliceLenght_(k);
+  for (size_t k=0; k< a.sliceBeginIndex_.Size(); k++) sliceBeginIndex_(k) = a.sliceBeginIndex_(k);
+  for (size_t k=0; k< a.sliceLenght_.Size(); k++) sliceLenght_(k) = a.sliceLenght_(k);
   return(*this);
 }
@@ -305,5 +304,5 @@
 {
   uint_4 nbslices = uint_4(4*nSide_-1);
-  if (index<0 || index >= nbslices) 
+  if (index<0 || index >= (int_4)nbslices) 
     throw RangeCheckError(" SphereHEALPix::ThetaOfSlice()  index out of range");
   r_8 theta, phi0;
@@ -322,5 +321,5 @@
 int_4 SphereHEALPix<T>::GetSymThetaSliceIndex(int_4 idx) const
 {
-  if(idx < 0 || idx >= NbThetaSlices()) 
+  if(idx < 0 || idx >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereHEALPix::GetSymThetaSliceIndex index out of range"); 
   return (NbThetaSlices()-1-idx);
@@ -340,5 +339,5 @@
 void SphereHEALPix<T>::GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const 
 {
-  if (index<0 || index >= NbThetaSlices()) 
+  if (index<0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSlice()  index out of range");
 
@@ -391,5 +390,5 @@
 {
 
-  if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
+  if (sliceIndex<0 || sliceIndex >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSlice() index out of range");
   int_4 iring= sliceBeginIndex_(sliceIndex);
@@ -420,5 +419,5 @@
 
 {
-  if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
+  if (sliceIndex<0 || sliceIndex >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSliceDataPtr(): index out of range");
   if (fgring_) 
Index: /trunk/SophyaLib/SkyMap/spherepos.cc
===================================================================
--- /trunk/SophyaLib/SkyMap/spherepos.cc	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/spherepos.cc	(revision 3572)
@@ -11,5 +11,4 @@
 #include <typeinfo>
 
-static char *head_spherepos_cc_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.cc,v 1.4 2006-06-20 16:01:48 ansari Exp $";
 
 
Index: /trunk/SophyaLib/SkyMap/spherepos.h
===================================================================
--- /trunk/SophyaLib/SkyMap/spherepos.h	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/spherepos.h	(revision 3572)
@@ -9,5 +9,4 @@
 #include "anydataobj.h"
 
-static char *head_spherepos_h_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.h,v 1.2 2006-06-20 16:01:48 ansari Exp $";
 
 namespace SOPHYA {
Index: /trunk/SophyaLib/SkyMap/spherethetaphi.cc
===================================================================
--- /trunk/SophyaLib/SkyMap/spherethetaphi.cc	(revision 3571)
+++ /trunk/SophyaLib/SkyMap/spherethetaphi.cc	(revision 3572)
@@ -192,9 +192,8 @@
   NPix_  = a.NPix_;
   Omega_ = a.Omega_;
-  int_4 k;
-  for (k=0; k< NPix_; k++) pixels_(k) = a.pixels_(k);
-  for (k=0; k< a.NPhi_.Size(); k++) NPhi_(k) = a.NPhi_(k);
-  for (k=0; k< a.TNphi_.Size(); k++) TNphi_(k) = a.TNphi_(k);
-  for (k=0; k< a.Theta_.Size(); k++) Theta_(k) = a.Theta_(k);
+  for (int_4 k=0; k< NPix_; k++) pixels_(k) = a.pixels_(k);
+  for (size_t k=0; k< a.NPhi_.Size(); k++) NPhi_(k) = a.NPhi_(k);
+  for (size_t k=0; k< a.TNphi_.Size(); k++) TNphi_(k) = a.TNphi_(k);
+  for (size_t k=0; k< a.Theta_.Size(); k++) Theta_(k) = a.Theta_(k);
   return(*this);
 
@@ -613,5 +612,5 @@
 int_4 SphereThetaPhi<T>::GetSymThetaSliceIndex(int_4 idx) const
 {
-  if(idx < 0 || idx >= NbThetaSlices()) 
+  if(idx < 0 || idx >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetSymThetaSliceIndex index out of range"); 
   return (NbThetaSlices()-1-idx);
@@ -630,5 +629,5 @@
 {
 
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSlice(idx...) index out of range"); 
     
@@ -665,5 +664,5 @@
 {
 
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSlice(idx...)  idx out of range"); 
 
@@ -673,6 +672,4 @@
   pixelIndices.ReSize(lring);
   value.ReSize(lring);
-  double Te= 0.;
-  double Fi= 0.;
   for(int_4 kk = 0; kk < lring; kk++)  {
     pixelIndices(kk)=kk+iring ;
@@ -686,5 +683,5 @@
 T* SphereThetaPhi<T>::GetThetaSliceDataPtr(int_4 index)
 {
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSliceDataPtr(idx)  idx out of range"); 
   return pixels_.Begin()+Index(index,0);
Index: /trunk/SophyaLib/SysTools/commander.h
===================================================================
--- /trunk/SophyaLib/SysTools/commander.h	(revision 3571)
+++ /trunk/SophyaLib/SysTools/commander.h	(revision 3572)
@@ -79,5 +79,5 @@
                                         string& grp);
   inline  void		RegisterCommand(string& keyw, string& usage, CmdExecutor * ce, 
-                                        char* grp)
+                                        const char* grp)
                         { string sgrp = grp; RegisterCommand(keyw, usage, ce, sgrp); }
 
Index: /trunk/SophyaLib/SysTools/cxxcmplnk.cc
===================================================================
--- /trunk/SophyaLib/SysTools/cxxcmplnk.cc	(revision 3571)
+++ /trunk/SophyaLib/SysTools/cxxcmplnk.cc	(revision 3572)
@@ -37,15 +37,12 @@
 */
 
-static char * gcxx_opt = 
-"-O -fdollars-in-identifiers";
-static char * KCC_opt = 
-"-O --exceptions --rtti  --auto_instantiation --one_instantiation_per_object -D__KCC__";
-static char * icc_opt = 
-"-O -fpic -frtti";
-static char * cxx_opt = 
-"-O -no_implicit_include -pthread";
-static char * SGICC_opt =  "-O -prelink -D__SGICC__ -LANG:std";
-static char * xlC_opt = 
-"-O -qrtti=all -qeh=v6";
+static const char * gcxx_opt = "-O -fdollars-in-identifiers";
+static const char * KCC_opt = 
+  "-O --exceptions --rtti  --auto_instantiation --one_instantiation_per_object -D__KCC__";
+static const char * icc_opt = "-O -fpic -frtti";
+static const char * cxx_opt = 
+  "-O -no_implicit_include -pthread";
+static const char * SGICC_opt =  "-O -prelink -D__SGICC__ -LANG:std";
+static const char * xlC_opt = "-O -qrtti=all -qeh=v6";
 
 /* --Methode-- */
@@ -251,6 +248,6 @@
 int CxxCompilerLinker::BuildSO(string const & oname, string & soname)
 {
-  //  char * soext = ".dylib"; if defined(Darwin) - pas necessaire Reza 02/2002
-  char * soext = ".so";
+  // const char * soext = ".dylib"; if defined(Darwin) - pas necessaire Reza 02/2002
+  const char * soext = ".so";
 
   if (soname.length() < 1) {
Index: /trunk/SophyaLib/SysTools/timing.c
===================================================================
--- /trunk/SophyaLib/SysTools/timing.c	(revision 3571)
+++ /trunk/SophyaLib/SysTools/timing.c	(revision 3572)
@@ -115,7 +115,7 @@
           Comm, tcalt, tcal);
 
-printf("ElapsedTime(hh:mm:ss): Total= %02d:%02d:%02d ",
+printf("ElapsedTime(hh:mm:ss): Total= %02ld:%02ld:%02ld ",
        etmt/3600, (etmt%3600)/60, etmt%60);
-printf(" (Partial= %02d:%02d:%02d)\n",
+printf(" (Partial= %02ld:%02ld:%02ld)\n",
        etm/3600, (etm%3600)/60, etm%60);
 
Index: /trunk/SophyaLib/TArray/basarr.cc
===================================================================
--- /trunk/SophyaLib/TArray/basarr.cc	(revision 3571)
+++ /trunk/SophyaLib/TArray/basarr.cc	(revision 3572)
@@ -22,5 +22,5 @@
 
 // Variables statiques globales
-char * BaseArray::ck_op_msg_[6] =
+const char * BaseArray::ck_op_msg_[6] =
      {"???", "Size(int )", "IsPacked(int )"
      ,"Stride(int )", "ElemCheckBound()", "operator()" };
Index: /trunk/SophyaLib/TArray/basarr.h
===================================================================
--- /trunk/SophyaLib/TArray/basarr.h	(revision 3571)
+++ /trunk/SophyaLib/TArray/basarr.h	(revision 3572)
@@ -200,5 +200,5 @@
   DVList* mInfo;    //!< Infos (variables) attached to the array
 
-  static char * ck_op_msg_[6]; //!< Operation messages for CheckDI() CheckBound()
+  static const char * ck_op_msg_[6]; //!< Operation messages for CheckDI() CheckBound()
   static sa_size_t max_nprt_; //!< maximum number of printed elements
   static int_4 prt_lev_;  //!< Print level
Index: /trunk/SophyaLib/TArray/triangmtx.h
===================================================================
--- /trunk/SophyaLib/TArray/triangmtx.h	(revision 3571)
+++ /trunk/SophyaLib/TArray/triangmtx.h	(revision 3572)
@@ -32,19 +32,28 @@
 
 //! Default constructor
-TriangularMatrix()   {;};
+TriangularMatrix()
+  : long_diag_(0)
+{
+}
+
 //! instanciate a triangular matrix from the number of rows
-TriangularMatrix(sa_size_t rowSize)  : long_diag_(rowSize) 
-  {
-    elem_.ReSize((rowSize*(rowSize+1)/2) ); 
-  }
+TriangularMatrix(sa_size_t rowSize)
+  : long_diag_(rowSize) 
+{
+  elem_.ReSize((rowSize*(rowSize+1)/2) ); 
+}
+
 //! Copy constructor (possibility of sharing datas)
-  TriangularMatrix(const TriangularMatrix<T>& a,  bool share=false)  : elem_(a.elem_, share),  long_diag_(a.long_diag_) {;}
+TriangularMatrix(const TriangularMatrix<T>& a,  bool share=false)  
+  : long_diag_(a.long_diag_) , elem_(a.elem_, share)  
+{
+}
 
 //! resize the matrix with a new number of rows
 inline void ReSizeRow(sa_size_t rowSize) 
-  {
-    long_diag_=(uint_4)rowSize;
-    elem_.ReSize(long_diag_*(long_diag_+1)/2);
-  }
+{
+  long_diag_=(uint_4)rowSize;
+  elem_.ReSize(long_diag_*(long_diag_+1)/2);
+}
 
 TriangularMatrix<T>& SetT(T a)
Index: /trunk/SophyaLib/TArray/utilarr.cc
===================================================================
--- /trunk/SophyaLib/TArray/utilarr.cc	(revision 3571)
+++ /trunk/SophyaLib/TArray/utilarr.cc	(revision 3572)
@@ -142,5 +142,5 @@
 MuTyV & EnumeratedSequence::Value (sa_size_t k) const 
 {
-  if (k >= vecv_.size())  retv_ = 0;
+  if (k >= (sa_size_t)vecv_.size())  retv_ = 0;
   else retv_ = vecv_[k];
   return(retv_);
@@ -175,5 +175,5 @@
 {
   os << " EnumeratedSequence::Print() - Size()= " << Size() << endl;
-  for(int k=0; k<vecv_.size(); k++) {
+  for(size_t k=0; k<vecv_.size(); k++) {
     os << vecv_[k];
     if ((k > 0) && (k%10 == 0))  os << endl;
@@ -190,5 +190,5 @@
 sa_size_t EnumeratedSequence::Append(EnumeratedSequence const & seq)
 {
-  for(int k=0; k<seq.vecv_.size(); k++) 
+  for(size_t k=0; k<seq.vecv_.size(); k++) 
     vecv_.push_back(seq.vecv_[k]);
   return(seq.vecv_.size());
@@ -278,5 +278,5 @@
   nc = 0;
   sa_size_t n = 0;
-  char buff[256];
+  //char buff[256];
   string line;
   int nbad, nbadtot, nel;
Index: /trunk/SophyaPI/PI/Makefile
===================================================================
--- /trunk/SophyaPI/PI/Makefile	(revision 3571)
+++ /trunk/SophyaPI/PI/Makefile	(revision 3572)
@@ -4,5 +4,5 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
+	 rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
 	rm -f $(SOPHYALIBP)libPI.a
  
@@ -23,18 +23,16 @@
  
 $(SOPHYAOBJP)pi3ddrw.o: pi3ddrw.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3ddrw.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
+  pi3ddrw.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3ddrw.cc
  
 $(SOPHYAOBJP)pi3dwdg.o: pi3dwdg.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3dwdg.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pi3ddrw.h \
-  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  pi3dwdg.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pi3ddrw.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h \
   pibwdgx.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
@@ -44,10 +42,12 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3dwdg.cc
  
-$(SOPHYAOBJP)piapplgen.o: piapplgen.cc \
-  $(SOPHYAINCP)sopnamsp.h piapplgen.h \
-  pimsghandler.h $(SOPHYAINCP)machdefs.h \
-  pisysdep.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
-  picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h
+$(SOPHYAOBJP)piapplgen.o: piapplgen.cc $(SOPHYAINCP)sopnamsp.h \
+  piapplgen.h pimsghandler.h \
+  $(SOPHYAINCP)machdefs.h pisysdep.h \
+  picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h pidrawer.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplgen.cc
  
@@ -56,24 +56,24 @@
   $(SOPHYAINCP)machdefs.h pisysdep.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piconsenum.h picons.h \
-  pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h picons.h pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h \
+  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
   pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplx.cc
  
 $(SOPHYAOBJP)piaxes.o: piaxes.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piaxes.h \
-  pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigratt.h
+  $(SOPHYAINCP)machdefs.h piaxes.h pigraphuc.h \
+  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigratt.h pidrawer.h pibwdggen.h pigraphx.h \
+  pievthandler.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxes.cc
  
 $(SOPHYAOBJP)piaxestools.o: piaxestools.cc \
-  $(SOPHYAINCP)sopnamsp.h piaxes.h \
-  pigraphuc.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pigraphgen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
+  $(SOPHYAINCP)sopnamsp.h piaxes.h pigraphuc.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pigraphgen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
   pigratt.h piaxestools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
   pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
@@ -85,30 +85,28 @@
 $(SOPHYAOBJP)pibargraph.o: pibargraph.cc \
   $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pibargraph.h \
-  pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pibargraph.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibargraph.cc
  
-$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h pibwdggen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h pigraphuc.h pievthandler.h psfile.h pidrawer.h pigratt.h \
-  piaxes.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
-  pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
-  picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
-  pimenubargen.h piconsenum.h
+$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  pibwdggen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pidrawer.h \
+  pigratt.h piaxes.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h \
+  pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h \
+  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
+  pimenubarx.h pimenubargen.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdggen.cc
  
 $(SOPHYAOBJP)pibwdgx.o: pibwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   pixtbaseP.h pibwdgx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  $(SOPHYAINCP)machdefs.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
-  pigraphps.h pixtbase.h
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdgx.cc
  
@@ -118,31 +116,29 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
  
-$(SOPHYAOBJP)picmapgen.o: picmapgen.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)picmapgen.o: picmapgen.cc $(SOPHYAINCP)sopnamsp.h \
+  picmapgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   picmapx.h picmap.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapgen.cc
  
 $(SOPHYAOBJP)picmapview.o: picmapview.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapview.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  $(SOPHYAINCP)sopnamsp.h picmapview.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapview.cc
  
 $(SOPHYAOBJP)picmapx.o: picmapx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picmapx.h picmapgen.h pisysdep.h
+  pimsghandler.h picolist.h pipixutils.h picmapx.h picmapgen.h pisysdep.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapx.cc
  
 $(SOPHYAOBJP)picons.o: picons.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picons.h pistdwdgx.h pistdwdggen.h picontainerx.h picontainergen.h \
   pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
  
@@ -150,5 +146,5 @@
   $(SOPHYAINCP)sopnamsp.h picontainergen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
  
@@ -156,26 +152,25 @@
   $(SOPHYAINCP)sopnamsp.h picontainerx.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainerx.cc
  
-$(SOPHYAOBJP)pidrawer.o: pidrawer.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pidrawer.o: pidrawer.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pidrawer.h pibwdggen.h \
+  pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigratt.h piaxes.h pidrwtools.h pistdwdgx.h \
-  pistdwdggen.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
-  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h ucckprot.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigratt.h piaxes.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
+  pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
+  picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+  pimenubargen.h piconsenum.h ucckprot.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawer.cc
  
-$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrawwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pidrawwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piscdrawwdg.h pibwdgx.h \
-  pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piscdrawwdg.h \
+  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
   pidrawer.h pigratt.h piaxes.h pieldrw.h
@@ -183,12 +178,12 @@
  
 $(SOPHYAOBJP)pidrwtools.o: pidrwtools.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrwtools.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pistdwdgx.h pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h \
-  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  $(SOPHYAINCP)sopnamsp.h pidrwtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
+  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h pibwdggen.h \
+  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
   piscdrawwdg.h pibwdgx.h pigraphps.h pidrawer.h pigratt.h piaxes.h \
   pieldrw.h pi3dwdg.h pi3ddrw.h pigraph3d.h
@@ -196,8 +191,8 @@
  
 $(SOPHYAOBJP)pieldrw.o: pieldrw.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pieldrw.h \
-  pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pieldrw.h pidrawer.h \
+  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pieldrw.cc
@@ -206,7 +201,7 @@
   $(SOPHYAINCP)sopnamsp.h pievthandler.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h piwdgx.h piwdggen.h picolist.h pigraphx.h pigraphgen.h \
-  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
+  pimsghandler.h piwdgx.h piwdggen.h picolist.h pipixutils.h pigraphx.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pievthandler.cc
  
@@ -214,87 +209,81 @@
   $(SOPHYAINCP)sopnamsp.h pifilechogen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechogen.cc
  
 $(SOPHYAOBJP)pifilechox.o: pifilechox.cc \
   $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h piapplx.h \
-  piapplgen.h pimsghandler.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+  $(SOPHYAINCP)machdefs.h piapplx.h piapplgen.h \
+  pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+  picolist.h pipixutils.h pimenubarx.h pimenubargen.h pimenux.h \
+  pimenugen.h piconsenum.h pifilechox.h pifilechogen.h piwindowx.h \
+  piwindowgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechox.cc
  
-$(SOPHYAOBJP)pifontgen.o: pifontgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h
+$(SOPHYAOBJP)pifontgen.o: pifontgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontgen.cc
  
 $(SOPHYAOBJP)pifontx.o: pifontx.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pifontx.h pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pifontx.h \
+  pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
  
-$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraph3d.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraph3d.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   pigraphuc.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
+ 
+$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
+  $(SOPHYAINCP)sopnamsp.h pigraphgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
+ 
+$(SOPHYAOBJP)pigraphps.o: pigraphps.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphps.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
- 
-$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h ucckprot.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
- 
-$(SOPHYAOBJP)pigraphps.o: pigraphps.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphps.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h psfile.h
+  pilineatt.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphps.cc
  
-$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pigraphuc.h \
-  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pigraphuc.h pisysdep.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h ucckprot.h
+  pilineatt.h ucckprot.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphuc.cc
  
-$(SOPHYAOBJP)pigraphx.o: pigraphx.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphx.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h
+$(SOPHYAOBJP)pigraphx.o: pigraphx.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphx.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphx.cc
  
 $(SOPHYAOBJP)pigratt.o: pigratt.cc $(SOPHYAINCP)sopnamsp.h \
-  pigratt.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pigraphgen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
-  $(SOPHYAINCP)strutilxx.h \
+  pigratt.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h $(SOPHYAINCP)strutilxx.h \
   $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigratt.cc
  
-$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc \
-  $(SOPHYAINCP)sopnamsp.h pigrcoord.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc $(SOPHYAINCP)sopnamsp.h \
+  pigrcoord.h pisysdep.h $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigrcoord.cc
  
 $(SOPHYAOBJP)piimage.o: piimage.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  piimage.h parradapter.h lut.h pipixutils.h pieldrw.h pidrawer.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
-  piaxes.h pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piimage.h \
+  parradapter.h lut.h pipixutils.h pieldrw.h pidrawer.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
+  pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h \
   pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
   picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
@@ -304,11 +293,11 @@
  
 $(SOPHYAOBJP)piimgtools.o: piimgtools.cc \
-  $(SOPHYAINCP)sopnamsp.h piimgtools.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pistdwdgx.h pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h piwindowx.h \
-  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h piimage.h parradapter.h lut.h \
-  pipixutils.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
+  $(SOPHYAINCP)sopnamsp.h piimgtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
+  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h piimage.h \
+  parradapter.h lut.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
   pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
@@ -316,13 +305,11 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
  
-$(SOPHYAOBJP)pilineatt.o: pilineatt.cc \
-  $(SOPHYAINCP)sopnamsp.h pilineatt.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pilineatt.o: pilineatt.cc $(SOPHYAINCP)sopnamsp.h \
+  pilineatt.h pisysdep.h $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilineatt.cc
  
-$(SOPHYAOBJP)pilistgen.o: pilistgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pilistgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pilistgen.o: pilistgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pilistgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
  
@@ -330,11 +317,11 @@
   pilistx.h pilistgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picontainerx.h picontainergen.h
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h picontainergen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistx.cc
  
 $(SOPHYAOBJP)pimenubargen.o: pimenubargen.cc \
   $(SOPHYAINCP)sopnamsp.h pimenubargen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   piapplx.h piapplgen.h picontainerx.h picontainergen.h pimenubarx.h \
   piconsenum.h
@@ -344,19 +331,18 @@
   $(SOPHYAINCP)sopnamsp.h pimenubarx.h \
   pimenubargen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pimenux.h \
-  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h \
+  $(SOPHYAINCP)machdefs.h pimenux.h pimenugen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h piapplx.h \
   piapplgen.h picontainerx.h picontainergen.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubarx.cc
  
-$(SOPHYAOBJP)pimenugen.o: pimenugen.cc \
-  $(SOPHYAINCP)sopnamsp.h pimenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pimenugen.o: pimenugen.cc $(SOPHYAINCP)sopnamsp.h \
+  pimenugen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenugen.cc
  
 $(SOPHYAOBJP)pimenux.o: pimenux.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenubarx.h \
+  pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
  
@@ -368,6 +354,6 @@
 $(SOPHYAOBJP)pioptmenugen.o: pioptmenugen.cc \
   $(SOPHYAINCP)sopnamsp.h pioptmenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
  
@@ -376,13 +362,12 @@
   $(SOPHYAINCP)machdefs.h pioptmenux.h \
   pioptmenugen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
+  picolist.h pipixutils.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
   picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h \
   piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenux.cc
  
-$(SOPHYAOBJP)piperiodx.o: piperiodx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdgx.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h piperiodx.h \
+$(SOPHYAOBJP)piperiodx.o: piperiodx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)machdefs.h
@@ -391,19 +376,17 @@
 $(SOPHYAOBJP)pipixmapgen.o: pipixmapgen.cc \
   $(SOPHYAINCP)sopnamsp.h pipixmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pibwdgx.h \
+  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapgen.cc
  
-$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc \
-  $(SOPHYAINCP)sopnamsp.h pipixmapx.h \
-  pipixmapgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
+$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc $(SOPHYAINCP)sopnamsp.h \
+  pipixmapx.h pipixmapgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
   picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapx.cc
  
@@ -415,6 +398,6 @@
   $(SOPHYAINCP)machdefs.h piscdrawwdg.h \
   pisysdep.h pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h pidrawer.h \
@@ -427,66 +410,60 @@
   $(SOPHYAINCP)sopnamsp.h pistdwdggen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdggen.cc
  
-$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc \
-  $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc $(SOPHYAINCP)sopnamsp.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pistdwdgx.h \
   pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picontainerx.h picontainergen.h
+  pipixutils.h picontainerx.h picontainergen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdgx.cc
  
-$(SOPHYAOBJP)pistzwin.o: pistzwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pistzwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pistzwin.o: pistzwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pistzwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piperiodx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h psfile.h \
-  pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h pipixutils.h
+  $(SOPHYAINCP)machdefs.h psfile.h pifontgen.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistzwin.cc
  
-$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc \
-  $(SOPHYAINCP)sopnamsp.h pisurfdr.h \
-  parradapter.h $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.h pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h \
-  pigraph3d.h
+$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc $(SOPHYAINCP)sopnamsp.h \
+  pisurfdr.h parradapter.h \
+  $(SOPHYAINCP)machdefs.h lut.h pipixutils.h \
+  pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pisurfdr.cc
  
 $(SOPHYAOBJP)pitherm.o: pitherm.cc $(SOPHYAINCP)sopnamsp.h \
-  pitherm.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pitherm.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitherm.cc
  
-$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pitxtdrw.h \
-  pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pitxtdrw.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitxtdrw.cc
  
-$(SOPHYAOBJP)piwdggen.o: piwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h picontainergen.h pisysdep.h piwdgx.h pievthandler.h \
-  pigraphx.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h psfile.h
+$(SOPHYAOBJP)piwdggen.o: piwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h picontainergen.h pisysdep.h \
+  piwdgx.h pievthandler.h pigraphx.h pigraphgen.h picmap.h picmapx.h \
+  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdggen.cc
  
 $(SOPHYAOBJP)piwdgx.o: piwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picontainerx.h pisysdep.h picontainergen.h \
-  pievthandler.h pigraphx.h pigraphgen.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h pisysdep.h \
+  picontainergen.h pievthandler.h pigraphx.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)machdefs.h
@@ -497,31 +474,29 @@
   pisysdep.h $(SOPHYAINCP)machdefs.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h psfile.h pifontgen.h pigraphgen.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pigrcoord.h pilineatt.h pipixutils.h
+  picolist.h pipixutils.h psfile.h pifontgen.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowgen.cc
  
-$(SOPHYAOBJP)piwindowx.o: piwindowx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwindowx.h \
-  piwindowgen.h pisysdep.h \
+$(SOPHYAOBJP)piwindowx.o: piwindowx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwindowx.h piwindowgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowx.cc
  
-$(SOPHYAOBJP)pixtbase.o: pixtbase.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pixtbaseP.h \
-  pibwdgx.h pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pixtbase.o: pixtbase.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pixtbaseP.h pibwdgx.h \
+  pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pixtbase.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pixtbase.cc
  
-$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piyfxdrw.h \
-  pisysdep.h parradapter.h lut.h pipixutils.h pidrawer.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
+$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h piyfxdrw.h pisysdep.h \
+  parradapter.h lut.h pipixutils.h pidrawer.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
  
@@ -529,6 +504,6 @@
   psfile.h $(SOPHYAINCP)machdefs.h pisysdep.h \
   pifontgen.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h \
-  pipixutils.h
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
  
Index: /trunk/SophyaPI/PI/parradapter.cc
===================================================================
--- /trunk/SophyaPI/PI/parradapter.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/parradapter.cc	(revision 3572)
@@ -202,5 +202,5 @@
   double x,y;
   this->Coord(ix, iy, x, y);
-  char * isr = "";
+  const char * isr = "";
   if (ISFunc != NULL)  isr = ISFunc(this, ix, iy);
   sprintf(ibuff,"X= %g Y= %g  Pix= %g %s   ", 
Index: /trunk/SophyaPI/PI/piapplx.cc
===================================================================
--- /trunk/SophyaPI/PI/piapplx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/piapplx.cc	(revision 3572)
@@ -40,5 +40,5 @@
 class PITopContAppX : public PIContainer {
 public :
-	    	PITopContAppX(PIContainer *par, char *nom, PIWdg* topw,
+	    	PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw,
                           int sx=10, int sy=10, int px=0, int py=0);
    virtual  	~PITopContAppX(); 
@@ -52,5 +52,5 @@
 
 /* --Methode-- */
-PITopContAppX::PITopContAppX(PIContainer *par, char *nom, PIWdg* topw, int sx, int sy, int px, int py)
+PITopContAppX::PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw, int sx, int sy, int px, int py)
         : PIContainer(par, nom, (sx>10)?sx:10, (sy>10)?sy:10, px, py)
 {
@@ -141,6 +141,5 @@
 if (sx < sxt)  sx = sxt;
 if (sy < 10) sy = 10;
-topcont = new PITopContAppX(MBCont(), "TopLevelCont", topwdg, 
-                            sx, sy, 0, msy);
+topcont = new PITopContAppX(MBCont(), "TopLevelCont", topwdg, sx, sy, 0, msy);
 MBCont()->Show();
 //DBG printf("PIApplicationX-DBG2:: MBContSize=%d %d \n", MBCont()->XSize(), MBCont()->YSize());
Index: /trunk/SophyaPI/PI/pibwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/pibwdgx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pibwdgx.cc	(revision 3572)
@@ -39,5 +39,5 @@
 CreateXtWdg(nom, piXtBaseWidgetClass, NULL, sx, sy, px, py);
 
-XtSetArg(wargs[0],PIXNobject,this); 
+XtSetArg(wargs[0],const_cast<char*>(PIXNobject),this); 
 XtSetArg(wargs[1],XtNbackground, colpixwhite);  
 XtSetArg(wargs[2],XtNborderWidth, (Dimension)0);  
@@ -72,5 +72,5 @@
 #endif
 Arg  wargs[2];
-XtSetArg(wargs[0],PIXNobject,NULL); 
+ XtSetArg(wargs[0],const_cast<char*>(PIXNobject),NULL); 
 XtSetValues(XtWdg(), wargs, 1);
 }
Index: /trunk/SophyaPI/PI/pifilechox.cc
===================================================================
--- /trunk/SophyaPI/PI/pifilechox.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pifilechox.cc	(revision 3572)
@@ -120,5 +120,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)path.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(path.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 Arg warg[2];
 XtSetArg(warg[0], XmNdirectory, xmstr); 
@@ -132,5 +132,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)fname.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(fname.c_str()),  const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 Arg warg[2];
 XtSetArg(warg[0], XmNtextString, xmstr); 
Index: /trunk/SophyaPI/PI/pifontx.cc
===================================================================
--- /trunk/SophyaPI/PI/pifontx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pifontx.cc	(revision 3572)
@@ -263,19 +263,24 @@
 
 static XtResource resources[] = {
-  { "fontFamilyName", "FontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("fontFamilyName"), const_cast<char *>("FontFamilyName"), 
+    XtRString, sizeof(String),
     /*XtOffset(apd, fntFam[0])*/ 0, XtRString, const_cast<char *>("*-courier") } ,
-  { "courierfontFamilyName", "CourierfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("courierfontFamilyName"), const_cast<char *>("CourierfontFamilyName"), 
+    XtRString, sizeof(String),
     sizeof(String) , XtRString, const_cast<char *>("*-courier") } ,
-  { "helveticafontFamilyName", "HelveticafontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("helveticafontFamilyName"), const_cast<char *>("HelveticafontFamilyName"), 
+    XtRString, sizeof(String),
     2*sizeof(String) , XtRString, const_cast<char *>("*-helvetica") } ,
-  { "timesfontFamilyName", "TimesfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("timesfontFamilyName"), const_cast<char *>("TimesfontFamilyName"), 
+    XtRString, sizeof(String),
     3*sizeof(String) , XtRString, const_cast<char *>("*-times") } ,
-  { "symbolfontFamilyName", "SymbolfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("symbolfontFamilyName"), const_cast<char *>("SymbolfontFamilyName"), 
+    XtRString, sizeof(String),
     4*sizeof(String) , XtRString, const_cast<char *>("*-symbol") }
 };
  
-static char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
+static const char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
                           "medium-o-normal", "bold-o-normal" };
-static char * fnbo_b[4] = { NULL, NULL, 
+static const char * fnbo_b[4] = { NULL, NULL, 
                           "medium-i-normal", "bold-i-normal" };
 
@@ -355,5 +360,5 @@
   printf("PIFontX::Init %d fonts found for %s , switching to courier\n",
          count, apd.fntFam[0]);
-  apd.fntFam[0] = "*-courier";
+  apd.fntFam[0] = const_cast<char *>("*-courier");
   if (list) XFreeFontNames(list);
   }
Index: /trunk/SophyaPI/PI/pilistx.cc
===================================================================
--- /trunk/SophyaPI/PI/pilistx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pilistx.cc	(revision 3572)
@@ -116,9 +116,5 @@
 mNItem++;
 
-#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
-XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET);
-#else
-XmString xms = XmStringCreate((char *)(item), XmSTRING_DEFAULT_CHARSET);
-#endif
+XmString xms = XmStringCreate(const_cast<char*>(item), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 XmListAddItem(mlist, xms, 0);
 XmStringFree(xms);
Index: /trunk/SophyaPI/PI/pimenux.cc
===================================================================
--- /trunk/SophyaPI/PI/pimenux.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pimenux.cc	(revision 3572)
@@ -386,5 +386,5 @@
   n=0;
   sprintf(acc,"Ctrl/%c", sc[0]);
-  xmstr = XmStringLtoRCreate(acc, XmSTRING_DEFAULT_CHARSET);
+  xmstr = XmStringLtoRCreate(acc, const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
   XtSetArg(warg[n], XmNacceleratorText, xmstr); n++;
   sprintf(acc,"Ctrl<Key>%c", sc[0]);
Index: /trunk/SophyaPI/PI/pioptmenux.cc
===================================================================
--- /trunk/SophyaPI/PI/pioptmenux.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pioptmenux.cc	(revision 3572)
@@ -160,5 +160,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];
Index: /trunk/SophyaPI/PI/pistdwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/pistdwdgx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pistdwdgx.cc	(revision 3572)
@@ -51,5 +51,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];
@@ -149,5 +149,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];
Index: /trunk/SophyaPI/PI/pitherm.cc
===================================================================
--- /trunk/SophyaPI/PI/pitherm.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pitherm.cc	(revision 3572)
@@ -24,5 +24,5 @@
 //--
 //++
-//  PIThermometer(PIContainerGen *par, char *nom, int sx=256, int sy=10, int px=0, int py=0)
+//  PIThermometer(PIContainerGen *par, const char *nom, int sx=256, int sy=10, int px=0, int py=0)
 //	Constructeur - Le choix d'affichage (vertical ou horizontal) dépend
 //	du rapport des tailles "sx", "sy"
@@ -31,5 +31,5 @@
 
 /* --Methode-- */
-PIThermometer::PIThermometer(PIContainerGen *par, char *nom,
+PIThermometer::PIThermometer(PIContainerGen *par, const char *nom,
                        int sx, int sy, int px, int py) 
 : PIBaseWdg(par, nom, sx, sy, px, py)
Index: /trunk/SophyaPI/PI/pitherm.h
===================================================================
--- /trunk/SophyaPI/PI/pitherm.h	(revision 3571)
+++ /trunk/SophyaPI/PI/pitherm.h	(revision 3572)
@@ -16,5 +16,5 @@
   enum {ClassId = 5220};
 
-                  PIThermometer(PIContainerGen *par, char *nom,
+                  PIThermometer(PIContainerGen *par, const char *nom,
                                 int sx=256, int sy=10, int px=0, int py=0);
   virtual         ~PIThermometer();
Index: /trunk/SophyaPI/PI/piwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/piwdgx.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/piwdgx.cc	(revision 3572)
@@ -20,9 +20,5 @@
 #include "pigraphx.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "perrors.h"
-#else
 #include "pexceptions.h"
-#endif
 
 
@@ -627,30 +623,30 @@
 // Ressources X si non definis 
 static const String fallback_res[26] = {
-"PeidaInt*default*background:                 LightGrey" ,
-"PeidaInt*background:                         LightGrey" ,
-"PeidaInt*Foreground:                         Black",
-"PeidaInt*default*Foreground:                 Black",
-"PeidaInt*default*bottomShadowColor:          Black",
-"PeidaInt*bottomShadowColor:                  Black",
-"PeidaInt*default*topShadowColor:             White",
-"PeidaInt*topShadowColor:                     White",
-"PeidaInt*borderColor:                        Black",
-"PeidaInt*XmLabel.borderWidth:                0",
-"PeidaInt*XmDrawingArea*background:           Black",
-"PeidaInt*XmPushButton*borderWidth:           0",
-"PeidaInt*XmText*shadowThickness:             2",
-"PeidaInt*XmText*highlightThickness:          0",
-"PeidaInt*XmText*marginHeigt:                 0",
-"PeidaInt*XmText*marginWidth:                 2",
-// "PeidaInt*DefMenubar*XtNwidth:                250",
-// "PeidaInt*DefMenubar*XtNheight:               30",
-"PeidaInt*fontList:           -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
-"PeidaInt*default*fontList:   -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
-"PeidaInt*fontFamilyName:                     *-courier",    // Pas de blanc apres le nom de font
-"PeidaInt*courierfontFamilyName:              *-courier",    //           "        " 
-"PeidaInt*helveticafontFamilyName:            *-helvetica",  //           "        " 
-"PeidaInt*timesfontFamilyName:                *-times",      //           "        " 
-"PeidaInt*symbolfontFamilyName:               *-symbol",     //           "        " 
-"PeidaInt*XmToggleButton*selectColor:         Red",
+const_cast<char*>("PeidaInt*default*background:                 LightGrey") ,
+const_cast<char*>("PeidaInt*background:                         LightGrey") ,
+const_cast<char*>("PeidaInt*Foreground:                         Black"),
+const_cast<char*>("PeidaInt*default*Foreground:                 Black"),
+const_cast<char*>("PeidaInt*default*bottomShadowColor:          Black"),
+const_cast<char*>("PeidaInt*bottomShadowColor:                  Black"),
+const_cast<char*>("PeidaInt*default*topShadowColor:             White"),
+const_cast<char*>("PeidaInt*topShadowColor:                     White"),
+const_cast<char*>("PeidaInt*borderColor:                        Black"),
+const_cast<char*>("PeidaInt*XmLabel.borderWidth:                0"),
+const_cast<char*>("PeidaInt*XmDrawingArea*background:           Black"),
+const_cast<char*>("PeidaInt*XmPushButton*borderWidth:           0"),
+const_cast<char*>("PeidaInt*XmText*shadowThickness:             2"),
+const_cast<char*>("PeidaInt*XmText*highlightThickness:          0"),
+const_cast<char*>("PeidaInt*XmText*marginHeigt:                 0"),
+const_cast<char*>("PeidaInt*XmText*marginWidth:                 2"),
+// const_cast<char*>("PeidaInt*DefMenubar*XtNwidth:                250"),
+// const_cast<char*>("PeidaInt*DefMenubar*XtNheight:               30"),
+const_cast<char*>("PeidaInt*fontList:           -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1"),
+const_cast<char*>("PeidaInt*default*fontList:   -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1"),
+const_cast<char*>("PeidaInt*fontFamilyName:                     *-courier"),    // Pas de blanc apres le nom de font
+const_cast<char*>("PeidaInt*courierfontFamilyName:              *-courier"),    //           "        " 
+const_cast<char*>("PeidaInt*helveticafontFamilyName:            *-helvetica"),  //           "        " 
+const_cast<char*>("PeidaInt*timesfontFamilyName:                *-times"),      //           "        " 
+const_cast<char*>("PeidaInt*symbolfontFamilyName:               *-symbol"),     //           "        " 
+const_cast<char*>("PeidaInt*XmToggleButton*selectColor:         Red"),
 NULL
 };
@@ -681,18 +677,10 @@
 if (top == NULL) {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()\n");
-#ifdef SANS_EVOLPLANCK
-  throw notFoundErr;
-#else
-  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
-#endif
+  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
   }
 dpy = XtDisplay(top);
 if (dpy == NULL)  {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection\n");
-#ifdef SANS_EVOLPLANCK
-  throw notFoundErr;
-#else
-  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
-#endif
+  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
   }
 
@@ -734,5 +722,5 @@
   }
 stdfnt = XLoadQueryFont(dpy, buff);
-char * myfntname = "???";
+const char * myfntname = "???";
 // Recherche du champ taille en pixel de la fonte : apres le 7eme tiret
 int mySzFont = 12;
Index: /trunk/SophyaPI/PI/pixtbase.cc
===================================================================
--- /trunk/SophyaPI/PI/pixtbase.cc	(revision 3571)
+++ /trunk/SophyaPI/PI/pixtbase.cc	(revision 3572)
@@ -46,5 +46,5 @@
 
 static XtResource resources[] ={
-  {PIXNobject ,(char *)"Object", XtRPointer, sizeof(XtRPointer),
+  {const_cast<char*>(PIXNobject) ,const_cast<char*>("Object"), XtRPointer, sizeof(XtRPointer),
    XtOffset(PIXtBaseWidget,  pixtbase.objet), XtRImmediate, (XtPointer)0},
 };
Index: /trunk/SophyaPI/PI/smakefile
===================================================================
--- /trunk/SophyaPI/PI/smakefile	(revision 3571)
+++ /trunk/SophyaPI/PI/smakefile	(revision 3572)
@@ -4,5 +4,5 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
+	 rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
 	rm -f $(SOPHYALIBP)libPI.a
  
@@ -23,18 +23,16 @@
  
 $(SOPHYAOBJP)pi3ddrw.o: pi3ddrw.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3ddrw.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
+  pi3ddrw.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3ddrw.cc
  
 $(SOPHYAOBJP)pi3dwdg.o: pi3dwdg.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3dwdg.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pi3ddrw.h \
-  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  pi3dwdg.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pi3ddrw.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h \
   pibwdgx.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
@@ -44,10 +42,12 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3dwdg.cc
  
-$(SOPHYAOBJP)piapplgen.o: piapplgen.cc \
-  $(SOPHYAINCP)sopnamsp.h piapplgen.h \
-  pimsghandler.h $(SOPHYAINCP)machdefs.h \
-  pisysdep.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
-  picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h
+$(SOPHYAOBJP)piapplgen.o: piapplgen.cc $(SOPHYAINCP)sopnamsp.h \
+  piapplgen.h pimsghandler.h \
+  $(SOPHYAINCP)machdefs.h pisysdep.h \
+  picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h pidrawer.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplgen.cc
  
@@ -56,24 +56,24 @@
   $(SOPHYAINCP)machdefs.h pisysdep.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piconsenum.h picons.h \
-  pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h picons.h pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h \
+  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
   pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplx.cc
  
 $(SOPHYAOBJP)piaxes.o: piaxes.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piaxes.h \
-  pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigratt.h
+  $(SOPHYAINCP)machdefs.h piaxes.h pigraphuc.h \
+  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigratt.h pidrawer.h pibwdggen.h pigraphx.h \
+  pievthandler.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxes.cc
  
 $(SOPHYAOBJP)piaxestools.o: piaxestools.cc \
-  $(SOPHYAINCP)sopnamsp.h piaxes.h \
-  pigraphuc.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pigraphgen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
+  $(SOPHYAINCP)sopnamsp.h piaxes.h pigraphuc.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pigraphgen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
   pigratt.h piaxestools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
   pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
@@ -85,30 +85,28 @@
 $(SOPHYAOBJP)pibargraph.o: pibargraph.cc \
   $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pibargraph.h \
-  pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pibargraph.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibargraph.cc
  
-$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h pibwdggen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h pigraphuc.h pievthandler.h psfile.h pidrawer.h pigratt.h \
-  piaxes.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
-  pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
-  picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
-  pimenubargen.h piconsenum.h
+$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  pibwdggen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pidrawer.h \
+  pigratt.h piaxes.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h \
+  pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h \
+  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
+  pimenubarx.h pimenubargen.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdggen.cc
  
 $(SOPHYAOBJP)pibwdgx.o: pibwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   pixtbaseP.h pibwdgx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  $(SOPHYAINCP)machdefs.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
-  pigraphps.h pixtbase.h
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdgx.cc
  
@@ -118,31 +116,29 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
  
-$(SOPHYAOBJP)picmapgen.o: picmapgen.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)picmapgen.o: picmapgen.cc $(SOPHYAINCP)sopnamsp.h \
+  picmapgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   picmapx.h picmap.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapgen.cc
  
 $(SOPHYAOBJP)picmapview.o: picmapview.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapview.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  $(SOPHYAINCP)sopnamsp.h picmapview.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapview.cc
  
 $(SOPHYAOBJP)picmapx.o: picmapx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picmapx.h picmapgen.h pisysdep.h
+  pimsghandler.h picolist.h pipixutils.h picmapx.h picmapgen.h pisysdep.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapx.cc
  
 $(SOPHYAOBJP)picons.o: picons.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picons.h pistdwdgx.h pistdwdggen.h picontainerx.h picontainergen.h \
   pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
  
@@ -150,5 +146,5 @@
   $(SOPHYAINCP)sopnamsp.h picontainergen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
  
@@ -156,26 +152,25 @@
   $(SOPHYAINCP)sopnamsp.h picontainerx.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainerx.cc
  
-$(SOPHYAOBJP)pidrawer.o: pidrawer.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pidrawer.o: pidrawer.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pidrawer.h pibwdggen.h \
+  pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigratt.h piaxes.h pidrwtools.h pistdwdgx.h \
-  pistdwdggen.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
-  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h ucckprot.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigratt.h piaxes.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
+  pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
+  picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+  pimenubargen.h piconsenum.h ucckprot.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawer.cc
  
-$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrawwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pidrawwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piscdrawwdg.h pibwdgx.h \
-  pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piscdrawwdg.h \
+  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
   pidrawer.h pigratt.h piaxes.h pieldrw.h
@@ -183,12 +178,12 @@
  
 $(SOPHYAOBJP)pidrwtools.o: pidrwtools.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrwtools.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pistdwdgx.h pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h \
-  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  $(SOPHYAINCP)sopnamsp.h pidrwtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
+  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h pibwdggen.h \
+  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
   piscdrawwdg.h pibwdgx.h pigraphps.h pidrawer.h pigratt.h piaxes.h \
   pieldrw.h pi3dwdg.h pi3ddrw.h pigraph3d.h
@@ -196,8 +191,8 @@
  
 $(SOPHYAOBJP)pieldrw.o: pieldrw.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pieldrw.h \
-  pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pieldrw.h pidrawer.h \
+  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pieldrw.cc
@@ -206,7 +201,7 @@
   $(SOPHYAINCP)sopnamsp.h pievthandler.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h piwdgx.h piwdggen.h picolist.h pigraphx.h pigraphgen.h \
-  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
+  pimsghandler.h piwdgx.h piwdggen.h picolist.h pipixutils.h pigraphx.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pievthandler.cc
  
@@ -214,87 +209,81 @@
   $(SOPHYAINCP)sopnamsp.h pifilechogen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechogen.cc
  
 $(SOPHYAOBJP)pifilechox.o: pifilechox.cc \
   $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h piapplx.h \
-  piapplgen.h pimsghandler.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+  $(SOPHYAINCP)machdefs.h piapplx.h piapplgen.h \
+  pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+  picolist.h pipixutils.h pimenubarx.h pimenubargen.h pimenux.h \
+  pimenugen.h piconsenum.h pifilechox.h pifilechogen.h piwindowx.h \
+  piwindowgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechox.cc
  
-$(SOPHYAOBJP)pifontgen.o: pifontgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h
+$(SOPHYAOBJP)pifontgen.o: pifontgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontgen.cc
  
 $(SOPHYAOBJP)pifontx.o: pifontx.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pifontx.h pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pifontx.h \
+  pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
  
-$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraph3d.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraph3d.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   pigraphuc.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
+ 
+$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
+  $(SOPHYAINCP)sopnamsp.h pigraphgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
+ 
+$(SOPHYAOBJP)pigraphps.o: pigraphps.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphps.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
- 
-$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h ucckprot.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
- 
-$(SOPHYAOBJP)pigraphps.o: pigraphps.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphps.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h psfile.h
+  pilineatt.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphps.cc
  
-$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pigraphuc.h \
-  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pigraphuc.h pisysdep.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h ucckprot.h
+  pilineatt.h ucckprot.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphuc.cc
  
-$(SOPHYAOBJP)pigraphx.o: pigraphx.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphx.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pipixutils.h
+$(SOPHYAOBJP)pigraphx.o: pigraphx.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphx.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphx.cc
  
 $(SOPHYAOBJP)pigratt.o: pigratt.cc $(SOPHYAINCP)sopnamsp.h \
-  pigratt.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pigraphgen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
-  $(SOPHYAINCP)strutilxx.h \
+  pigratt.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h $(SOPHYAINCP)strutilxx.h \
   $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigratt.cc
  
-$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc \
-  $(SOPHYAINCP)sopnamsp.h pigrcoord.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc $(SOPHYAINCP)sopnamsp.h \
+  pigrcoord.h pisysdep.h $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigrcoord.cc
  
 $(SOPHYAOBJP)piimage.o: piimage.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  piimage.h parradapter.h lut.h pipixutils.h pieldrw.h pidrawer.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
-  piaxes.h pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piimage.h \
+  parradapter.h lut.h pipixutils.h pieldrw.h pidrawer.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
+  pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h \
   pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
   picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
@@ -304,11 +293,11 @@
  
 $(SOPHYAOBJP)piimgtools.o: piimgtools.cc \
-  $(SOPHYAINCP)sopnamsp.h piimgtools.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pistdwdgx.h pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h piwindowx.h \
-  piwindowgen.h picontainerx.h picontainergen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h piimage.h parradapter.h lut.h \
-  pipixutils.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
+  $(SOPHYAINCP)sopnamsp.h piimgtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
+  piapplgen.h pimenubarx.h pimenubargen.h piconsenum.h piimage.h \
+  parradapter.h lut.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
   pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
@@ -316,13 +305,11 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
  
-$(SOPHYAOBJP)pilineatt.o: pilineatt.cc \
-  $(SOPHYAINCP)sopnamsp.h pilineatt.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pilineatt.o: pilineatt.cc $(SOPHYAINCP)sopnamsp.h \
+  pilineatt.h pisysdep.h $(SOPHYAINCP)machdefs.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilineatt.cc
  
-$(SOPHYAOBJP)pilistgen.o: pilistgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pilistgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pilistgen.o: pilistgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pilistgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
  
@@ -330,11 +317,11 @@
   pilistx.h pilistgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picontainerx.h picontainergen.h
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h picontainergen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistx.cc
  
 $(SOPHYAOBJP)pimenubargen.o: pimenubargen.cc \
   $(SOPHYAINCP)sopnamsp.h pimenubargen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   piapplx.h piapplgen.h picontainerx.h picontainergen.h pimenubarx.h \
   piconsenum.h
@@ -344,19 +331,18 @@
   $(SOPHYAINCP)sopnamsp.h pimenubarx.h \
   pimenubargen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pimenux.h \
-  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h \
+  $(SOPHYAINCP)machdefs.h pimenux.h pimenugen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h piapplx.h \
   piapplgen.h picontainerx.h picontainergen.h piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubarx.cc
  
-$(SOPHYAOBJP)pimenugen.o: pimenugen.cc \
-  $(SOPHYAINCP)sopnamsp.h pimenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pimenugen.o: pimenugen.cc $(SOPHYAINCP)sopnamsp.h \
+  pimenugen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenugen.cc
  
 $(SOPHYAOBJP)pimenux.o: pimenux.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenubarx.h \
+  pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
  
@@ -368,6 +354,6 @@
 $(SOPHYAOBJP)pioptmenugen.o: pioptmenugen.cc \
   $(SOPHYAINCP)sopnamsp.h pioptmenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
  
@@ -376,13 +362,12 @@
   $(SOPHYAINCP)machdefs.h pioptmenux.h \
   pioptmenugen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
+  picolist.h pipixutils.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
   picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h \
   piconsenum.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenux.cc
  
-$(SOPHYAOBJP)piperiodx.o: piperiodx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdgx.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h piperiodx.h \
+$(SOPHYAOBJP)piperiodx.o: piperiodx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)machdefs.h
@@ -391,19 +376,17 @@
 $(SOPHYAOBJP)pipixmapgen.o: pipixmapgen.cc \
   $(SOPHYAINCP)sopnamsp.h pipixmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pibwdgx.h \
+  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapgen.cc
  
-$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc \
-  $(SOPHYAINCP)sopnamsp.h pipixmapx.h \
-  pipixmapgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
+$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc $(SOPHYAINCP)sopnamsp.h \
+  pipixmapx.h pipixmapgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
   picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapx.cc
  
@@ -415,6 +398,6 @@
   $(SOPHYAINCP)machdefs.h piscdrawwdg.h \
   pisysdep.h pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h pidrawer.h \
@@ -427,66 +410,60 @@
   $(SOPHYAINCP)sopnamsp.h pistdwdggen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdggen.cc
  
-$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc \
-  $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc $(SOPHYAINCP)sopnamsp.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pistdwdgx.h \
   pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picontainerx.h picontainergen.h
+  pipixutils.h picontainerx.h picontainergen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdgx.cc
  
-$(SOPHYAOBJP)pistzwin.o: pistzwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pistzwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pistzwin.o: pistzwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pistzwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piperiodx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h psfile.h \
-  pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h pipixutils.h
+  $(SOPHYAINCP)machdefs.h psfile.h pifontgen.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistzwin.cc
  
-$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc \
-  $(SOPHYAINCP)sopnamsp.h pisurfdr.h \
-  parradapter.h $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.h pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h \
-  pigraph3d.h
+$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc $(SOPHYAINCP)sopnamsp.h \
+  pisurfdr.h parradapter.h \
+  $(SOPHYAINCP)machdefs.h lut.h pipixutils.h \
+  pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pisurfdr.cc
  
 $(SOPHYAOBJP)pitherm.o: pitherm.cc $(SOPHYAINCP)sopnamsp.h \
-  pitherm.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pitherm.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitherm.cc
  
-$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pitxtdrw.h \
-  pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pitxtdrw.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitxtdrw.cc
  
-$(SOPHYAOBJP)piwdggen.o: piwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h picontainergen.h pisysdep.h piwdgx.h pievthandler.h \
-  pigraphx.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h psfile.h
+$(SOPHYAOBJP)piwdggen.o: piwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h picontainergen.h pisysdep.h \
+  piwdgx.h pievthandler.h pigraphx.h pigraphgen.h picmap.h picmapx.h \
+  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h psfile.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdggen.cc
  
 $(SOPHYAOBJP)piwdgx.o: piwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picontainerx.h pisysdep.h picontainergen.h \
-  pievthandler.h pigraphx.h pigraphgen.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h \
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h pisysdep.h \
+  picontainergen.h pievthandler.h pigraphx.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)machdefs.h
@@ -497,31 +474,29 @@
   pisysdep.h $(SOPHYAINCP)machdefs.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h psfile.h pifontgen.h pigraphgen.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pigrcoord.h pilineatt.h pipixutils.h
+  picolist.h pipixutils.h psfile.h pifontgen.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowgen.cc
  
-$(SOPHYAOBJP)piwindowx.o: piwindowx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwindowx.h \
-  piwindowgen.h pisysdep.h \
+$(SOPHYAOBJP)piwindowx.o: piwindowx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwindowx.h piwindowgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowx.cc
  
-$(SOPHYAOBJP)pixtbase.o: pixtbase.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pixtbaseP.h \
-  pibwdgx.h pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pixtbase.o: pixtbase.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pixtbaseP.h pibwdgx.h \
+  pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h pixtbase.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pixtbase.cc
  
-$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piyfxdrw.h \
-  pisysdep.h parradapter.h lut.h pipixutils.h pidrawer.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
+$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h piyfxdrw.h pisysdep.h \
+  parradapter.h lut.h pipixutils.h pidrawer.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
  
@@ -529,6 +504,6 @@
   psfile.h $(SOPHYAINCP)machdefs.h pisysdep.h \
   pifontgen.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h \
-  pipixutils.h
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
  
Index: /trunk/SophyaPI/PIGcont/Makefile
===================================================================
--- /trunk/SophyaPI/PIGcont/Makefile	(revision 3571)
+++ /trunk/SophyaPI/PIGcont/Makefile	(revision 3572)
@@ -22,4 +22,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -35,5 +36,6 @@
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)picmapview.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -50,6 +52,5 @@
   $(SOPHYAINCP)pievthandler.h \
   $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)picmapview.h pigncont.h \
+  $(SOPHYAINCP)pigraphps.h pigncont.h \
   $(SOPHYAINCP)pistdimgapp.h \
   $(SOPHYAINCP)piapplx.h \
@@ -60,4 +61,5 @@
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -141,4 +143,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -154,5 +157,6 @@
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)picmapview.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -169,6 +173,5 @@
   $(SOPHYAINCP)pievthandler.h \
   $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)picmapview.h pigncont.h \
+  $(SOPHYAINCP)pigraphps.h pigncont.h \
   $(SOPHYAINCP)pistdimgapp.h \
   $(SOPHYAINCP)piapplx.h \
@@ -179,4 +182,5 @@
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
Index: /trunk/SophyaPI/PIGcont/pigncont.cc
===================================================================
--- /trunk/SophyaPI/PIGcont/pigncont.cc	(revision 3571)
+++ /trunk/SophyaPI/PIGcont/pigncont.cc	(revision 3572)
@@ -132,5 +132,5 @@
   _zmin = 1.e37;
   _zmax = -1.e37;
-  char *nom[4]={"x","y","z","niso"};
+  const char *nom[4]={"x","y","z","niso"};
   _myiso = new NTuple(4,nom);  
   //_myiso->Show();
@@ -343,5 +343,5 @@
    _ny = arr->YSize()  ;
    //cout << " size x,y "<<_nx<<" , "<<_ny <<endl;
-   char *nom[4]={"x","y","z","niso"};
+   const char *nom[4]={"x","y","z","niso"};
    
    _myiso = new NTuple(4,nom);  
Index: /trunk/SophyaPI/PIGcont/smakefile
===================================================================
--- /trunk/SophyaPI/PIGcont/smakefile	(revision 3571)
+++ /trunk/SophyaPI/PIGcont/smakefile	(revision 3572)
@@ -22,4 +22,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -142,4 +143,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
Index: /trunk/SophyaPI/PIext/Makefile
===================================================================
--- /trunk/SophyaPI/PIext/Makefile	(revision 3571)
+++ /trunk/SophyaPI/PIext/Makefile	(revision 3572)
@@ -42,26 +42,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -69,4 +53,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -76,4 +62,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -163,34 +164,36 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pifilechox.h \
   $(SOPHYAINCP)pifilechogen.h \
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -277,4 +280,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -320,9 +324,5 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -330,4 +330,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -337,4 +339,6 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -387,26 +391,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -414,4 +402,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -421,4 +411,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -473,26 +478,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -500,4 +489,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -507,4 +498,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -581,26 +587,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -608,4 +598,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -615,4 +607,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -689,4 +696,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -733,9 +741,5 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -743,4 +747,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -750,4 +756,6 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -799,4 +807,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -860,4 +869,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -920,4 +930,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -989,4 +1000,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1086,4 +1098,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1130,5 +1143,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -1195,4 +1207,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1264,4 +1277,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1347,4 +1361,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1412,4 +1427,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1510,4 +1526,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1593,4 +1610,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1623,9 +1641,5 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1633,4 +1647,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1640,4 +1656,6 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1700,26 +1718,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1727,4 +1729,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1734,4 +1738,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1797,26 +1816,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1824,4 +1827,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1831,4 +1836,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1937,4 +1957,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1969,9 +1990,5 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1979,4 +1996,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1986,4 +2005,6 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2002,5 +2023,4 @@
   $(SOPHYAINCP)pitherm.h \
   $(SOPHYAINCP)resusage.h nomhistadapter.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2045,4 +2065,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2097,4 +2118,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2124,4 +2146,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2153,26 +2176,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)sopnamsp.h pihisto2d.h \
   $(SOPHYAINCP)pimenux.h \
@@ -2180,8 +2187,25 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pidrawer.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pidrawer.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigratt.h \
   $(SOPHYAINCP)piaxes.h \
   $(SOPHYAINCP)piscdrawwdg.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2211,26 +2235,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2238,4 +2246,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2245,4 +2255,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2308,5 +2333,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2357,4 +2381,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2385,4 +2410,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2411,4 +2437,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2478,26 +2505,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2505,4 +2516,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2512,4 +2525,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2591,26 +2619,10 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2618,4 +2630,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2625,4 +2639,19 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2672,4 +2701,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)lut.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)tmatrix.h \
   $(SOPHYAINCP)tarray.h \
@@ -2720,4 +2750,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2764,9 +2795,5 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2774,4 +2801,6 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2781,4 +2810,6 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
Index: /trunk/SophyaPI/PIext/basexecut.cc
===================================================================
--- /trunk/SophyaPI/PIext/basexecut.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/basexecut.cc	(revision 3572)
@@ -24,9 +24,5 @@
 #include "datatable.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#else
 #include "tvector.h"
-#endif
 
 
@@ -95,15 +91,4 @@
   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,5 +107,4 @@
     return(-79);
   }
-#endif
 /*DEL----- Plus besoin en multi-thread ? / Reza 06/01/2004 
   mImgApp->RedirectStdOutErr(red);
@@ -732,5 +716,4 @@
   }
 
-#ifndef SANS_EVOLPLANCK
 /* Lecture matrice/vecteur depuis fichier ASCII  */
 else if ((kw == "mtxfrascii") || (kw == "vecfrascii") ) {
@@ -788,5 +771,4 @@
 }
   
-#endif
 
 else if (kw == "fillnt" ) {
@@ -970,5 +952,4 @@
 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,5 +967,4 @@
 usage += "\n  Related commands:  mtxfrascii vecfrascii ntfrascii ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
-#endif
 
 kw = "print";
@@ -1181,9 +1161,4 @@
 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)"; 
Index: /trunk/SophyaPI/PIext/cxxexecutor.cc
===================================================================
--- /trunk/SophyaPI/PIext/cxxexecutor.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/cxxexecutor.cc	(revision 3572)
@@ -394,8 +394,4 @@
   <<endl
 
-#ifdef SANS_EVOLPLANCK
-  <<"//---- Peida include files"<<endl
-  <<"#include \"toutpeida.h\""<<endl
-#else
   // Si on enleve sopnamsp.h (using namespace SOPHYA), il faudra accoler 
   // SOPHYA:: à toutes les déclarations automatiques - Reza, 10/09/2004 
@@ -409,5 +405,4 @@
   <<"#include \"histats.h\""<<endl
   <<endl
-#endif
 
   <<"//---- Spiapp include files"<<endl
@@ -497,15 +492,7 @@
   os<<obtype<<"* "<<stmp
     <<" = dynamic_cast< "<<obtype<<" * >(omg.GetObj(___nomobj));"<<endl;
-#ifdef SANS_EVOLPLANCK
-  os<<"if("<<stmp<<"==NULL) { \n"
-    <<" long mExcErr = nullPtrErr; \n"
-    <<" cerr << \"CxxExecutor::PutObject: Non existing object "
-    <<" ... please update file \\n \" ;"
-    <<" throw mExcErr ; \n } "<<endl;
-#else
   os<<"if("<<stmp<<"==NULL) throw NullPtrError"
     <<"(\"CxxExecutor::PutObject: Non existing object "<<nobj
     <<"... please update file\");"<<endl;
-#endif
   os<<obtype<<"& "<<nobj<<" = (*"<<stmp<<");"<<endl<<endl;
 }
@@ -622,11 +609,5 @@
 
 int rc;
-#ifdef SANS_EVOLPLANCK
-CxxCompilerLinker cxx;
-string sophlib = " -lPIE -lm ";
-cxx.AddLinkOptions(sophlib);
-#else
 CxxCompilerLinker cxx(true,true,true);
-#endif
 if(TmpDir().size()>0) cxx.SetTmpDir(TmpDir());
 if(mPrtLevel>0) cxx.SetVerbose(true);
Index: /trunk/SophyaPI/PIext/exclude
===================================================================
--- /trunk/SophyaPI/PIext/exclude	(revision 3571)
+++ /trunk/SophyaPI/PIext/exclude	(revision 3572)
@@ -1,4 +1,2 @@
 userfitfunex.c
-nommatvecadapter.cc
-nomstladapter.cc
 pistlist.cc
Index: /trunk/SophyaPI/PIext/flowmodex.cc
===================================================================
--- /trunk/SophyaPI/PIext/flowmodex.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/flowmodex.cc	(revision 3572)
@@ -117,5 +117,5 @@
   
   // Creation NTuple 
-  char* ntn[4] = {"expx","expy","expex","expey"};
+  const char* ntn[4] = {"expx","expy","expex","expey"};
   NTuple * ntint = NULL;
   ntint = new NTuple(4,ntn);
Index: /trunk/SophyaPI/PIext/nobjmgr.cc
===================================================================
--- /trunk/SophyaPI/PIext/nobjmgr.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/nobjmgr.cc	(revision 3572)
@@ -20,12 +20,7 @@
 #include "dvlist.h"
 
-// EVOL-PLANCK
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"  
-#else
 #include "tvector.h"
 #include "pitvmaad.h"
 #include "piyfxdrw.h"
-#endif
 
 #include "pisurfdr.h"
@@ -259,9 +254,5 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  bool fg = true;
-#else
   bool fg = myVars->HasKey(key);
-#endif
   myVars->SetS(key, val);
   //  cout << " DEBUG::SetVar " << *myVars << endl;
@@ -277,12 +268,5 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  DVList::ValList::const_iterator it;
-  for(it=myVars->Begin(); it!= myVars->End(); it++)
-    if ((*it).first == key)  return true;
-  return(false);
-#else
   return(myVars->HasKey(key));
-#endif
 }
 
@@ -295,9 +279,5 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  return(false);
-#else
   return(myVars->DeleteKey(key));
-#endif
 }
 
@@ -945,13 +925,4 @@
 PPersist* ppobj=NULL;
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY{
-  PInPersist pis(flnm);
-  ppobj = PPersistMgr::ReadObject(pis);
-  if (ppobj == NULL) ok = false;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
   PInPersist pis(flnm);
@@ -962,5 +933,4 @@
   ok = false;
   }
-#endif
 if (!ok)  return;
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
@@ -1011,7 +981,4 @@
 {
 int_4 i; // $CHECK$ int -> int_4 a cause de TagKey
-#ifdef SANS_EVOLPLANCK
-int_4 cid, key, ln; // $CHECK$ int -> int_4 a cause de TagKey
-#endif
 int n0, n1;
 bool ok = true;
@@ -1021,9 +988,5 @@
 int nread = 0;
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = s.NbTags();
-#else 
 nbtags = s.NbNameTags();
-#endif
 if ( (nbtags < 1) || (num >= nbtags) ) {
   if (num >= 0) { 
@@ -1033,13 +996,4 @@
   }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
 try {
   obj = s.ReadObject();
@@ -1049,5 +1003,4 @@
   ok = false;
   }
-#endif
 
   if (!ok)  return;
@@ -1060,17 +1013,4 @@
 else { n0 = num; n1 = num+1; }
 for(i=n0; i<n1; i++) {
-#ifdef SANS_EVOLPLANCK
-  key = s.TagKey(i, cid, ln); 
-  if (ln <= 0)  nom = "";
-  else nom = s.TagName(i);
-  s.GotoTag(i);
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
   s.GotoNameTagNum(i);
   nom = s.GetTagName(i);
@@ -1082,5 +1022,4 @@
     ok = false;
     }
-#endif
   if (ok)  { AddObj_P(obj->DataObj(), nom, true);  nread++; }
 }
@@ -1095,25 +1034,4 @@
   //    sinon, tous les objets sequentiellement
 {
-#ifdef SANS_EVOLPLANCK
-bool ok = true;
-PPersist* obj=NULL;
-
-PInPersist* ppin=NULL;
-TRY{
-  ppin = new PInPersist(flnm);
-  if (ppin->NbTags() < 1)  obj = PPersistMgr::ReadObject((*ppin));
-  else obj = NULL;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } 
-ENDTRY;
-if (!ok)  return;
-if (obj) {
-  string nom = servnobjm->FileName2Name(flnm);
-  AddObj(obj->DataObj(), nom, false);
-  }
-else ReadObj((*ppin), -1);
-delete ppin;
-#else
 try {
   PInPersist pis(flnm);
@@ -1151,5 +1069,4 @@
   cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
 }
-#endif
 return;
 }
@@ -1193,11 +1110,4 @@
 bool ok = true;
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveObjects()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1207,5 +1117,4 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1262,11 +1171,4 @@
 
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1276,5 +1178,4 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1583,8 +1484,4 @@
 NObjMgrSync zs(0); zs.NOp(); 
 
-#ifdef SANS_EVOLPLANCK
-  cerr << " NamedObjMgr::DisplayVector() Error: Not implemented with PEIDA " << endl;
-#else
-
 if(!myImgApp) return; 
 
@@ -1651,5 +1548,4 @@
 return;
 
-#endif
 }
 
Index: /trunk/SophyaPI/PIext/nomgfdadapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nomgfdadapter.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/nomgfdadapter.cc	(revision 3572)
@@ -9,7 +9,5 @@
 #include "pipodrw.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
-#endif
 
 //-------------------------------------------------------------------------
@@ -53,11 +51,6 @@
 void NOMAdapter_GeneralFitData::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-string tag = nom;  // A cause de const
-mG->Write(pos,0,tag);
-#else
 ObjFileIO<GeneralFitData> fio(mG);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -113,9 +106,5 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitResidus(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitResidus(*mG,mfit));
-#endif
 return g;
 }
@@ -124,9 +113,5 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitFunction(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitFunction(*mG,mfit));
-#endif
 return g;
 }
Index: /trunk/SophyaPI/PIext/nomhistadapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nomhistadapter.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/nomhistadapter.cc	(revision 3572)
@@ -16,10 +16,8 @@
 #include "strutilxx.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
 // Pour les DataTable ( Depuis Avril 2005 )
 #include "datatable.h"
 #include "swppfdtable.h"
-#endif
 
 //-----------------------------------------------------------------------------
@@ -139,12 +137,6 @@
 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,9 +196,5 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitResidus(mfit); 
-#else
 h = new Histo(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h;
 }
@@ -215,9 +203,5 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitFunction(mfit); 
-#else
 h = new Histo(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h;
 }
@@ -316,12 +300,6 @@
 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,9 +367,5 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h2;
 }
@@ -400,9 +374,5 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h2;
 }
@@ -555,12 +525,6 @@
 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,13 +535,13 @@
 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,68 +574,4 @@
 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,13 +651,13 @@
 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);   
 }
Index: /trunk/SophyaPI/PIext/nomhistadapter.h
===================================================================
--- /trunk/SophyaPI/PIext/nomhistadapter.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/nomhistadapter.h	(revision 3572)
@@ -12,5 +12,4 @@
 #include "hisprof.h"
 #include "ntuple.h"
-#include "xntuple.h"
 #include "basedtable.h"
 
@@ -142,27 +141,4 @@
 };
 
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple 
-//-------------------------------------------------------------------------
-
-class NOMAdapter_XNTuple : public NObjMgrAdapter {
-public:
-				NOMAdapter_XNTuple(XNTuple* nt = NULL);
-  virtual			~NOMAdapter_XNTuple();
-
-  virtual NObjMgrAdapter*	Clone(AnyDataObj* o);
-
-  virtual string		GetDataObjType();
-
-  virtual AnyDataObj*		CloneDataObj(bool share=false);
-
-  virtual void			SavePPF(POutPersist& s, string const & nom);
-
-  virtual void			Print(ostream& os, int lev=0);
-  virtual NTupleInterface*	GetNTupleInterface(bool& adel);
-
-protected:
-  XNTuple* mNt;
-};
 
 //-------------------------------------------------------------------------
Index: /trunk/SophyaPI/PIext/nomimagadapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nomimagadapter.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/nomimagadapter.cc	(revision 3572)
@@ -11,9 +11,5 @@
 #include "pimgadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"
-#else
 #include "objfitter.h"
-#endif
 
 
@@ -62,11 +58,5 @@
 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,12 +66,6 @@
 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,12 +131,6 @@
 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,13 +138,7 @@
 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,8 +208,4 @@
 #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,9 +218,5 @@
 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
-
-
+
+
Index: unk/SophyaPI/PIext/nommatvecadapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nommatvecadapter.cc	(revision 3571)
+++ 	(revision )
@@ -1,337 +1,0 @@
-#include "sopnamsp.h"
-#include "machdefs.h"
-#include <stdlib.h>
-#include <typeinfo>
-#include <iostream>
-#include <string>
-
-#include "nommatvecadapter.h"
-#include "piyfxdrw.h"
-#include "pipodrw.h"
-
-//---------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Vector 
-//---------------------------------------------------------------
-
-/* --Methode-- */
-NOMAdapter_Vector::NOMAdapter_Vector(Vector* o)
-  : NObjMgrAdapter(o)
-{
-mVec = o;
-}
-
-/* --Methode-- */
-NOMAdapter_Vector::~NOMAdapter_Vector()
-{
-}
-
-/* --Methode-- */
-NObjMgrAdapter* NOMAdapter_Vector::Clone(AnyDataObj* o)
-{
-Vector* v = dynamic_cast<Vector *>(o);
-if (v) return ( new NOMAdapter_Vector(v) );
-return ( new NObjMgrAdapter(o) );
-}
-
-/* --Methode-- */
-string NOMAdapter_Vector::GetDataObjType()
-{
-  return("Vector ");
-}
-
-/* --Methode-- */
-AnyDataObj* NOMAdapter_Vector::CloneDataObj(bool /*share*/)
-{
-return ( new Vector(*mVec) );
-}
-
-
-/* --Methode-- */
-void NOMAdapter_Vector::SavePPF(POutPersist& pos, string const & nom)
-{
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mVec->Write(pos,0,tag);
-#else
-string s = typeid(*mObj).name();
-cout << "NOMAdapter_Vector::SavePPF() - Error : Not supported for " << s << endl;
-#endif
-}
-
-/* --Methode-- */
-void NOMAdapter_Vector::Print(ostream& os, int)
-{
-os << (*mVec);
-}
-
-/* --Methode-- */
-PIDrawer* NOMAdapter_Vector::GetDrawer(string & dopt)
-{
-dopt = "thinline " + dopt;
-return( new PIYfXDrawer( new POVectorAdapter(mVec, false), NULL, true) );
-}
-
-/* --Methode-- */
-NTupleInterface* NOMAdapter_Vector::GetNTupleInterface(bool& adel)
-{
-adel = true;
-return( new NTupInt_Vector(mVec) );
-}
-
-
-/* --Methode-- */
-GeneralFitData* NOMAdapter_Vector::GetGeneralFitData(bool& adel
- ,GeneralFitData::FitErrType errtype,double errscale,double errmin
- ,int i1,int i2,int j1,int j2)
-{
-adel = false;
-if(!mVec) return(NULL);
-
-int n = mVec->NElts();
-if(n<=0) return(NULL);
-
-i1 = (i1<0||i1>=n)? 0: i1;
-i2 = (i2<0||i2>=n||i2<i1)? n-1: i2;
-
-GeneralFitData* mGData = new GeneralFitData(1,i2-i1+1,0);
-adel = true;
-
-for(int i=i1;i<=i2;i++) {
-  double x = (double) i;
-  double f = (*mVec)(i);
-  double e = 1.;
-  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
-  mGData->AddData1(x,f,e);
-}
-
-return mGData;
-}
-
-AnyDataObj* NOMAdapter_Vector::FitResidusObj(GeneralFit& mfit)
-{
-Vector* v = NULL;
-v = mVec->FitResidus(mfit); 
-return v;
-}
-
-AnyDataObj* NOMAdapter_Vector::FitFunctionObj(GeneralFit& mfit)
-{
-Vector* v = NULL;
-v = mVec->FitFunction(mfit); 
-return v;
-}
-
-// -------------------------------------------------------------
-
-/* --Methode-- */
-NTupInt_Vector::NTupInt_Vector(Vector* v)
-{
-mVec = v;
-}
-
-/* --Methode-- */
-NTupInt_Vector::~NTupInt_Vector()
-{
-}
-
-/* --Methode-- */
-sa_size_t NTupInt_Vector::NbLines() const
-{
-return(mVec->NElts());
-}
-
-/* --Methode-- */
-sa_size_t NTupInt_Vector::NbColumns() const 
-{
-return(2);
-}
-
-/* --Methode-- */
-r_8* NTupInt_Vector::GetLineD(sa_size_t n) const 
-{
-int i;
-if ((n < 0) || (n >= mVec->NElts() )) 
-    for(i=0; i<2; i++)  mRet[i] = 0.;
-else { 
-  mRet[0] = n;  mRet[1] = (*mVec)(n);
-  }
-return(mRet);
-}
-
-/* --Methode-- */
-string NTupInt_Vector::VarList_C(const char* nx) const 
-{
-string nomx;
-if (nx) nomx = nx;
-else nomx = "_xh_";
-string vardec = "double i,val; \n";
-vardec += "i = " + nomx + "[0];  val = " + nomx + "[1]; \n";
-return(vardec);
-}
-
-
-//---------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Matrix 
-//---------------------------------------------------------------
-
-
-/* --Methode-- */
-NOMAdapter_Matrix::NOMAdapter_Matrix(Matrix* o)
-  : NObjMgrAdapter(o)
-{
-mMtx = o;
-}
-
-/* --Methode-- */
-NOMAdapter_Matrix::~NOMAdapter_Matrix()
-{
-}
-
-/* --Methode-- */
-NObjMgrAdapter* NOMAdapter_Matrix::Clone(AnyDataObj* o)
-{
-Matrix* m = dynamic_cast<Matrix *>(o);
-if (m) return ( new NOMAdapter_Matrix(m) );
-return ( new NObjMgrAdapter(o) );
-}
-
-/* --Methode-- */
-string NOMAdapter_Matrix::GetDataObjType()
-{
-  return("Matrix ");
-}
-
-/* --Methode-- */
-AnyDataObj* NOMAdapter_Matrix::CloneDataObj(bool /*share*/)
-{
-return ( new Matrix(*mMtx) );
-}
-
-/* --Methode-- */
-void NOMAdapter_Matrix::SavePPF(POutPersist& pos, string const & nom)
-{
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mMtx->Write(pos,0,tag);
-#else
-string s = typeid(*mObj).name();
-cout << "NOMAdapter_Matrix::SavePPF() - Error : Not supported for " << s << endl;
-#endif
-}
-
-/* --Methode-- */
-void NOMAdapter_Matrix::Print(ostream& os, int)
-{
-os << (*mMtx);
-}
-
-
-/* --Methode-- */
-P2DArrayAdapter* NOMAdapter_Matrix::Get2DArray(string &)
-{
-return ( new POMatrixAdapter(mMtx, false) );
-}
-
-/* --Methode-- */
-NTupleInterface* NOMAdapter_Matrix::GetNTupleInterface(bool& adel)
-{
-adel = true;
-return( new NTupInt_Matrix(mMtx) );
-}
-
-/* --Methode-- */
-GeneralFitData* NOMAdapter_Matrix::GetGeneralFitData(bool& adel
- ,GeneralFitData::FitErrType errtype,double errscale,double errmin
- ,int i1,int i2,int j1,int j2)
-{
-adel = false;
-if(!mMtx) return(NULL);
-
-int nx = mMtx->NRows();
-int ny = mMtx->NCol();
-if(nx<=0 || ny<=0) return(NULL);
-
-i1 = (i1<0||i1>=nx)? 0: i1;
-i2 = (i2<0||i2>=nx||i2<i1)? nx-1: i2;
-j1 = (j1<0||j1>=ny)? 0: j1;
-j2 = (j2<0||j2>=ny||j2<j1)? ny-1: j2;
-
-GeneralFitData* mGData = new GeneralFitData(2,(i2-i1+1)*(j2-j1+1),0);
-adel = true;
-
-for(int i=i1;i<=i2;i++) for(int j=j1;j<=j2;j++) {
-  double x = (double) i;
-  double y = (double) j;
-  double f = (*mMtx)(i,j);
-  double e = 1.;
-  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
-  mGData->AddData2(x,y,f,e);
-}
-
-return mGData;
-}
-
-AnyDataObj* NOMAdapter_Matrix::FitResidusObj(GeneralFit& mfit)
-{
-Matrix* m = NULL;
-m = mMtx->FitResidus(mfit); 
-return m;
-}
-
-AnyDataObj* NOMAdapter_Matrix::FitFunctionObj(GeneralFit& mfit)
-{
-Matrix* m = NULL;
-m = mMtx->FitFunction(mfit); 
-return m;
-}
-
-// -------------------------------------------------------------
-
-/* --Methode-- */
-NTupInt_Matrix::NTupInt_Matrix(Matrix* m)
-{
-mMtx = m;
-}
-
-/* --Methode-- */
-NTupInt_Matrix::~NTupInt_Matrix()
-{
-}
-
-/* --Methode-- */
-sa_size_t  NTupInt_Matrix::NbLines() const
-{
-return( mMtx->NRows()*mMtx->NCol() );
-}
-
-/* --Methode-- */
-sa_size_t  NTupInt_Matrix::NbColumns() const 
-{
-return(3);
-}
-
-/* --Methode-- */
-r_8* NTupInt_Matrix::GetLineD(sa_size_t  n) const 
-{
-int i,j;
-if ((n < 0) || (n >= mMtx->NRows()*mMtx->NCol() )) 
-    for(i=0; i<3; i++)  mRet[i] = 0.;
-else { 
-  i = n/mMtx->NCol(); j = n%mMtx->NCol(); 
-  mRet[0] = i;  mRet[1] = j;  mRet[2] = (*mMtx)(i,j);
-  }
-return(mRet);
-}
-
-/* --Methode-- */
-string NTupInt_Matrix::VarList_C(const char* nx) const 
-{
-string nomx;
-if (nx) nomx = nx;
-else nomx = "_xh_";
-string vardec = "double i,j,val; \n";
-vardec += "i = " + nomx + "[0]; j = " + nomx + "[1];  val = " + nomx + "[2]; \n";
-return(vardec);
-}
Index: unk/SophyaPI/PIext/nommatvecadapter.h
===================================================================
--- /trunk/SophyaPI/PIext/nommatvecadapter.h	(revision 3571)
+++ 	(revision )
@@ -1,116 +1,0 @@
-// This may look like C code, but it is really -*- C++ -*-
-// Adaptateur d objets (pour NamedObjMgr) pour Histos/NTuple
-//                                    Reza 05/99
-//  LAL-IN2P3/CNRS               CEA-DAPNIA     
- 
-#ifndef NOMMATVECADAPTER_H_SEEN
-#define NOMMATVECADAPTER_H_SEEN
-
-#include "nomgadapter.h"
-#include "generalfit.h"
-
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
-#include "tmatrix.h"
-#include "tvector.h"
-#endif
-
-//---------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Vector 
-//---------------------------------------------------------------
-
-class NOMAdapter_Vector : public NObjMgrAdapter {
-public:
-				NOMAdapter_Vector(Vector* v = NULL);
-  virtual			~NOMAdapter_Vector();
-
-  virtual NObjMgrAdapter*	Clone(AnyDataObj* o);
-
-  virtual string		GetDataObjType();
-
-  virtual AnyDataObj*		CloneDataObj(bool share=false);
-
-  virtual void			SavePPF(POutPersist& s, string const & nom);
-
-  virtual void			Print(ostream& os, int lev=0);
-  virtual PIDrawer*		GetDrawer(string& dopt);
-  virtual NTupleInterface*	GetNTupleInterface(bool& adel);
-
-  virtual GeneralFitData* GetGeneralFitData(bool& adel
-          ,GeneralFitData::FitErrType errtype=GeneralFitData::DefaultError
-          ,double errscale=1.,double errmin=0.
-          ,int i1=0,int i2=-1,int j1=0,int j2=-1);
-  virtual AnyDataObj* FitResidusObj(GeneralFit& mfit);
-  virtual AnyDataObj* FitFunctionObj(GeneralFit& mfit);
-
-protected:
-  Vector* mVec;
-};
-
-// Class Interface NTuple pour Vector
-class NTupInt_Vector : public NTupleInterface {
-public:
-			NTupInt_Vector(Vector* v);
-  virtual		~NTupInt_Vector();
-  virtual sa_size_t     NbLines() const ;
-  virtual sa_size_t     NbColumns() const ;
-  virtual r_8 *         GetLineD(sa_size_t n) const ;
-  virtual string        VarList_C(const char* nomx=NULL) const ;
-protected:
-  Vector* mVec;
-  mutable r_8 mRet[2];
-};
-
-
-
-//---------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Matrix 
-//---------------------------------------------------------------
-
-class NOMAdapter_Matrix : public NObjMgrAdapter {
-public:
-				NOMAdapter_Matrix(Matrix* m = NULL);
-  virtual			~NOMAdapter_Matrix();
-
-  virtual NObjMgrAdapter*	Clone(AnyDataObj* o);
-
-  virtual string		GetDataObjType();
-
-  virtual AnyDataObj*		CloneDataObj(bool share=false);
-
-  virtual void			SavePPF(POutPersist& s, string const & nom);
-
-  virtual void			Print(ostream& os, int lev=0);
-  virtual P2DArrayAdapter*	Get2DArray(string& dopt);
-  virtual NTupleInterface*	GetNTupleInterface(bool& adel);
-
-  virtual GeneralFitData* GetGeneralFitData(bool& adel
-          ,GeneralFitData::FitErrType errtype=GeneralFitData::DefaultError
-          ,double errscale=1.,double errmin=0.
-          ,int i1=0,int i2=-1,int j1=0,int j2=-1);
-  virtual AnyDataObj* FitResidusObj(GeneralFit& mfit);
-  virtual AnyDataObj* FitFunctionObj(GeneralFit& mfit);
-
-protected:
-  Matrix* mMtx;
-};
-
-// Class Interface NTuple pour Matrix
-
-class NTupInt_Matrix : public NTupleInterface {
-public:
-			NTupInt_Matrix(Matrix* m);
-  virtual		~NTupInt_Matrix();
-  virtual sa_size_t     NbLines() const ;
-  virtual sa_size_t     NbColumns() const ;
-  virtual r_8 *         GetLineD(sa_size_t n) const ;
-  virtual string        VarList_C(const char* nomx=NULL) const ;
-protected:
-  Matrix* mMtx;
-  mutable r_8 mRet[3];
-};
-
-
-#endif
Index: unk/SophyaPI/PIext/nomstladapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nomstladapter.cc	(revision 3571)
+++ 	(revision )
@@ -1,138 +1,0 @@
-#include "sopnamsp.h"
-#include "machdefs.h"
-#include <stdlib.h>
-#include <typeinfo>
-#include <iostream>
-#include <string>
-
-#include "nomstladapter.h"
-#include "stlist.h"
-#include "pistlist.h"
-
-
-
-
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet StarList
-//-------------------------------------------------------------------------
-
-/* --Methode-- */
-NOMAdapter_StarList::NOMAdapter_StarList(StarList* o)
-  : NObjMgrAdapter(o)
-{
-mStl = o;
-}
-
-/* --Methode-- */
-NOMAdapter_StarList::~NOMAdapter_StarList()
-{
-}
-
-/* --Methode-- */
-NObjMgrAdapter* NOMAdapter_StarList::Clone(AnyDataObj* o)
-{
-StarList* stl = dynamic_cast<StarList *>(o);
-if (stl) return ( new NOMAdapter_StarList(stl) );
-return ( new NObjMgrAdapter(o) );
-}
-
-
-/* --Methode-- */
-void NOMAdapter_StarList::SavePPF(POutPersist& pos, string const & nom)
-{
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'objet est lui-meme PPersist
-string tag = nom;  // A cause de const
-mStl->Write(pos,0,tag);
-#else
-string s = typeid(*mStl).name();
-cout << "NOMAdapter_StarList::SavePPF() - Error : Not supported for " << s << endl;
-#endif
-}
-
-/* --Methode-- */
-void NOMAdapter_StarList::Print(ostream& os, int)
-{
-os << (*mStl);
-}
-
-/* --Methode-- */
-PIDrawer* NOMAdapter_StarList::GetDrawer(string & dopt)
-{
-return(new PIStarList(mStl, false));
-}
-
-
-/* --Methode-- */
-NTupleInterface* NOMAdapter_StarList::GetNTupleInterface(bool& adel)
-{
-adel = true;
-return( new NTupInt_StarList(mStl) );
-}
-
-
-// -------------------------------------------------------------
-
-/* --Methode-- */
-NTupInt_StarList::NTupInt_StarList(StarList* stl)
-{
-mStl = stl;
-}
-
-/* --Methode-- */
-NTupInt_StarList::~NTupInt_StarList()
-{
-}
-
-/* --Methode-- */
-uint_4 NTupInt_StarList::NbLines() const
-{
-return(mStl->NbStars());
-}
-
-/* --Methode-- */
-uint_4 NTupInt_StarList::NbColumns() const 
-{
-return(11);
-}
-
-/* --Methode-- */
-r_8* NTupInt_StarList::GetLineD(int n) const 
-{
-BStar* bst = mStl->Star(n);
-if (bst == NULL)  
-  for(int k=0; k<11; k++)  mRet[k] = -9999.0;
-else {
-  mRet[0] = bst->PosX();
-  mRet[1] = bst->PosY();
-  mRet[2] = bst->Flux();
-  mRet[3] = bst->Fond();
-  mRet[4] = bst->PixMax();
-  mRet[5] = bst->PosXRef();
-  mRet[6] = bst->PosYRef();
-  mRet[7] = bst->FluxRef();
-  mRet[8] = bst->FondRef();
-  mRet[9] = bst->PixMaxRef();
-  mRet[10] = bst->Flags();
-  }
-return(mRet);
-}
-
-/* --Methode-- */
-string NTupInt_StarList::VarList_C(const char* nx) const 
-{
-string nomx;
-if (nx) nomx = nx;
-else nomx = "_xstl_";
-string vardec = "double x,y,flux,fond,pixmax; \n";
-vardec += "double xref,yref,fluxref,fondref,pixmaxref; \n";
-vardec += "double flags; \n"; 
-vardec += "x = " + nomx + "[0];  y = " + nomx + "[1]; \n";
-vardec += "flux = " + nomx + "[2];  fond = " + nomx + "[3]; \n";
-vardec += "pixmax = " + nomx + "[4]; \n";
-vardec += "xref = " + nomx + "[5];  yref = " + nomx + "[6]; \n";
-vardec += "fluxref = " + nomx + "[7];  fondref = " + nomx + "[8]; \n";
-vardec += "pixmaxref = " + nomx + "[9]; \n";
-vardec += "flags = " + nomx + "[10]; \n";
-return(vardec);
-}
Index: unk/SophyaPI/PIext/nomstladapter.h
===================================================================
--- /trunk/SophyaPI/PIext/nomstladapter.h	(revision 3571)
+++ 	(revision )
@@ -1,51 +1,0 @@
-// This may look like C code, but it is really -*- C++ -*-
-// Adaptateur d objets (pour NamedObjMgr) pour Histos/NTuple
-//                                    Reza 05/99
-//  LAL-IN2P3/CNRS               CEA-DAPNIA     
- 
-#ifndef NOMSTLISTADAPTER_H_SEEN
-#define NOMSTLISTADAPTER_H_SEEN
-
-#include "nomgadapter.h"
-#include "stlist.h"
-
-
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet StarList 
-//-------------------------------------------------------------------------
-
-class NOMAdapter_StarList : public NObjMgrAdapter {
-public:
-				NOMAdapter_StarList(StarList* stl = NULL);
-  virtual			~NOMAdapter_StarList();
-
-  virtual NObjMgrAdapter*	Clone(AnyDataObj* o);
-
-  //  virtual void			ReadFits(string const & flnm);
-  //  virtual void			SaveFits(string const & flnm);
-  virtual void			SavePPF(POutPersist& s, string const & nom);
-
-  virtual void			Print(ostream& os, int lev=0);
-  virtual PIDrawer*		GetDrawer(string& dopt);
-  virtual NTupleInterface*	GetNTupleInterface(bool& adel);
-
-protected:
-  StarList* mStl;
-};
-
-// Class Interface NTuple pour StarList 
-class NTupInt_StarList : public NTupleInterface {
-public:
-			NTupInt_StarList(StarList* stl);
-  virtual		~NTupInt_StarList();
-  virtual uint_4        NbLines() const ;
-  virtual uint_4        NbColumns() const ;
-  virtual r_8 *         GetLineD(int n) const ;
-  virtual string        VarList_C(const char* nomx=NULL) const ;
-protected:
-  StarList* mStl;
-  mutable r_8 mRet[12];
-};
-
-
-#endif
Index: /trunk/SophyaPI/PIext/nomtarradapter.cc
===================================================================
--- /trunk/SophyaPI/PIext/nomtarradapter.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/nomtarradapter.cc	(revision 3572)
@@ -193,4 +193,6 @@
     return 1; 
   }
+
+  return 0;
 }
 
Index: /trunk/SophyaPI/PIext/objlist.list
===================================================================
--- /trunk/SophyaPI/PIext/objlist.list	(revision 3571)
+++ /trunk/SophyaPI/PIext/objlist.list	(revision 3572)
@@ -22,6 +22,6 @@
 pigfd1.o
 pigfd2.o
+pihisto2d.o
 pihisto.o
-pihisto2d.o
 piinit.o
 pintup3d.o
Index: /trunk/SophyaPI/PIext/pawexecut.cc
===================================================================
--- /trunk/SophyaPI/PIext/pawexecut.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/pawexecut.cc	(revision 3572)
@@ -23,11 +23,6 @@
 #include "pihisto.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#include "matrix.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
-#endif
 
 /* Reza + cmv  13/10/99 */
@@ -421,13 +416,8 @@
 string ctyp = typeid(*mobj).name();
 
-#ifdef SANS_EVOLPLANCK
-if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Zero();}
-else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Zero();}
-#else
  if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; (*ob) = 0.; }
 // ob->DataBlock().Reset(0.);}
  else if(typeid(*mobj)==typeid(Matrix))   {Matrix*  ob=(Matrix*) mobj; (*ob) = 0.; }
 //ob->DataBlock().Reset(0.);}
-#endif
 else if(typeid(*mobj)==typeid(Histo))    {Histo* ob=(Histo*)  mobj; ob->Zero();}
 else if(typeid(*mobj)==typeid(HProf))    {HProf* ob=(HProf*)  mobj; ob->Zero();}
@@ -701,16 +691,8 @@
   }
 }   // fin du try
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); cout<<endl; cerr<<endl;
-  string es = PeidaExc(merr);
-  cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<merr<<es;
-} ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); cout<<endl; cerr<<endl;
   cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<exc.Msg()<<endl; 
 }
-#endif
 
 if(adel) delete objnt;
@@ -1380,9 +1362,6 @@
 r_8 norm=-1.;
 if(tokens.size()>=2) norm = atof(tokens[1].c_str());
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
+
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1390,9 +1369,5 @@
   return;}
 
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1507,9 +1482,5 @@
 if(tokens.size()>=2) deriv_option = atoi(tokens[1].c_str());
 
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1517,10 +1488,5 @@
   return;}
 
-
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1529,9 +1495,5 @@
 if(n<=1) return;
 
-#ifdef SANS_EVOLPLANCK
-Vector vsave(*v);
-#else
 TVector<r_8> vsave(*v,false);
-#endif
 
 if(deriv_option<0) {
@@ -1742,9 +1704,5 @@
   Vector* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Vector(*h1);
-#else
     h3 = new Vector(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1758,12 +1716,6 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Operations on Matrix
@@ -1781,9 +1733,5 @@
   Matrix* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Matrix(*h1);
-#else
     h3 = new Matrix(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1798,12 +1746,6 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Doesn't work for other objects
Index: /trunk/SophyaPI/PIext/piacmd.cc
===================================================================
--- /trunk/SophyaPI/PIext/piacmd.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/piacmd.cc	(revision 3572)
@@ -12,9 +12,5 @@
 #include "strutilxx.h"
 // #include "dlftypes.h"
-#ifdef SANS_EVOLPLANCK
-#include "nbrandom.h"
-#else
 #include "srandgen.h"
-#endif
 
 #include "pistdimgapp.h"
Index: /trunk/SophyaPI/PIext/piafitting.cc
===================================================================
--- /trunk/SophyaPI/PIext/piafitting.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/piafitting.cc	(revision 3572)
@@ -25,12 +25,7 @@
 #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,9 +37,5 @@
 #include "nomgfdadapter.h"
 #include "nomimagadapter.h"
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#else
 #include "nomtmatvecadapter.h"
-#endif
 
 ////////////////////////////////////////////////////////////////////
@@ -854,11 +845,6 @@
 
 // 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,9 +1204,5 @@
 , saveErrScale(1.),saveErrMin(0.), saveXC(0.), saveYC(0.)
 {
-#ifdef SANS_EVOLPLANCK
-COMPATIBLE_ASSERT(mFitter);
-#else
 ASSERT(mFitter);
-#endif
 
 int npar = mFitter->mNPar;
Index: /trunk/SophyaPI/PIext/piafitting.h
===================================================================
--- /trunk/SophyaPI/PIext/piafitting.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/piafitting.h	(revision 3572)
@@ -21,9 +21,4 @@
 class PIAFitterWind;
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-class GeneralFunction; class GeneralFunc; class GeneralFit;
-class GeneralFitData;
-#else
 #include "tvector.h"
 namespace SOPHYA { 
@@ -31,5 +26,4 @@
 class GeneralFitData;
 }
-#endif
 
 class PIAFitter : public CmdExecutor {
Index: /trunk/SophyaPI/PIext/piinit.cc
===================================================================
--- /trunk/SophyaPI/PIext/piinit.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/piinit.cc	(revision 3572)
@@ -11,9 +11,4 @@
 #include "nomimagadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#include "fitsimage.h"
-#include "nomstladapter.h"
-#else
 #include <complex>
 #include "nomtmatvecadapter.h"
@@ -35,14 +30,9 @@
 #include "piaversion.h"
 
-#endif
 
 int PIAppInitiator::FgInit = 0;
 
 PIAppInitiator::PIAppInitiator(PIStdImgApp * app)
-#ifdef SANS_EVOLPLANCK
- : PeidaStarRecoInitiator()
-#else
  : SambaInitiator()
-#endif
 {
   FgInit++;
@@ -63,14 +53,7 @@
   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,5 +88,4 @@
   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,18 +102,4 @@
   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,5 +127,4 @@
 
   SophyaInitiator::RegisterModule("PIext/piapp", PIAPP_VERSIONNUMBER);
-#endif  
 }
 
Index: /trunk/SophyaPI/PIext/piinit.h
===================================================================
--- /trunk/SophyaPI/PIext/piinit.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/piinit.h	(revision 3572)
@@ -12,9 +12,5 @@
 // Classe d initialisation pour le module PIext de PEIDA
 
-#ifdef SANS_EVOLPLANCK
-class PIAppInitiator : public PeidaStarRecoInitiator {
-#else
 class PIAppInitiator : public SambaInitiator {
-#endif
 private:
   static int FgInit;
Index: /trunk/SophyaPI/PIext/pimgadapter.h
===================================================================
--- /trunk/SophyaPI/PIext/pimgadapter.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/pimgadapter.h	(revision 3572)
@@ -5,20 +5,4 @@
 #include "parradapter.h"
 
-#ifdef SANS_EVOLPLANCK 
-class RzImageAdapter : public P2DArrayAdapter {
-public:
-                  RzImageAdapter(RzImage* rzi, bool ad=false) :
-                    P2DArrayAdapter(rzi->XSize(), rzi->YSize())
-                    { aDel = ad; mImg = rzi; 
-                    DefineXYCoordinates(rzi->XOrg(), rzi->YOrg(), 1., 1. ); }
-
-  virtual 	  ~RzImageAdapter() { if (aDel) delete mImg; }
-  virtual double  Value(int ix, int iy) { return mImg->FValue(ix, iy); }
-
-protected :
-  bool aDel;
-  RzImage* mImg;
-};
-#endif
 
 template <class T> 
Index: /trunk/SophyaPI/PIext/pipodrw.cc
===================================================================
--- /trunk/SophyaPI/PIext/pipodrw.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/pipodrw.cc	(revision 3572)
@@ -56,56 +56,3 @@
 
 
-#ifdef SANS_EVOLPLANCK
 
-// ----------------------------------------------------------
-// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
-// ----------------------------------------------------------
-
-/* --Methode-- */
-POVectorAdapter::POVectorAdapter(Vector* v, bool ad)
-        : P1DArrayAdapter(v->NElts())
-{
-aDel = ad; mVec = v;
-}
-
-/* --Methode-- */
-POVectorAdapter::~POVectorAdapter()
-{
-if (aDel) delete mVec;
-}
-
-/* --Methode-- */
-double POVectorAdapter::Value(int i)
-{ 
-return((*mVec)(i)); 
-}
-
-------- FIN SUPPRESSION */
-
-// ----------------------------------------------------------
-// Adaptateur de matrice Peida++ a P2DArrayAdapter
-// Attention  Y: Lignes (rows)  X: Colonnes
-// ----------------------------------------------------------
-
-/* --Methode-- */
-POMatrixAdapter::POMatrixAdapter(Matrix* mtx, bool ad)
-        : P2DArrayAdapter(mtx->NCol(), mtx->NRows())
-{
-aDel = ad; mMtx = mtx;
-}
-
-/* --Methode-- */
-POMatrixAdapter::~POMatrixAdapter()
-{
-if (aDel)  delete mMtx;
-}
-
-/* --Methode-- */
-double POMatrixAdapter::Value(int ix, int iy)
-{
-// Attention MatrixAdapter(X=Colonne, Y= Row) = Matrix(row, col)  
-return((*mMtx)(iy, ix));
-}
-
-#endif   // SANS_EVOLPLANCK
-
Index: /trunk/SophyaPI/PIext/pipodrw.h
===================================================================
--- /trunk/SophyaPI/PIext/pipodrw.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/pipodrw.h	(revision 3572)
@@ -13,9 +13,5 @@
 #include "hist2err.h"
 
-#ifdef SANS_EVOLPLANCK
-class GeneralFunction;
-#else
 namespace SOPHYA {class GeneralFunction;} 
-#endif
 
 class PIGFFDrawer : public PIDrawer {
@@ -34,35 +30,3 @@
 
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#include "matrix.h"
-
-// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
-class POVectorAdapter : public P1DArrayAdapter {
-public :
-                  POVectorAdapter(Vector* v, bool ad=false);
-  virtual         ~POVectorAdapter();
-  virtual double  Value(int i);
-
-protected:
-  bool aDel;
-  Vector* mVec;
-};
-
-// Adaptateur de matrice Peida++ a P2DArrayAdapter
-// Attention MatrixAdapter(X=Colonne, Y= Row) = Matrix(row, col)  
-class POMatrixAdapter :  public P2DArrayAdapter {
-public :
-                  POMatrixAdapter(Matrix* mtx, bool ad=false);
-  virtual         ~POMatrixAdapter();
-
-  virtual double  Value(int ix, int iy);   
-
-protected:
-  bool aDel;
-  Matrix* mMtx;
-};
-
-#endif   // SANS_EVOLPLANCK
-
 #endif
Index: /trunk/SophyaPI/PIext/pisiadw.cc
===================================================================
--- /trunk/SophyaPI/PIext/pisiadw.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/pisiadw.cc	(revision 3572)
@@ -244,11 +244,4 @@
 
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY {
-  mPin = new PInPersist(flnm);
-}  CATCH(merr) 
-  { printf("ObjMgrWind::SetFile Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-  ok = false; } ENDTRY;
-#else
 try {
   mPin = new PInPersist(flnm);
@@ -258,14 +251,9 @@
   ok = false;
   }
-#endif
 
 if (!ok) { mPin = NULL;  dap->SetReady(); return; }
 
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = mPin->NbTags();
-#else 
 nbtags = mPin->NbNameTags();
-#endif
 
 if (nbtags < 1) {
@@ -282,15 +270,4 @@
 objlist->SetBorderWidth(2);
 
-
-#ifdef SANS_EVOLPLANCK
-for(i=0; i<mPin->NbTags(); i++) {
-  key = mPin->TagKey(i, cid, ln);  // $CHECK$ non-const & reference initialized to temporary, car int -> long&
-  if (ln <= 0)  nom = "?";
-  else { strncpy(noms, mPin->TagName(i).c_str(), 31);  noms[31] = '\0'; nom = noms; }
-  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, dap->ObjMgr()->GetServiceObj()->PClassIdToClassName(cid), key);
-  //  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, " DataObject ?", key);  Attention SANS_EVOLPLANCK
-  objlist->AppendItem(strg, 5000+i);
-}
-#else
 string tn;
 for(i=0; i<mPin->NbNameTags(); i++) {
@@ -298,5 +275,4 @@
   objlist->AppendItem(tn.c_str(), 5000+i);
 }
-#endif
 
 }
Index: /trunk/SophyaPI/PIext/pistdimgapp.cc
===================================================================
--- /trunk/SophyaPI/PIext/pistdimgapp.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/pistdimgapp.cc	(revision 3572)
@@ -102,7 +102,5 @@
 m[0]->AppendItem("Open-Fits", 10120);
 m[0]->AppendItem("Open-PPF", 10130);
-#ifndef SANS_EVOLPLANCK
 m[0]->AppendItem("Open-ASCII", 10140);
-#endif
 // m[0]->AppendItem("Options", 10101);
 m[0]->AppendItem("Help", 10100);
@@ -316,15 +314,8 @@
 glst_piai = new PIAppInitiator(this);
 
-char buff[128];
 mCons->AddStr("  ............  starting piapp .............\n", PIVA_Blue );
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-mCons->AddStr(buff, PIVA_Blue );
-#else
 string svers;
 SophyaInitiator::GetVersion(svers);
 mCons->AddStr(svers.c_str(), PIVA_Blue );
-#endif
 mCons->AddStr("  ..........................................\n", PIVA_Blue );
 // PrintPeidaVersion();
@@ -539,9 +530,5 @@
 if  ((GetState()) && (msg != mFCMsg)) { PIBeep(); return; }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-#else
-  try {
-#endif
+try {
 
 //   Messages active-window
@@ -628,15 +615,4 @@
   mCons->AddChar('\n', PIVA_Def, true);
   SetBusy();
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    mCmd->Interpret(s);
-    }  CATCH(merr) { 
-    fflush(stdout); 
-    cout << endl; 
-    cerr << endl;
-    string es = PeidaExc(merr);
-    cerr << "PIStdImgApp::Process()/ Cmd->Do() Exception :" << es << " (" << merr << ")" << endl ;
-    }
-#else
   try {
     //    mCmd->Interpret(s);
@@ -655,5 +631,4 @@
   }
 
-#endif
   SetReady();
   }
@@ -662,14 +637,4 @@
             (int)tmsg,(int)msg,(int)smm);
 
-#ifdef SANS_EVOLPLANCK
-}  CATCH(merr) { 
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "PIStdImgApp::Process()/  Exception :" << es << " (" << merr << ")" << endl ;
-  SetReady();
-  }
-#else
   }
   catch ( PThrowable & exc ) {
@@ -690,5 +655,4 @@
   }
 
-#endif
 
 return;
@@ -1781,10 +1745,6 @@
 void PIStdImgApp::CatchSignals(bool fgfpe, bool fgsegv)
 {    
-#ifdef SANS_EVOLPLANCK
-PeidaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#else
 // On active aussi SIGUSR1 pour stopthr
 SophyaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#endif
 m[5]->SetStateMsg(10603, fgfpe);
 m[5]->SetStateMsg(10604, fgsegv);
@@ -1953,5 +1913,4 @@
       break;
         
-#ifndef SANS_EVOLPLANCK
     case 10140 :
       pfc_ascii->AcceptNewFile(false);
@@ -1988,5 +1947,4 @@
       SetReady();
       break;
-#endif
 
     case 10105:
@@ -2396,9 +2354,5 @@
 string info = "piapp : Interactive analysis program\n";
 char buff[128];
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-info += buff;
-#else
+
 string svers;
 SophyaInitiator::GetVersion(svers);
@@ -2407,10 +2361,9 @@
 	(double)PIAPP_VERSIONNUMBER);
 info += buff; 
-#endif
-info += "(C) LAL-IN2P3/CNRS  1996-2006\n";
-info += "(C) SPP-DAPNIA/CEA 1996-2006\n";
-#ifndef SANS_EVOLPLANCK
- info += "Check http://www.sophya.org for more information";
-#endif
+
+info += "(C) LAL-IN2P3/CNRS  1996-2009\n";
+info += "(C) SPP-DAPNIA/CEA 1996-2009\n";
+info += "Check http://www.sophya.org for more information";
+
 infow_txt->SetText(info);
 }
Index: /trunk/SophyaPI/PIext/servnobjm.cc
===================================================================
--- /trunk/SophyaPI/PIext/servnobjm.cc	(revision 3571)
+++ /trunk/SophyaPI/PIext/servnobjm.cc	(revision 3572)
@@ -20,13 +20,8 @@
 #include "fct2dfit.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
 #include "matharr.h"
 #include "pitvmaad.h"
-#endif
 
 #include "ntuple.h"
@@ -70,10 +65,7 @@
 ObjAdaptList::iterator it;
 for(it = objadaplist.begin(); it != objadaplist.end(); it++) 
-#ifdef SANS_EVOLPLANCK
-    if (typeid(*o) == typeid(*((*it).obj)))  THROW(dupIdErr);
-#else
-    if (typeid(*o) == typeid(*((*it).obj)))  
+  if (typeid(*o) == typeid(*((*it).obj)))  
      throw(DuplicateIdExc("Services2NObjMgr::RegisterClass() - Duplicate class"));
-#endif
+
 dataobj_adapter oba;
 oba.obj = o;
@@ -215,15 +207,4 @@
   for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
 } 
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc()  Exception :" << merr << es;
-  delete vpy;
-  vpy = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -234,5 +215,4 @@
   vpy = NULL;
 }
-#endif
 
 if (vpy) {
@@ -286,14 +266,4 @@
   }
 }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc2D()  Exception :" << merr << es;
-  delete mtx;  mtx = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -303,5 +273,4 @@
   delete mtx;  mtx = NULL;
 }
-#endif
 
 if (mtx) {
@@ -348,10 +317,5 @@
  DVList::ValList::const_iterator it;
  for(it = varlist.Begin(); it != varlist.End(); it++) {
-#ifdef SANS_EVOLPLANCK
-   MuTyV mtv = (*it).second;
-   double value = (double)(mtv);
-#else
    double value = (double)((*it).second.elval);
-#endif
    string name_var = (*it).first;
    fprintf(fip,"double %s = %.17f;\n",name_var.c_str(),value);
@@ -408,5 +372,5 @@
 
 // Creation NTuple 
-char* ntn[4] = {"expx","expy","expex","expey",};
+const char* ntn[4] = {"expx","expy","expex","expey",};
 NTuple* nt = NULL;
 bool haserr = false;
@@ -447,5 +411,5 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expz"};
+const char* ntn[3] = {"expx","expy","expz"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -486,5 +450,5 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expw"};
+const char* ntn[3] = {"expx","expy","expw"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -520,5 +484,5 @@
 if (!mImgapp)  return; 
 
-char* ntn[4] = {"expx","expy","expz","expw"};
+const char* ntn[4] = {"expx","expy","expz","expw"};
 NTuple* nt = new NTuple(4,ntn);  // Creation NTuple
 
@@ -571,5 +535,5 @@
   // Pas de remise a zero ! h1->Zero();
 } else {
-  char* ntn[2]= {"hxval", "hwt"};
+  const char* ntn[2]= {"hxval", "hwt"};
   nt = new NTuple(2,ntn);  // Creation NTuple 
 }
@@ -624,5 +588,5 @@
   // Pas de remise a zero ! h2->Zero();
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -688,5 +652,5 @@
   hp_already_exist = true;
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -741,5 +705,5 @@
   }
 
-char* ntn[2]= {"vi", "vv"};
+const char* ntn[2]= {"vi", "vv"};
 NTuple* nt = new NTuple(2,ntn);  // Creation NTuple 
 
@@ -790,5 +754,5 @@
   }
 
-char* ntn[3]= {"mi", "mj", "mv"};
+const char* ntn[3]= {"mi", "mj", "mv"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple 
 
@@ -836,5 +800,5 @@
 // if (nomvec.length() < 1) nomvec = "/tmp/expvec";
 
-char* ntn[2]= {"vecval", "vecwt"};
+const char* ntn[2]= {"vecval", "vecwt"};
 nt = new NTuple(1,ntn);  // Creation NTuple
  
@@ -933,5 +897,5 @@
   }  
 if (nt == NULL) {
-  char* ntn[4]= {"x", "y","z","t"};
+  const char* ntn[4]= {"x", "y","z","t"};
   nt = new NTuple(4,ntn);  // Creation NTuple 
   fgnnt = true;
@@ -987,5 +951,5 @@
     }  
   if (nt == NULL) {
-    char* ntn[4]= {"x", "y","z","t"};
+    const char* ntn[4]= {"x", "y","z","t"};
     nt = new NTuple(4,ntn);  // Creation NTuple 
     fgnnt = true;
@@ -1016,13 +980,4 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1031,5 +986,4 @@
   cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
@@ -1154,5 +1108,5 @@
 
 // Creation NTuple Buffer
-char* ntn[4]= {"x","y","f","e"};
+const char* ntn[4]= {"x","y","f","e"};
 NTuple*nt = new NTuple(4,ntn);
 
@@ -1301,13 +1255,4 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1316,5 +1261,4 @@
   cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire
@@ -1473,80 +1417,6 @@
 
 
-
-
-// SANS_EVOLPLANCK     Attention !
-#ifdef SANS_EVOLPLANCK
-#include "pclassids.h"
-
-/* --Methode-- */
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-switch (cid) {
-  case ClassId_Poly1 : 
-    return("Poly1");
-  case ClassId_Poly2 : 
-    return("Poly2");
-  case ClassId_Matrix : 
-    return("Matrix");
-  case ClassId_Vector : 
-    return("Vector");
-
-  case ClassId_DVList : 
-    return("DVList");
-
-  case ClassId_Histo1D : 
-    return("Histo1D");
-  case ClassId_Histo2D : 
-    return("Histo2D");
-  case ClassId_HProf : 
-    return("HProf");
-  case ClassId_HistoErr : 
-    return("HistoErr");
-  case ClassId_NTuple : 
-    return("NTuple");
-  case ClassId_XNTuple : 
-    return("XNTuple");
-  case ClassId_GeneralFitData : 
-    return("GeneralFitData");
-
-  case ClassId_Image : 
-    return("RzImage");
-  case ClassId_Image + kuint_1 : 
-    return("ImageU1");
-  case ClassId_Image + kint_1 : 
-    return("ImageI1");
-  case ClassId_Image + kuint_2 : 
-    return("ImageU2");
-  case ClassId_Image + kint_2 : 
-    return("ImageI2");
-  case ClassId_Image + kuint_4 : 
-    return("ImageU4");
-  case ClassId_Image + kint_4 : 
-    return("ImageI4");
-  case ClassId_Image + kr_4 : 
-    return("ImageR4");
-  case ClassId_Image + kr_8 : 
-    return("ImageR8");
-  case ClassId_ZFidu : 
-    return("ZFidu");
-
-  case ClassId_StarList : 
-    return("StarList");
-  case ClassId_Transfo : 
-    return("Transfo");
-  case ClassId_PSF : 
-    return("PSF");
-
-
-// - Ajout objet PPF
-  default:
+const char* Services2NObjMgr::PClassIdToClassName(int cid)
+{
     return("AnyDataObj");
-  }
-}  
-
-#else
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-    return("AnyDataObj");
-}
-#endif
+}
Index: /trunk/SophyaPI/PIext/servnobjm.h
===================================================================
--- /trunk/SophyaPI/PIext/servnobjm.h	(revision 3571)
+++ /trunk/SophyaPI/PIext/servnobjm.h	(revision 3572)
@@ -20,10 +20,4 @@
 #include "zthread.h"
 
-#ifdef SANS_EVOLPLANCK
-class NTuple;
-class Histo;
-class Histo2D;
-class HProf;
-#else
 namespace SOPHYA { 
 class NTuple;
@@ -32,5 +26,4 @@
 class HProf;
 }
-#endif
 
 class PIStdImgApp;
@@ -127,5 +120,5 @@
   static void   DecodeLoopParameters(string& loop, int_8& i1, int_8& i2, int_8& di);
   string 	FileName2Name(string const & fn);
-  char* 	PClassIdToClassName(int cid);
+  const char* 	PClassIdToClassName(int cid);
 
 protected:
Index: /trunk/SophyaPI/PIext/smakefile
===================================================================
--- /trunk/SophyaPI/PIext/smakefile	(revision 3571)
+++ /trunk/SophyaPI/PIext/smakefile	(revision 3572)
@@ -4,5 +4,5 @@
  
 clean:
-	 rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomdvladapter.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomherradapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nommatvecadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomstladapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
+	 rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomdvladapter.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomherradapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
 	rm -f $(SOPHYALIBP)libPIext.a
  
@@ -42,4 +42,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -163,4 +164,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -278,4 +280,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -388,4 +391,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -474,4 +478,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -582,4 +587,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -690,4 +696,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -800,4 +807,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -861,4 +869,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -921,4 +930,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -990,4 +1000,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1087,4 +1098,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1131,5 +1143,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -1196,4 +1207,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1265,4 +1277,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1348,4 +1361,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1413,4 +1427,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1511,4 +1526,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1594,4 +1610,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1701,4 +1718,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -1798,4 +1816,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -1938,4 +1957,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2003,5 +2023,4 @@
   $(SOPHYAINCP)pitherm.h \
   $(SOPHYAINCP)resusage.h nomhistadapter.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2046,4 +2065,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2098,4 +2118,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2125,4 +2146,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2154,4 +2176,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2212,4 +2235,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2309,5 +2333,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2358,4 +2381,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2386,4 +2410,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2412,4 +2437,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2479,4 +2505,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2592,4 +2619,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2673,4 +2701,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)lut.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)tmatrix.h \
   $(SOPHYAINCP)tarray.h \
@@ -2721,4 +2750,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
Index: /trunk/SophyaPI/ProgPI/Makefile
===================================================================
--- /trunk/SophyaPI/ProgPI/Makefile	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/Makefile	(revision 3572)
@@ -43,4 +43,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -85,17 +86,18 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pifilechox.h \
   $(SOPHYAINCP)pifilechogen.h \
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)pieldrw.h \
@@ -124,5 +126,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -155,11 +156,21 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -177,12 +188,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -235,11 +238,21 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -257,12 +270,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -311,7 +316,5 @@
   $(SOPHYAINCP)ntoolsinit.h \
   $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h
+  $(SOPHYAINCP)sophyainit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
  
@@ -348,11 +351,21 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -370,12 +383,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -438,6 +443,6 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -477,11 +482,21 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -499,12 +514,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -597,11 +604,21 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -619,12 +636,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
Index: /trunk/SophyaPI/ProgPI/makefile_wgrdl
===================================================================
--- /trunk/SophyaPI/ProgPI/makefile_wgrdl	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/makefile_wgrdl	(revision 3572)
@@ -294,5 +294,4 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)ntupintf.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
Index: /trunk/SophyaPI/ProgPI/piapp.cc
===================================================================
--- /trunk/SophyaPI/ProgPI/piapp.cc	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/piapp.cc	(revision 3572)
@@ -13,6 +13,4 @@
 #include "timing.h"
 #include "skyinit.h"
-
-#include "xntuple.h" // Pour faire le SetTmpDir()
 
 
@@ -177,5 +175,5 @@
 }
 
-char* tmpde = getenv("TMPDIR");
+const char* tmpde = getenv("TMPDIR");
 char  tmpdname[32];
 if (tmpde == NULL) tmpde = "./";
@@ -198,7 +196,6 @@
 }
 
-cout << "  NamedObjMgr::SetTmpDir()+XNTuple::SetSwapPath() " << tmpdir << endl;
+cout << "  NamedObjMgr::SetTmpDir() " << tmpdir << endl;
 app->ObjMgr()->SetTmpDir(tmpdir);
-XNTuple::SetSwapPath(const_cast<char *>(tmpdir.c_str()));
 
 // Gestion de redirection stdout/err et Signaux
Index: /trunk/SophyaPI/ProgPI/skymapmodule.cc
===================================================================
--- /trunk/SophyaPI/ProgPI/skymapmodule.cc	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/skymapmodule.cc	(revision 3572)
@@ -1410,5 +1410,5 @@
  
  const int ndim = 8;
- char *nament[ndim] =
+ const char *nament[ndim] =
    {"l","n","clmean","cllin","clpar","sclmean","scllin","sclpar"};
  NTuple clbin(ndim,nament);
Index: /trunk/SophyaPI/ProgPI/smakefile
===================================================================
--- /trunk/SophyaPI/ProgPI/smakefile	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/smakefile	(revision 3572)
@@ -43,4 +43,5 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -125,5 +126,4 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -156,4 +156,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -237,4 +238,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -314,7 +316,5 @@
   $(SOPHYAINCP)ntoolsinit.h \
   $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h
+  $(SOPHYAINCP)sophyainit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
  
@@ -351,4 +351,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -442,6 +443,6 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -481,4 +482,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -602,4 +604,5 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
Index: /trunk/SophyaPI/ProgPI/smakefile_wgrdl
===================================================================
--- /trunk/SophyaPI/ProgPI/smakefile_wgrdl	(revision 3571)
+++ /trunk/SophyaPI/ProgPI/smakefile_wgrdl	(revision 3572)
@@ -294,5 +294,4 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)ntupintf.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
Index: /trunk/SophyaProg/PMixer/skymixer.cc
===================================================================
--- /trunk/SophyaProg/PMixer/skymixer.cc	(revision 3571)
+++ /trunk/SophyaProg/PMixer/skymixer.cc	(revision 3572)
@@ -958,5 +958,5 @@
   // Cleaning the keywords 
 #define SZexlst 21
-  char *exlst[SZexlst]=
+  const char *exlst[SZexlst]=
   {"SIMPLE","BITPIX" ,"NAXIS" ,"NAXIS#" ,"PCOUNT","GCOUNT",
      "EXTEND","ORIGIN" ,"DATE*" ,"TFIELDS","TTYPE#","TFORM#",
@@ -994,5 +994,5 @@
   // Cleaning the keywords 
 #define SZexlst 21
-  char *exlst[SZexlst]=
+  const char *exlst[SZexlst]=
   {"SIMPLE","BITPIX" ,"NAXIS" ,"NAXIS#" ,"PCOUNT","GCOUNT",
      "EXTEND","ORIGIN" ,"DATE*" ,"TFIELDS","TTYPE#","TFORM#",
@@ -1028,5 +1028,5 @@
 void RadSpec2Nt(RadSpectra & rs, POutPersist & so, string name)
 {
-  char *ntn[2] = {"nu","fnu"};
+  const char *ntn[2] = {"nu","fnu"};
   NTuple nt(2,ntn);  // Creation NTuple (AVEC new )
   float xnt[2];
@@ -1050,5 +1050,5 @@
 void SpectralResponse2Nt(SpectralResponse& sr, POutPersist & so, string name)
 {
-  char *ntn[2] = {"nu","tnu"};
+  const char *ntn[2] = {"nu","tnu"};
   NTuple nt(2,ntn);  // Creation NTuple (AVEC new )
   float xnt[2];
Index: /trunk/SophyaProg/PrgMap/Makefile
===================================================================
--- /trunk/SophyaProg/PrgMap/Makefile	(revision 3571)
+++ /trunk/SophyaProg/PrgMap/Makefile	(revision 3572)
@@ -68,4 +68,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)skymap.h \
   $(SOPHYAINCP)spherethetaphi.h \
@@ -88,5 +89,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -301,4 +302,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)skymap.h \
   $(SOPHYAINCP)spherethetaphi.h \
@@ -321,5 +323,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -379,4 +381,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)skymap.h \
   $(SOPHYAINCP)spherethetaphi.h \
@@ -399,5 +402,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
Index: /trunk/SophyaProg/PrgMap/smakefile
===================================================================
--- /trunk/SophyaProg/PrgMap/smakefile	(revision 3571)
+++ /trunk/SophyaProg/PrgMap/smakefile	(revision 3572)
@@ -89,5 +89,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -323,5 +323,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -402,5 +402,5 @@
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
Index: /trunk/SophyaProg/PrgUtil/Makefile
===================================================================
--- /trunk/SophyaProg/PrgUtil/Makefile	(revision 3571)
+++ /trunk/SophyaProg/PrgUtil/Makefile	(revision 3572)
@@ -52,4 +52,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)sambainit.h \
   $(SOPHYAINCP)skymapinit.h \
Index: /trunk/SophyaProg/PrgUtil/scanfits.cc
===================================================================
--- /trunk/SophyaProg/PrgUtil/scanfits.cc	(revision 3571)
+++ /trunk/SophyaProg/PrgUtil/scanfits.cc	(revision 3572)
@@ -13,6 +13,4 @@
 #include "dvlist.h"
 #include "ntuple.h"
-#include "xntuple.h"
-#include "fitsxntuple.h"
 #include "fitsntuple.h"
 */
Index: /trunk/SophyaProg/Tests/Makefile
===================================================================
--- /trunk/SophyaProg/Tests/Makefile	(revision 3571)
+++ /trunk/SophyaProg/Tests/Makefile	(revision 3572)
@@ -228,4 +228,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -251,4 +252,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  arrt.cc
@@ -258,4 +260,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -281,4 +284,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  carrt.cc
@@ -287,4 +291,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -312,10 +317,10 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)intflapack.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lpk.cc
  
-$(SOPHYAOBJP)obj_fits.o: obj_fits.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)obj_fits.o: obj_fits.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -336,6 +341,7 @@
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)fitsxntuple.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)fitsntuple.h \
+  $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)fitsfile.h \
   $(SOPHYAINCP)ndatablock.h \
@@ -344,5 +350,4 @@
   $(SOPHYAINCP)FitsIO/longnam.h \
   $(SOPHYAINCP)fitshandler.h \
-  $(SOPHYAINCP)fitsntuple.h \
   $(SOPHYAINCP)fitstarray.h \
   $(SOPHYAINCP)tarray.h \
@@ -356,5 +361,6 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)sopemtx.h
+  $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  obj_fits.cc
  
@@ -363,4 +369,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -386,4 +393,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)ctimer.h \
   $(SOPHYAINCP)timing.h \
@@ -394,4 +402,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)zthread.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)pisysdep.h \
@@ -399,4 +408,5 @@
   $(SOPHYAINCP)piapplgen.h \
   $(SOPHYAINCP)pimsghandler.h \
+  $(SOPHYAINCP)pisysdep.h \
   $(SOPHYAINCP)picontainerx.h \
   $(SOPHYAINCP)picontainergen.h \
@@ -404,11 +414,19 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)pimenux.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -426,8 +444,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -454,9 +468,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pizthr.cc
  
-$(SOPHYAOBJP)ppftswap.o: ppftswap.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)ppftswap.o: ppftswap.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)sophyainit.h \
   $(SOPHYAINCP)machdefs.h \
@@ -484,6 +498,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)fiondblock.h \
-  $(SOPHYAINCP)tarrinit.h
+  $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ppftswap.cc
  
@@ -492,4 +509,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -515,4 +533,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)resusage.h
@@ -538,4 +557,5 @@
   $(SOPHYAINCP)cimage.h \
   $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)fioarr.h \
@@ -616,4 +636,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)cexpre.h \
@@ -665,4 +686,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)cxxcmplnk.h \
   $(SOPHYAINCP)pdlmgr.h \
@@ -701,5 +723,7 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)psighand.h \
+  $(SOPHYAINCP)fmath.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tdcr.cc
@@ -732,5 +756,7 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)pdlmgr.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tdynl.cc
@@ -739,4 +765,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)tarray.h \
@@ -802,4 +829,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)fitsinoutfile.h \
@@ -819,5 +847,6 @@
   $(SOPHYAINCP)ppfbinstream.h \
   $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)ppersist.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  thash.cc
  
@@ -850,6 +879,8 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)cimage.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)ndatablock.h \
   $(SOPHYAINCP)fiondblock.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  timg.cc
@@ -882,4 +913,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)tarrinit.h \
@@ -900,10 +932,47 @@
   $(SOPHYAINCP)swfitsdtable.h \
   $(SOPHYAINCP)fitsswapper.h \
+  $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)fitsblkrw.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)histinit.h \
-  $(SOPHYAINCP)ntoolsinit.h
+  $(SOPHYAINCP)ntoolsinit.h \
+  $(SOPHYAINCP)tarrinit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtdt.cc
+ 
+$(SOPHYAOBJP)tmtrnd.o: tmtrnd.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)zthread.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)resusage.h \
+  $(SOPHYAINCP)ctimer.h \
+  $(SOPHYAINCP)timing.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)utilarr.h \
+  $(SOPHYAINCP)tmatrix_tsnl.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)matharr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd.cc
  
 $(SOPHYAOBJP)tmtrnd3.o: tmtrnd3.cc $(SOPHYAINCP)sopnamsp.h \
@@ -931,4 +1000,5 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -939,40 +1009,8 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd3.cc
  
-$(SOPHYAOBJP)tmtrnd.o: tmtrnd.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)zthread.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)resusage.h \
-  $(SOPHYAINCP)ctimer.h \
-  $(SOPHYAINCP)timing.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)matharr.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+$(SOPHYAOBJP)tmxv.o: tmxv.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)stsrand.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd.cc
- 
-$(SOPHYAOBJP)tmxv.o: tmxv.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -997,4 +1035,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmxv.cc
@@ -1007,4 +1046,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -1030,10 +1070,13 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)FitsIO/fitsio.h \
   $(SOPHYAINCP)FitsIO/longnam.h \
   $(SOPHYAINCP)fitsblkrw.h \
+  $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)fitsarrhand.h \
   $(SOPHYAINCP)fitshandler.h \
+  $(SOPHYAINCP)fitsblkrw.h \
   $(SOPHYAINCP)fiosinit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tnfits.cc
@@ -1058,5 +1101,5 @@
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)xntuple.h \
+  $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)basedtable.h \
@@ -1077,5 +1120,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tnt.cc
  
-$(SOPHYAOBJP)tobjio2.o: tobjio2.cc $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tobjio.o: tobjio.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1108,10 +1151,13 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)srandgen.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio2.cc
- 
-$(SOPHYAOBJP)tobjio.o: tobjio.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)fmath.h \
+  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)fioarr.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio.cc
+ 
+$(SOPHYAOBJP)tobjio2.o: tobjio2.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1144,9 +1190,11 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)fioarr.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio.cc
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)fmath.h \
+  $(SOPHYAINCP)srandgen.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio2.cc
  
 $(SOPHYAOBJP)tpipe.o: tpipe.cc $(SOPHYAINCP)sopnamsp.h \
@@ -1157,6 +1205,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tpipe.cc
  
-$(SOPHYAOBJP)tsimplex.o: tsimplex.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tsimplex.o: tsimplex.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)simplex.h \
   $(SOPHYAINCP)machdefs.h \
@@ -1193,4 +1240,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsimplex.cc
@@ -1206,4 +1254,5 @@
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h \
+  $(SOPHYAINCP)resusage.h \
   $(SOPHYAINCP)sphereecp.h \
   $(SOPHYAINCP)sphericalmap.h \
@@ -1211,4 +1260,5 @@
   $(SOPHYAINCP)pixelmap.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1235,11 +1285,13 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fiosphereecp.h \
+  $(SOPHYAINCP)sphereecp.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -1257,4 +1309,51 @@
   $(SOPHYAINCP)tod.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsphereecp.cc
+ 
+$(SOPHYAOBJP)tspm.o: tspm.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)skymapinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)skymap.h \
+  $(SOPHYAINCP)spherethetaphi.h \
+  $(SOPHYAINCP)sphericalmap.h \
+  $(SOPHYAINCP)smathconst.h \
+  $(SOPHYAINCP)pixelmap.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)spherepos.h \
+  $(SOPHYAINCP)unitvector.h \
+  $(SOPHYAINCP)vector3d.h \
+  $(SOPHYAINCP)longlat.h \
+  $(SOPHYAINCP)utilgeom.h \
+  $(SOPHYAINCP)datatype.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)utilarr.h \
+  $(SOPHYAINCP)tmatrix_tsnl.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)spherehealpix.h \
+  $(SOPHYAINCP)HEALPixUtils.h \
+  $(SOPHYAINCP)localmap.h \
+  $(SOPHYAINCP)sphereecp.h \
+  $(SOPHYAINCP)fiospherethetaphi.h \
+  $(SOPHYAINCP)fiospherehealpix.h \
+  $(SOPHYAINCP)fiolocalmap.h \
+  $(SOPHYAINCP)fiosphereecp.h \
+  $(SOPHYAINCP)tod.h \
+  $(SOPHYAINCP)misstime.h \
+  $(SOPHYAINCP)timing.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm.cc
  
 $(SOPHYAOBJP)tspm2.o: tspm2.cc $(SOPHYAINCP)sopnamsp.h \
@@ -1316,55 +1415,9 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm2.cc
  
-$(SOPHYAOBJP)tspm.o: tspm.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)skymapinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)skymap.h \
-  $(SOPHYAINCP)spherethetaphi.h \
-  $(SOPHYAINCP)sphericalmap.h \
-  $(SOPHYAINCP)smathconst.h \
-  $(SOPHYAINCP)pixelmap.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)spherepos.h \
-  $(SOPHYAINCP)unitvector.h \
-  $(SOPHYAINCP)vector3d.h \
-  $(SOPHYAINCP)longlat.h \
-  $(SOPHYAINCP)utilgeom.h \
-  $(SOPHYAINCP)datatype.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)spherehealpix.h \
-  $(SOPHYAINCP)HEALPixUtils.h \
-  $(SOPHYAINCP)localmap.h \
-  $(SOPHYAINCP)sphereecp.h \
-  $(SOPHYAINCP)fiospherethetaphi.h \
-  $(SOPHYAINCP)fiospherehealpix.h \
-  $(SOPHYAINCP)fiolocalmap.h \
-  $(SOPHYAINCP)fiosphereecp.h \
-  $(SOPHYAINCP)tod.h \
-  $(SOPHYAINCP)misstime.h \
-  $(SOPHYAINCP)timing.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm.cc
- 
 $(SOPHYAOBJP)tstboloread.o: tstboloread.cc \
   $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fboloread.h \
@@ -1378,4 +1431,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1397,4 +1451,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fabtcolread.h \
@@ -1408,4 +1463,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1422,6 +1478,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstcolread.cc
  
-$(SOPHYAOBJP)tstdtable.o: tstdtable.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tstdtable.o: tstdtable.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1460,10 +1515,10 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstdtable.cc
  
-$(SOPHYAOBJP)tstndblk.o: tstndblk.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)ntoolsinit.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+$(SOPHYAOBJP)tstndblk.o: tstndblk.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)ntoolsinit.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ndatablock.h \
@@ -1479,8 +1534,10 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ppfwrapstlv.h \
   $(SOPHYAINCP)anydataobj.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1489,6 +1546,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstppfwrapstl.cc
  
-$(SOPHYAOBJP)tstsegdb.o: tstsegdb.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tstsegdb.o: tstsegdb.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
@@ -1497,8 +1553,10 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)anydataobj.h \
   $(SOPHYAINCP)thsafeop.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fiosegdb.h \
   $(SOPHYAINCP)ppersist.h \
@@ -1507,7 +1565,9 @@
   $(SOPHYAINCP)rawstream.h \
   $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)ppftpointerio.h \
   $(SOPHYAINCP)swsegdb.h \
   $(SOPHYAINCP)ppfswapper.h \
+  $(SOPHYAINCP)swsegdb.h \
   $(SOPHYAINCP)ppfwrapstlv.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstsegdb.cc
@@ -1518,4 +1578,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1527,4 +1588,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1541,9 +1603,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsttmat.cc
  
-$(SOPHYAOBJP)tsttminv.o: tsttminv.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tsttminv.o: tsttminv.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
@@ -1551,4 +1613,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1560,4 +1623,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1574,4 +1638,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)intflapack.h
@@ -1583,4 +1648,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1592,4 +1658,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1606,4 +1673,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsttvec.cc
@@ -1631,4 +1699,5 @@
   $(SOPHYAINCP)thsafeop.h \
   $(SOPHYAINCP)fitsinoutfile.h \
+  $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)FitsIO/fitsio.h \
   $(SOPHYAINCP)FitsIO/longnam.h \
@@ -1646,7 +1715,9 @@
   $(SOPHYAINCP)fiosinit.h \
   $(SOPHYAINCP)swfitsdtable.h \
+  $(SOPHYAINCP)fitsswapper.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)datatable.h \
-  $(SOPHYAINCP)fitshdtable.h
+  $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tswfits.cc
  
@@ -1656,4 +1727,5 @@
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)anydataobj.h \
@@ -1668,4 +1740,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ppfwrapstlv.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ttimestamp.cc
@@ -1693,8 +1766,10 @@
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)matharr.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)matharr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)ctimer.h
Index: /trunk/SophyaProg/Tests/obj_fits.cc
===================================================================
--- /trunk/SophyaProg/Tests/obj_fits.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/obj_fits.cc	(revision 3572)
@@ -8,6 +8,4 @@
 #include "dvlist.h"
 #include "ntuple.h"
-#include "xntuple.h"
-#include "fitsxntuple.h"
 #include "fitsntuple.h"
 #include "fitstarray.h"
@@ -60,5 +58,5 @@
       
       cout << " Creating NTuple " << endl;
-      char * names[3] = {"XPos", "YPos", "Val"};
+      const char * names[3] = {"XPos", "YPos", "Val"};
       int i,j, k;
       float xnt[3];
Index: /trunk/SophyaProg/Tests/smakefile
===================================================================
--- /trunk/SophyaProg/Tests/smakefile	(revision 3571)
+++ /trunk/SophyaProg/Tests/smakefile	(revision 3572)
@@ -1,4 +1,3 @@
 include $(SOPHYABASE)/include/sophyamake.inc
-
  
 PROGS = $(SOPHYAEXEP)arrt $(SOPHYAEXEP)carrt $(SOPHYAEXEP)lpk $(SOPHYAEXEP)obj_fits $(SOPHYAEXEP)ovharr $(SOPHYAEXEP)pizthr $(SOPHYAEXEP)ppftswap $(SOPHYAEXEP)spar $(SOPHYAEXEP)sphg0 $(SOPHYAEXEP)sph2lm $(SOPHYAEXEP)tcmd $(SOPHYAEXEP)tcxxcmpldynl $(SOPHYAEXEP)tdcr $(SOPHYAEXEP)tdynl $(SOPHYAEXEP)tfft $(SOPHYAEXEP)thash $(SOPHYAEXEP)timg $(SOPHYAEXEP)tmxv $(SOPHYAEXEP)tnt $(SOPHYAEXEP)tobjio2 $(SOPHYAEXEP)tobjio $(SOPHYAEXEP)tpipe $(SOPHYAEXEP)tsimplex $(SOPHYAEXEP)tsphereecp $(SOPHYAEXEP)tspm2 $(SOPHYAEXEP)tspm $(SOPHYAEXEP)tstboloread $(SOPHYAEXEP)tstcolread $(SOPHYAEXEP)tstdtable $(SOPHYAEXEP)tstndblk $(SOPHYAEXEP)tstppfwrapstl $(SOPHYAEXEP)tstsegdb $(SOPHYAEXEP)tswfits $(SOPHYAEXEP)tnfits $(SOPHYAEXEP)tfitsdt $(SOPHYAEXEP)tsttmat $(SOPHYAEXEP)tsttminv $(SOPHYAEXEP)tsttvec $(SOPHYAEXEP)ttimestamp $(SOPHYAEXEP)zthr $(SOPHYAEXEP)tmtrnd $(SOPHYAEXEP)tmtrnd3 $(SOPHYAEXEP)tmtdt
@@ -229,4 +228,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -252,4 +252,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  arrt.cc
@@ -259,4 +260,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -282,4 +284,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  carrt.cc
@@ -288,4 +291,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -313,10 +317,10 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)intflapack.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lpk.cc
  
-$(SOPHYAOBJP)obj_fits.o: obj_fits.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)obj_fits.o: obj_fits.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -337,6 +341,7 @@
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)fitsxntuple.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)fitsntuple.h \
+  $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)fitsfile.h \
   $(SOPHYAINCP)ndatablock.h \
@@ -345,5 +350,4 @@
   $(SOPHYAINCP)FitsIO/longnam.h \
   $(SOPHYAINCP)fitshandler.h \
-  $(SOPHYAINCP)fitsntuple.h \
   $(SOPHYAINCP)fitstarray.h \
   $(SOPHYAINCP)tarray.h \
@@ -357,5 +361,6 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)sopemtx.h
+  $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  obj_fits.cc
  
@@ -364,4 +369,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -387,4 +393,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)ctimer.h \
   $(SOPHYAINCP)timing.h \
@@ -395,4 +402,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)zthread.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)pisysdep.h \
@@ -400,4 +408,5 @@
   $(SOPHYAINCP)piapplgen.h \
   $(SOPHYAINCP)pimsghandler.h \
+  $(SOPHYAINCP)pisysdep.h \
   $(SOPHYAINCP)picontainerx.h \
   $(SOPHYAINCP)picontainergen.h \
@@ -405,11 +414,19 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)pimenux.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -427,8 +444,4 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -455,9 +468,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pizthr.cc
  
-$(SOPHYAOBJP)ppftswap.o: ppftswap.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)ppftswap.o: ppftswap.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)sophyainit.h \
   $(SOPHYAINCP)machdefs.h \
@@ -485,6 +498,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)fiondblock.h \
-  $(SOPHYAINCP)tarrinit.h
+  $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ppftswap.cc
  
@@ -493,4 +509,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -516,4 +533,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)resusage.h
@@ -539,4 +557,5 @@
   $(SOPHYAINCP)cimage.h \
   $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)fioarr.h \
@@ -617,4 +636,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)cexpre.h \
@@ -666,4 +686,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)cxxcmplnk.h \
   $(SOPHYAINCP)pdlmgr.h \
@@ -702,5 +723,7 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)psighand.h \
+  $(SOPHYAINCP)fmath.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tdcr.cc
@@ -733,5 +756,7 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)pdlmgr.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tdynl.cc
@@ -740,4 +765,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)tarray.h \
@@ -803,4 +829,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)fitsinoutfile.h \
@@ -820,5 +847,6 @@
   $(SOPHYAINCP)ppfbinstream.h \
   $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)ppersist.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  thash.cc
  
@@ -851,6 +879,8 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)cimage.h \
   $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)ndatablock.h \
   $(SOPHYAINCP)fiondblock.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  timg.cc
@@ -883,4 +913,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)tarrinit.h \
@@ -901,10 +932,47 @@
   $(SOPHYAINCP)swfitsdtable.h \
   $(SOPHYAINCP)fitsswapper.h \
+  $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)fitsblkrw.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)histinit.h \
-  $(SOPHYAINCP)ntoolsinit.h
+  $(SOPHYAINCP)ntoolsinit.h \
+  $(SOPHYAINCP)tarrinit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtdt.cc
+ 
+$(SOPHYAOBJP)tmtrnd.o: tmtrnd.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)zthread.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)resusage.h \
+  $(SOPHYAINCP)ctimer.h \
+  $(SOPHYAINCP)timing.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)utilarr.h \
+  $(SOPHYAINCP)tmatrix_tsnl.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)matharr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd.cc
  
 $(SOPHYAOBJP)tmtrnd3.o: tmtrnd3.cc $(SOPHYAINCP)sopnamsp.h \
@@ -932,4 +1000,5 @@
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -940,40 +1009,8 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd3.cc
  
-$(SOPHYAOBJP)tmtrnd.o: tmtrnd.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)zthread.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)resusage.h \
-  $(SOPHYAINCP)ctimer.h \
-  $(SOPHYAINCP)timing.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)fioarr.h \
-  $(SOPHYAINCP)matharr.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+$(SOPHYAOBJP)tmxv.o: tmxv.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)stsrand.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmtrnd.cc
- 
-$(SOPHYAOBJP)tmxv.o: tmxv.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
@@ -998,4 +1035,5 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)tvector.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tmxv.cc
@@ -1008,4 +1046,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)tarray.h \
@@ -1031,10 +1070,13 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)FitsIO/fitsio.h \
   $(SOPHYAINCP)FitsIO/longnam.h \
   $(SOPHYAINCP)fitsblkrw.h \
+  $(SOPHYAINCP)fitsinoutfile.h \
   $(SOPHYAINCP)fitsarrhand.h \
   $(SOPHYAINCP)fitshandler.h \
+  $(SOPHYAINCP)fitsblkrw.h \
   $(SOPHYAINCP)fiosinit.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tnfits.cc
@@ -1059,5 +1101,5 @@
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)xntuple.h \
+  $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)datatable.h \
   $(SOPHYAINCP)basedtable.h \
@@ -1078,5 +1120,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tnt.cc
  
-$(SOPHYAOBJP)tobjio2.o: tobjio2.cc $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tobjio.o: tobjio.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1109,10 +1151,13 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)srandgen.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio2.cc
- 
-$(SOPHYAOBJP)tobjio.o: tobjio.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)fmath.h \
+  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)fioarr.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio.cc
+ 
+$(SOPHYAOBJP)tobjio2.o: tobjio2.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1145,9 +1190,11 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)histos2.h \
+  $(SOPHYAINCP)histos.h \
   $(SOPHYAINCP)ntuple.h \
   $(SOPHYAINCP)ntupintf.h \
-  $(SOPHYAINCP)srandgen.h \
-  $(SOPHYAINCP)fioarr.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio.cc
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)fmath.h \
+  $(SOPHYAINCP)srandgen.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tobjio2.cc
  
 $(SOPHYAOBJP)tpipe.o: tpipe.cc $(SOPHYAINCP)sopnamsp.h \
@@ -1158,6 +1205,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tpipe.cc
  
-$(SOPHYAOBJP)tsimplex.o: tsimplex.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tsimplex.o: tsimplex.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)simplex.h \
   $(SOPHYAINCP)machdefs.h \
@@ -1194,4 +1240,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsimplex.cc
@@ -1207,4 +1254,5 @@
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)timing.h \
+  $(SOPHYAINCP)resusage.h \
   $(SOPHYAINCP)sphereecp.h \
   $(SOPHYAINCP)sphericalmap.h \
@@ -1212,4 +1260,5 @@
   $(SOPHYAINCP)pixelmap.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1236,11 +1285,13 @@
   $(SOPHYAINCP)tvector_tsnl.h \
   $(SOPHYAINCP)fiosphereecp.h \
+  $(SOPHYAINCP)sphereecp.h \
   $(SOPHYAINCP)array.h \
   $(SOPHYAINCP)matharr.h \
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)samba.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -1258,4 +1309,51 @@
   $(SOPHYAINCP)tod.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsphereecp.cc
+ 
+$(SOPHYAOBJP)tspm.o: tspm.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)skymapinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)skymap.h \
+  $(SOPHYAINCP)spherethetaphi.h \
+  $(SOPHYAINCP)sphericalmap.h \
+  $(SOPHYAINCP)smathconst.h \
+  $(SOPHYAINCP)pixelmap.h \
+  $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)gnumd5.h \
+  $(SOPHYAINCP)ppfbinstream.h \
+  $(SOPHYAINCP)rawstream.h \
+  $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)dvlist.h \
+  $(SOPHYAINCP)objfio.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)mutyv.h \
+  $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)spherepos.h \
+  $(SOPHYAINCP)unitvector.h \
+  $(SOPHYAINCP)vector3d.h \
+  $(SOPHYAINCP)longlat.h \
+  $(SOPHYAINCP)utilgeom.h \
+  $(SOPHYAINCP)datatype.h \
+  $(SOPHYAINCP)tvector.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tarray.h \
+  $(SOPHYAINCP)basarr.h \
+  $(SOPHYAINCP)ndatablock.h \
+  $(SOPHYAINCP)utilarr.h \
+  $(SOPHYAINCP)tmatrix_tsnl.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)spherehealpix.h \
+  $(SOPHYAINCP)HEALPixUtils.h \
+  $(SOPHYAINCP)localmap.h \
+  $(SOPHYAINCP)sphereecp.h \
+  $(SOPHYAINCP)fiospherethetaphi.h \
+  $(SOPHYAINCP)fiospherehealpix.h \
+  $(SOPHYAINCP)fiolocalmap.h \
+  $(SOPHYAINCP)fiosphereecp.h \
+  $(SOPHYAINCP)tod.h \
+  $(SOPHYAINCP)misstime.h \
+  $(SOPHYAINCP)timing.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm.cc
  
 $(SOPHYAOBJP)tspm2.o: tspm2.cc $(SOPHYAINCP)sopnamsp.h \
@@ -1317,55 +1415,9 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm2.cc
  
-$(SOPHYAOBJP)tspm.o: tspm.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)skymapinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)skymap.h \
-  $(SOPHYAINCP)spherethetaphi.h \
-  $(SOPHYAINCP)sphericalmap.h \
-  $(SOPHYAINCP)smathconst.h \
-  $(SOPHYAINCP)pixelmap.h \
-  $(SOPHYAINCP)ppersist.h \
-  $(SOPHYAINCP)pexceptions.h \
-  $(SOPHYAINCP)gnumd5.h \
-  $(SOPHYAINCP)ppfbinstream.h \
-  $(SOPHYAINCP)rawstream.h \
-  $(SOPHYAINCP)ppfnametag.h \
-  $(SOPHYAINCP)dvlist.h \
-  $(SOPHYAINCP)objfio.h \
-  $(SOPHYAINCP)anydataobj.h \
-  $(SOPHYAINCP)mutyv.h \
-  $(SOPHYAINCP)timestamp.h \
-  $(SOPHYAINCP)spherepos.h \
-  $(SOPHYAINCP)unitvector.h \
-  $(SOPHYAINCP)vector3d.h \
-  $(SOPHYAINCP)longlat.h \
-  $(SOPHYAINCP)utilgeom.h \
-  $(SOPHYAINCP)datatype.h \
-  $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tmatrix.h \
-  $(SOPHYAINCP)tarray.h \
-  $(SOPHYAINCP)basarr.h \
-  $(SOPHYAINCP)ndatablock.h \
-  $(SOPHYAINCP)utilarr.h \
-  $(SOPHYAINCP)tmatrix_tsnl.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)spherehealpix.h \
-  $(SOPHYAINCP)HEALPixUtils.h \
-  $(SOPHYAINCP)localmap.h \
-  $(SOPHYAINCP)sphereecp.h \
-  $(SOPHYAINCP)fiospherethetaphi.h \
-  $(SOPHYAINCP)fiospherehealpix.h \
-  $(SOPHYAINCP)fiolocalmap.h \
-  $(SOPHYAINCP)fiosphereecp.h \
-  $(SOPHYAINCP)tod.h \
-  $(SOPHYAINCP)misstime.h \
-  $(SOPHYAINCP)timing.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tspm.cc
- 
 $(SOPHYAOBJP)tstboloread.o: tstboloread.cc \
   $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fboloread.h \
@@ -1379,4 +1431,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1398,4 +1451,5 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fabtcolread.h \
@@ -1409,4 +1463,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1423,6 +1478,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstcolread.cc
  
-$(SOPHYAOBJP)tstdtable.o: tstdtable.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tstdtable.o: tstdtable.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)histinit.h \
   $(SOPHYAINCP)ntoolsinit.h \
@@ -1461,10 +1515,10 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstdtable.cc
  
-$(SOPHYAOBJP)tstndblk.o: tstndblk.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  $(SOPHYAINCP)ntoolsinit.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+$(SOPHYAOBJP)tstndblk.o: tstndblk.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)ntoolsinit.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ndatablock.h \
@@ -1480,8 +1534,10 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ppfwrapstlv.h \
   $(SOPHYAINCP)anydataobj.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1490,6 +1546,5 @@
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstppfwrapstl.cc
  
-$(SOPHYAOBJP)tstsegdb.o: tstsegdb.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tstsegdb.o: tstsegdb.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
@@ -1498,8 +1553,10 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)anydataobj.h \
   $(SOPHYAINCP)thsafeop.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)fiosegdb.h \
   $(SOPHYAINCP)ppersist.h \
@@ -1508,7 +1565,9 @@
   $(SOPHYAINCP)rawstream.h \
   $(SOPHYAINCP)ppfnametag.h \
+  $(SOPHYAINCP)segdatablock.h \
   $(SOPHYAINCP)ppftpointerio.h \
   $(SOPHYAINCP)swsegdb.h \
   $(SOPHYAINCP)ppfswapper.h \
+  $(SOPHYAINCP)swsegdb.h \
   $(SOPHYAINCP)ppfwrapstlv.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tstsegdb.cc
@@ -1519,4 +1578,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1528,4 +1588,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1542,9 +1603,9 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsttmat.cc
  
-$(SOPHYAOBJP)tsttminv.o: tsttminv.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)tsttminv.o: tsttminv.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)timing.h \
@@ -1552,4 +1613,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1561,4 +1623,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1575,4 +1638,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)intflapack.h
@@ -1584,4 +1648,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)array.h \
@@ -1593,4 +1658,5 @@
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)ppersist.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)gnumd5.h \
   $(SOPHYAINCP)ppfbinstream.h \
@@ -1607,4 +1673,5 @@
   $(SOPHYAINCP)fioarr.h \
   $(SOPHYAINCP)sopemtx.h \
+  $(SOPHYAINCP)arrctcast.h \
   $(SOPHYAINCP)srandgen.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tsttvec.cc
@@ -1632,4 +1699,5 @@
   $(SOPHYAINCP)thsafeop.h \
   $(SOPHYAINCP)fitsinoutfile.h \
+  $(SOPHYAINCP)dvlist.h \
   $(SOPHYAINCP)FitsIO/fitsio.h \
   $(SOPHYAINCP)FitsIO/longnam.h \
@@ -1647,7 +1715,9 @@
   $(SOPHYAINCP)fiosinit.h \
   $(SOPHYAINCP)swfitsdtable.h \
+  $(SOPHYAINCP)fitsswapper.h \
   $(SOPHYAINCP)fitshandler.h \
   $(SOPHYAINCP)datatable.h \
-  $(SOPHYAINCP)fitshdtable.h
+  $(SOPHYAINCP)fitshdtable.h \
+  $(SOPHYAINCP)datatable.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  tswfits.cc
  
@@ -1657,4 +1727,5 @@
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)timestamp.h \
+  $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)objfio.h \
   $(SOPHYAINCP)anydataobj.h \
@@ -1669,4 +1740,5 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)ppfwrapstlv.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ttimestamp.cc
@@ -1694,8 +1766,10 @@
   $(SOPHYAINCP)tmatrix_tsnl.h \
   $(SOPHYAINCP)tvector.h \
-  $(SOPHYAINCP)tvector_tsnl.h \
-  $(SOPHYAINCP)matharr.h \
-  $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)tmatrix.h \
+  $(SOPHYAINCP)tvector_tsnl.h \
+  $(SOPHYAINCP)matharr.h \
+  $(SOPHYAINCP)tarrinit.h \
+  $(SOPHYAINCP)sophyainit.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)timing.h \
   $(SOPHYAINCP)ctimer.h
Index: /trunk/SophyaProg/Tests/tfft.cc
===================================================================
--- /trunk/SophyaProg/Tests/tfft.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tfft.cc	(revision 3572)
@@ -187,5 +187,5 @@
 
   ndiff = 0;
-  maxdif=0., vdif;
+  maxdif=0.;
   for(i=0; i<num; i++) {
     vdif = fabs(module(difc(i)));
Index: /trunk/SophyaProg/Tests/thash.cc
===================================================================
--- /trunk/SophyaProg/Tests/thash.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/thash.cc	(revision 3572)
@@ -8,5 +8,5 @@
 int main(int narg, char *arg[])
 {
-  char * sid[3] = { "Hello","Reza","ERIC" } ;
+  const char * sid[3] = { "Hello","Reza","ERIC" } ;
   uint_8 code[3];
   int k;
Index: /trunk/SophyaProg/Tests/tmtdt.cc
===================================================================
--- /trunk/SophyaProg/Tests/tmtdt.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tmtdt.cc	(revision 3572)
@@ -193,5 +193,5 @@
   }
 #endif
-  char* nomnt[5]={"tid","k","x","cx","sx"};
+  const char* nomnt[5]={"tid","k","x","cx","sx"};
   NTuple* nt = NULL;
   BaseDataTable* dt = NULL;
Index: /trunk/SophyaProg/Tests/tnt.cc
===================================================================
--- /trunk/SophyaProg/Tests/tnt.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tnt.cc	(revision 3572)
@@ -9,5 +9,4 @@
 #include "dvlist.h"
 #include "ntuple.h"
-#include "xntuple.h"
 #include "datatable.h"
 #include "swppfdtable.h"
@@ -19,6 +18,4 @@
 void test_dvl();
 void test_ntuple();
-void test_xntuple() ; 
-void test_Xntuple() ; 
 void test_DataTable() ; 
 void test_SwPPFDataTable() ; 
@@ -28,6 +25,6 @@
   SophyaInit();
   if (narg < 2) {
-    cout << " tnt/Erreur arg - Usage: tnt d/n/x/X/DT/SWDT \n" 
-	 << " d:DVList n:NTuple x/X:XNTuple DT,SWDT: SwPPF/DataTable test \n" << endl;
+    cout << " tnt/Erreur arg - Usage: tnt d/n/DT/SWDT \n" 
+	 << " d:DVList n:NTuple DT,SWDT: SwPPF/DataTable test \n" << endl;
     exit(0);
   }
@@ -36,6 +33,4 @@
     if (*arg[1] == 'd')  test_dvl();
     else if (*arg[1] == 'n')  test_ntuple();
-    else if (*arg[1] == 'x')  test_xntuple();
-    else if (*arg[1] == 'X')  test_Xntuple();
     else if (strcmp(arg[1],"DT") == 0)  test_DataTable();
     else if (strcmp(arg[1],"SWDT") == 0)  test_SwPPFDataTable();
@@ -59,5 +54,5 @@
 void test_ntuple()
 {
-  char * names[3] = {"XPos", "YPos", "Val"};
+  const char * names[3] = {"XPos", "YPos", "Val"};
   int i,j, k;
   float xnt[3];
@@ -424,112 +419,2 @@
 
 
-void test_Xntuple() 
-{
-    char* names[] = {"str1", "str2", "str3", "str4", "str5"} ; 
-    XNTuple nt(0, 0, 0, 5, names) ; 
-    char** ce = new char*[5] ; 
-    int i;
-    for(i = 0 ; i < 5 ; i++)
-	ce[i] = new char[20] ; 
-
-  cout << "======= test_Xtuple:  simple XNTuple test ======= " << endl;
-
-    strncpy(ce[1], "toto a une auto", 20) ; 
-    strncpy(ce[2], "titi a une iti", 20) ; 
-    strncpy(ce[3], "tutu a une utu", 20) ; 
-    strncpy(ce[4], "tata a une ata", 20) ; 
-    for(i = 0 ; i < 100000 ; i++) {
-	sprintf(ce[0], "%d", i) ; 
-	nt.Fill(NULL, NULL, NULL, ce) ; 
-    }
-    
-    nt.Show() ; 
-    cout << nt.LineHeaderToString() ; 
-    cout << nt.LineToString(5027) << endl ; 
-    
-    char* names2[] = {"d0", "d1", "f0", "f1", "f2", "i0", "str0", "str1"} ; 
-    XNTuple nt2(2, 3, 1, 2, names2) ; 
-    double de[2] ; float fe[3] ; int ie ; 
-    char** ce2 = new char*[2] ; 
-    for(i = 0 ; i < 2 ; i++) ce2[i] = new char[20] ; 
-    strncpy(ce2[1], "glop glop", 20) ; 
-    
-    for(i = 0 ; i < 100000 ; i++) {
-	de[0] = i ; 
-	de[1] = sin((double)i) ; 
-	fe[0] = i ; 
-	fe[1] = i * cos((double)i) ; 
-	fe[2] = 2*i ; 
-	ie    = -i; 
-	sprintf(ce[0], "%d", i) ; 
-	nt2.Fill(de, fe, &ie, ce) ; 
-    }
-    nt2.Show() ; 
-    nt2.LineHeaderToString() ; 
-    //    nt2.LineToString(20) ; 
-}
-
-
-void test_xntuple() 
-{
-    char* names[] = {"dblval", "floval", "intval", "strval"} ; 
-    XNTuple nt(1, 1, 1, 1, names) ; 
-    double de ; 
-    float  fe ; 
-    int    ie ; 
-    char*  ce = new char[22] ; 
-    
-    
-  cout << "======= test_Xtuple:  XNTuple test ======= " << endl;
-  int i;
-    for(i = 0 ; i < nt.NVar() ; i++)
-	printf(" +++ %s <--> %d \n", 
-	       nt.NomIndex(i).c_str(), nt.IndexNom(nt.NomIndex(i).c_str())) ; 
-
-    for(i = 0 ; i < 100000 ; i++) {
-	de = fe = ie = i ; 
-	sprintf(ce, "%d", i) ; 
-	nt.Fill(&de, &fe, &ie, &ce) ; 
-    }
-    nt.Show() ; 
-    cout << nt.VarList_C("toto") ; 
-    cout << nt.LineHeaderToString() ; 
-    cout << nt.LineToString(20) << endl << endl ; 
-    
-    
-    XNTuple nt2 ; 
-    nt2.SwapPath() = "/tmp/sop/" ; 
-    nt2.Copy(nt) ; 
-    nt2.Show() ; 
-    for(i = 0 ; i < 100000 ; i++) {
-	de = fe = ie = i ; 
-	sprintf(ce, "%d", i) ; 
-	nt2.Fill(&de, &fe, &ie, &ce) ; 
-    }
-    nt2.Show() ; 
-    
-    {
-      POutPersist os("xnt.ppf");
-      os << nt2 ;
-    }
-
-    XNTuple::SetSwapPath("/tmp/sop/") ; 
-    XNTuple nt3("xnt.ppf") ; 
-    nt3.Show() ; 
-    
-    for(i = 0 ; i < nt3.NEntry() ; i+= 1000)
-	printf("%f %f %d %s\n", 
-	       nt3.GetDVal(i,0), 
-	       nt3.GetFVal(i,1), 
-	       nt3.GetIVal(i,2), 
-	       nt3.GetSVal(i,3).c_str()) ; 
-    
-    double min, max ; 
-    for(i = 0 ; i < nt3.NVar() ; i++) {
-	nt3.GetMinMax(i, min, max) ; 
-	printf("GetMinMax(%s) : %f/%f\n", 
-	       nt3.NomIndex(i).c_str(), min, max) ; 
-    }
-    //    nt3.Show() ; 
-}
-
Index: /trunk/SophyaProg/Tests/tobjio.cc
===================================================================
--- /trunk/SophyaProg/Tests/tobjio.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tobjio.cc	(revision 3572)
@@ -31,5 +31,5 @@
   NTuple *nt;
   float xnt[4];
-  char *ntn[4] = {"x","y","ex","ey"};
+  const char *ntn[4] = {"x","y","ex","ey"};
   int nent,i;
   nent = 1000;
@@ -117,5 +117,5 @@
   float xnt[6];
   double ang;
-  char *ntn[6] = {"x","y","z","ex","ey","ez"};
+  const char *ntn[6] = {"x","y","z","ex","ey","ez"};
   int nent,i;
       
Index: /trunk/SophyaProg/Tests/tobjio2.cc
===================================================================
--- /trunk/SophyaProg/Tests/tobjio2.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tobjio2.cc	(revision 3572)
@@ -32,5 +32,5 @@
   NTuple *nt;
   float xnt[4];
-  char *ntn[4] = {"x","y","ex","ey"};
+  const char *ntn[4] = {"x","y","ex","ey"};
   int nent,i;
   nent = 1000;
Index: /trunk/SophyaProg/Tests/tpipe.cc
===================================================================
--- /trunk/SophyaProg/Tests/tpipe.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tpipe.cc	(revision 3572)
@@ -93,5 +93,5 @@
   else {
     cout << ">> tpipe: fork() - creation de process ... " << endl;
-    char * zzz = "toto";
+    char zzz[32]; strcpy(zzz,"toto");
     pid_t rcf = fork();
     if (rcf == 0) {
Index: /trunk/SophyaProg/Tests/tspm2.cc
===================================================================
--- /trunk/SophyaProg/Tests/tspm2.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tspm2.cc	(revision 3572)
@@ -179,6 +179,6 @@
     {
       sphc.PixThetaPhi(j,teta,phi);
-      if (teta < 0.3)   sphc(j) = (30., drandpm1()*3.); 
-      else if ((teta>1.4) && (teta<1.6) ) sphc(j) = (20., NorRand()); 
+      if (teta < 0.3)   sphc(j) = complex<float>(30., drandpm1()*3.); 
+      else if ((teta>1.4) && (teta<1.6) ) sphc(j) = complex<float>(20., NorRand()); 
       else {
         if (phi < 2.)     sphc(j) = 2.; 
Index: /trunk/SophyaProg/Tests/tstboloread.cc
===================================================================
--- /trunk/SophyaProg/Tests/tstboloread.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tstboloread.cc	(revision 3572)
@@ -29,8 +29,8 @@
 {
  SophyaInit();
- char *label_alpha = "", *label_delta = "",
+ const char *label_alpha = "", *label_delta = "",
       *label_bolo  = "", *label_flag  = "",
       *label_snum  = "";
- char *fits_alpha  = "", *fits_delta  = "",
+ const char *fits_alpha  = "", *fits_delta  = "",
       *fits_bolo   = "", *fits_flag   = "",
       *fits_snum   = "";
Index: /trunk/SophyaProg/Tests/tstcolread.cc
===================================================================
--- /trunk/SophyaProg/Tests/tstcolread.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tstcolread.cc	(revision 3572)
@@ -21,5 +21,5 @@
 {
  SophyaInit();
- char *colname = "";
+ const char *colname = "";
  int colnum = -1;
  int ihdu = 0;
Index: /trunk/SophyaProg/Tests/tstppfwrapstl.cc
===================================================================
--- /trunk/SophyaProg/Tests/tstppfwrapstl.cc	(revision 3571)
+++ /trunk/SophyaProg/Tests/tstppfwrapstl.cc	(revision 3572)
@@ -39,5 +39,5 @@
     for(int k=0; k<SZV; k++) vw[k] = 3.141596*k;
     #define MyNSC 6 
-    char * strcst[MyNSC] = { "Langage C++" , "Programmation Objet", "Calcul scientifique",
+    const char * strcst[MyNSC] = { "Langage C++" , "Programmation Objet", "Calcul scientifique",
 			   "Librairie de classes", "SOPHYA", " et Java alors ?"};
 
