Changeset 1646 in Sophya

Timestamp:

Aug 29, 2001, 3:28:29 PM (24 years ago)

Author:

cmv

Message:

fitsioserver.h + module XAstroPack ds cxxexec cmv 29/08/01

Location:

trunk

Files:

• SophyaExt/FitsIOServer/fbtntintf.cc (modified) (1 diff)
• SophyaExt/FitsIOServer/fbtntintf.h (modified) (1 diff)
• SophyaExt/FitsIOServer/fitsioserver.h (added)
• SophyaPI/PIext/cxxexecutor.cc (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fbtntintf.cc

@@ -221 +221 @@
      row1 = n+1;
      row2 = row1+BuffLen-1; if(row2>NBline) row2 = NBline;
-   } else if(BuffSens<0) { // Cas remplissage forward
+   } else if(BuffSens<0) { // Cas remplissage backward
      row2 = n+1;
      row1 = row2-BuffLen+1; if(row1<1) row1 = 1;

trunk/SophyaExt/FitsIOServer/fbtntintf.h

@@ -18 +18 @@
 class FitsBTNtuIntf : public AnyDataObj, public NTupleInterface {
 public:
-  FitsBTNtuIntf(string fname,int ihdu=0,int_4 blen=100,int_4 bsens=1,uint_2 lp=0); 
-  FitsBTNtuIntf(char *cfname,int ihdu=0,int_4 blen=100,int_4 bsens=1,uint_2 lp=0); 
+  FitsBTNtuIntf(string fname,int ihdu=0,int_4 blen=100,int_4 bsens=1,uint_2 lp=0);
+  FitsBTNtuIntf(char *cfname,int ihdu=0,int_4 blen=100,int_4 bsens=1,uint_2 lp=0);
   FitsBTNtuIntf(FitsBTNtuIntf& fbtnt);
-  FitsBTNtuIntf(); 
+  FitsBTNtuIntf();
   virtual ~FitsBTNtuIntf();
 

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -31 +31 @@
 mModuleImportDefaultList.push_back("IFFTW");
 mModuleImportDefaultList.push_back("LinAlg");
+mModuleImportDefaultList.push_back("XAstroPack");
 
 // Gestion des fichiers par default dans TmpDir 
@@ -801 +802 @@
 if(mModuleImportList.size()>0)
   for(uint_4 i=0;i<mModuleImportList.size();i++) {
-    if(     mModuleImportList[i]=="Samba")  {
+    if(     mModuleImportList[i]=="FitsIOServer")
+      mIncImportList.push_back("fitsioserver.h");
+    else if(mModuleImportList[i]=="IFFTW")
+      mIncImportList.push_back("fftwserver.h");
+    else if(mModuleImportList[i]=="LinAlg")
+      mIncImportList.push_back("intflapack.h");
+    else if(     mModuleImportList[i]=="Samba")
+      {mIncImportList.push_back("skymap.h"); mIncImportList.push_back("samba.h");}
+    else if(mModuleImportList[i]=="SkyMap")
       mIncImportList.push_back("skymap.h");
-      mIncImportList.push_back("samba.h");
-    }
-    else if(mModuleImportList[i]=="SkyMap") mIncImportList.push_back("skymap.h");
-    else if(mModuleImportList[i]=="SkyT") mIncImportList.push_back("skyt.h");
-    else if(mModuleImportList[i]=="FitsIOServer") mIncImportList.push_back("fitsautoreader.h");
-    else if(mModuleImportList[i]=="IFFTW") mIncImportList.push_back("fftwserver.h");
-    else if(mModuleImportList[i]=="LinAlg") mIncImportList.push_back("intflapack.h");
+    else if(mModuleImportList[i]=="SkyT")
+      mIncImportList.push_back("skyt.h");
+    else if(mModuleImportList[i]=="XAstroPack")
+      mIncImportList.push_back("xastropack.h");
 }