Changeset 1174 in Sophya

Timestamp:

Sep 1, 2000, 5:22:11 PM (25 years ago)

Author:

ansari

Message:

hdunum=0 par defaut

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsntuple.h (modified) (2 diffs)
• fitsspherehealpix.cc (modified) (5 diffs)
• fitsspherehealpix.h (modified) (1 diff)
• fitstarray.h (modified) (1 diff)
• fitsxntuple.h (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsntuple.h

@@ -21 +21 @@
 
 FITS_NTuple();
-FITS_NTuple(char inputfile[],int hdunum=2);
+FITS_NTuple(char inputfile[],int hdunum=0);
 FITS_NTuple(const NTuple & obj);
  FITS_NTuple(NTuple* obj); 
@@ -42 +42 @@
 \param <numberOfLines>  number of lines to be read
 */
- void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=2);
+ void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=0);
 
 inline operator NTuple() { return(*dobj_); }

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -21 +21 @@
 FITS_SphereHEALPix<T>::FITS_SphereHEALPix(char inputfile[],int hdunum)
 {
-  dobj_= new SphereHEALPix<T>;
-  ownobj_= true;
-
+    dobj_= new SphereHEALPix<T>;
+    ownobj_= true;
   Read(inputfile,hdunum);
-  //  dobj_->SetTemp(true);
 }
 
@@ -32 +30 @@
 FITS_SphereHEALPix<T>::FITS_SphereHEALPix(const SphereHEALPix<T>& obj)
 {
-  dobj_= new SphereHEALPix<T>(obj, true);
-  //  dobj_->SetTemp(true);
+  cout << " constructeur &obj " << endl;
+   dobj_= new SphereHEALPix<T>(obj);
   ownobj_= true;
 }
@@ -131 +129 @@
       ownobj_= true;      
     }
-
- 
   int nbcols, nbentries;
+  //
+
   nbcols = is.NbColsFromFits();
   if (nbcols != 1) 
@@ -144 +142 @@
   if (lastpix>0)
     {
-      cout << " lastpix trouve= " << lastpix << endl;
       if (nbentries!=lastpix+1) 
         {
-          cout << " nb pixels from LASTPIX = "  << lastpix+1 << endl;
           nbentries=lastpix+1;
         }
@@ -190 +186 @@
   dobj_->setParameters(nside,nPix,Omega);
   // On lit les DataBlocks;
-  dobj_->pixels_.ReSize(nPix);
+  //
+   dobj_->pixels_.ReSize(nPix);
   is.GetSingleColumn(dobj_->pixels_.Data(),nPix);
+  //
 
   // on effectue le decoupage en tranches 
   dobj_->SetThetaSlices();
-    dobj_->Info()  = is.DVListFromFits();
-
-
+  //
+  dobj_->Info()  = is.DVListFromFits();
+  cout << " end of file reading " << endl;
 }
 

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h

@@ -22 +22 @@
 
 FITS_SphereHEALPix();
-FITS_SphereHEALPix(char inputfile[],int hdunum=2); 
+FITS_SphereHEALPix(char inputfile[],int hdunum=0); 
 FITS_SphereHEALPix(const SphereHEALPix<T>& obj);
 FITS_SphereHEALPix(SphereHEALPix<T>* obj);

trunk/SophyaExt/FitsIOServer/fitstarray.h

@@ -25 +25 @@
 
 FITS_TArray();
-FITS_TArray(char inputfile[],int hdunum=2);
+FITS_TArray(char inputfile[],int hdunum=0);
 FITS_TArray(const TArray<T> & obj);
 FITS_TArray(TArray<T> *obj);

trunk/SophyaExt/FitsIOServer/fitsxntuple.h

@@ -21 +21 @@
 public:
 FITS_XNTuple();
-FITS_XNTuple(char inputfile[],int hdunum=2);
+FITS_XNTuple(char inputfile[],int hdunum=0);
 FITS_XNTuple(const XNTuple & obj);
 FITS_XNTuple(XNTuple* obj);
@@ -42 +42 @@
 \param <numberOfLines>  number of lines to be read
 */
-void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=2);
+void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=0);
 inline operator XNTuple() { return(*dobj_); }
 inline XNTuple * getObj() { return(dobj_); }