Changeset 1136 in Sophya for trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

Timestamp:

Aug 24, 2000, 12:18:02 PM (25 years ago)

Author:

ansari

Message:

structuration a la ppersist+ convention sur hdu

File:

• trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc (modified) (8 diffs)

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -15 +15 @@
 {
   dobj_= new SphereHEALPix<T>;
-  ownobj= true;
+  ownobj_= true;
 }
   
@@ -22 +22 @@
 {
   dobj_= new SphereHEALPix<T>;
-  ownobj= true;
-
-  ReadF(inputfile,hdunum);
-  dobj_->SetTemp(true);
+  ownobj_= true;
+
+  Read(inputfile,hdunum);
+  //  dobj_->SetTemp(true);
 }
 
@@ -33 +33 @@
 {
   dobj_= new SphereHEALPix<T>(obj, true);
-  dobj_->SetTemp(true);
-  ownobj= true;
+  //  dobj_->SetTemp(true);
+  ownobj_= true;
 }
 
@@ -41 +41 @@
 {
   dobj_= obj;
-  ownobj= false;
+  ownobj_= false;
 }
 
@@ -47 +47 @@
 FITS_SphereHEALPix<T>::~FITS_SphereHEALPix()
 {
-  if (ownobj && dobj_) delete dobj_;
+  if (ownobj_ && dobj_) delete dobj_;
 }
 
@@ -61 +61 @@
   SphereHEALPix<T> * po = dynamic_cast< SphereHEALPix<T> * >(&o);
   if (po == NULL) return;
-  if (ownobj && dobj_) delete dobj_;
+  if (ownobj_ && dobj_) delete dobj_;
   dobj_ = po; 
-  ownobj = false;
+  ownobj_ = false;
 } 
 
 
 
-template <class T>
-void FITS_SphereHEALPix<T>::Write(char outputfile[], bool OldFile)
-{
-  WriteF(outputfile, OldFile);
-}
-template <class T>
-void FITS_SphereHEALPix<T>::Read(char inputfile[],int hdunum)
-{
-  ReadF(inputfile,hdunum);
-}
-
-template <class T>
-void FITS_SphereHEALPix<T>::WriteToFits()
+
+template <class T>
+void FITS_SphereHEALPix<T>::WriteToFits(FitsOutFile& os) 
 {
   if(dobj_ == NULL) 
@@ -130 +120 @@
   Type[1]='\0'; 
   vector<int> dummy;
-  //  fn.makeHeaderBntblOnFits(Type, Noms, nPix, 1, dvl, extname, dummy);
-  makeHeaderBntblOnFits(Type, Noms, nPix, 1, dvl, extname, dummy);
+  os.makeHeaderBntblOnFits(Type, Noms, nPix, 1, dvl, extname, dummy);
   delete [] Noms[0];
   delete [] Noms;
-  putColToFits(0,  nPix, dobj_->pixels_.Data()); 
+  os.putColToFits(0,  nPix, dobj_->pixels_.Data()); 
 } 
 
 template <class T> 
-void FITS_SphereHEALPix<T>::ReadFromFits()
+void FITS_SphereHEALPix<T>::ReadFromFits(FitsInFile& is)
 {
   if(dobj_ == NULL) 
     {
       dobj_= new SphereHEALPix<T>;
-      dobj_->SetTemp(true);
-      ownobj= true;      
+      ownobj_= true;      
     }
 
  
   int nbcols, nbentries;
-  //  nbcols = fn.NbColsFromFits();
-  nbcols = NbColsFromFits();
+  nbcols = is.NbColsFromFits();
   if (nbcols != 1) 
     {
       throw IOExc("le fichier fits n'est pas une sphere Healpix");
     }
-  //   const DVList* dvl = &fn.DVListFromFits();
-  //  DVList dvl=fn.DVListFromFits();
-  DVList dvl=DVListFromFits();
-  //  dvl.Print();
-  //   nbentries = fn.NentriesFromFits(0);
-   nbentries = NentriesFromFits(0);
+  DVList dvl=is.DVListFromFits();
+   nbentries = is.NentriesFromFits(0);
   int lastpix=dvl.GetI("LASTPIX");
   if (lastpix>0)
@@ -211 +194 @@
   // On lit les DataBlocks;
   dobj_->pixels_.ReSize(nPix);
-  //  fn.GetSingleColumn(dobj_->pixels_.Data(),nPix);
-  GetSingleColumn(dobj_->pixels_.Data(),nPix);
+  is.GetSingleColumn(dobj_->pixels_.Data(),nPix);
 
   // on effectue le decoupage en tranches 
   dobj_->SetThetaSlices();
-  //  dobj_->Info()=fn.DVListFromFits();
-  dobj_->Info()=DVListFromFits();
+  dobj_->Info()=is.DVListFromFits();