Changeset 3047 in Sophya

Timestamp:

Aug 11, 2006, 10:42:10 AM (19 years ago)

Author:

ansari

Message:

Ajout FitsInOutFile::SkipEmptyFirstHDU() , positionnement sur HDU 2 si HDU 1 vide ds operateur >> lisant des tables + autres petites corrections , Reza 11/08/2006

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitshdtable.h (modified) (1 diff)
• fitsinoutfile.cc (modified) (1 diff)
• fitsinoutfile.h (modified) (1 diff)
• fitslocalmap.cc (modified) (3 diffs)
• fitslocalmap.h (modified) (1 diff)
• fitsntuple.h (modified) (1 diff)
• fitsspherehealpix.cc (modified) (1 diff)
• fitsspherehealpix.h (modified) (1 diff)
• fitsspherethetaphi.h (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fitshdtable.h

@@ -21 +21 @@
 
 inline FitsInOutFile& operator >> (FitsInOutFile& is, BaseDataTable & obj)
-  { FitsHandler<BaseDataTable> fio(obj); fio.Read(is); is.MoveToNextHDU(); return(is); }
+  { FitsHandler<BaseDataTable> fio(obj); is.SkipEmptyFirstHDU();
+  fio.Read(is); is.MoveToNextHDU(); return(is); }
 
 

trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc

@@ -322 +322 @@
     return MoveRelToHDU(1);
   else return -1;
+}
+
+/*-- Methode --*/
+/*! 
+  Skip HDU 1 if NAXIS=0 (no data), on a file opened for reading.
+  return true if moved to HDU No 2
+*/
+bool FitsInOutFile::SkipEmptyFirstHDU()
+{
+  if (fptr_ == NULL) return false;
+  if (mode_ == Fits_Create) return false;
+  if (CurrentHDU() != 1) return false;
+  int naxis = 2;
+  long naxes[2];
+  GetImageHDUInfo(naxis, naxes);
+  if ((naxis == 0) &&  (NbHDUs() > 1)) {
+    MoveRelToHDU(1);
+    return true; 
+  }
+  return false; 
 }
 

trunk/SophyaExt/FitsIOServer/fitsinoutfile.h

@@ -112 +112 @@
  //! Move to the next HDU specified by relhdu. Returns the newly opened HDU type (<0 at EOF)
  int               MoveToNextHDU();
+ //! Skip the first HDU if it contains no data. 
+ bool              SkipEmptyFirstHDU();
 
  //---- IMAGE_HDU manipulation methods

trunk/SophyaExt/FitsIOServer/fitslocalmap.cc

@@ -81 +81 @@
 int FITS_LocalMap<T>::CheckReadability(FitsInOutFile& is)
 {
-  if (is.CurrentHDUType() !=  BINARY_TBL ) return 0;
+  if (is.CurrentHDUType() !=  IMAGE_HDU ) return 0;
   string key;
   key = "Content";
   string clsnm = is.KeyValue(key);
   if (clsnm != "LocalMap") return 0;
-
-  vector<string> colnames; 
-  vector<int> coltypes;
-  vector<long> repcnt;
-  vector<long> width;
-  long ncols = is.GetColInfo(colnames, coltypes, repcnt, width); 
-  if (ncols < 1) return 0;
+  
+  long naxes[2];
+  int naxis=2;
+  int imgtyp = is.GetImageHDUInfo(naxis, naxes);
+  if (naxis != 2) return 0;
+
   T x = 0;
-  if (coltypes[0] == FitsTypes::DataType(x)) return 2 ;
+  if (imgtyp == FitsTypes::ImageType(x)) return 2 ;
   else return 1;
 }
@@ -132 +131 @@
   //
   if (!is.IsFitsImage())
-    {
-      throw PException("ReadFromFits: the fits file seems not to be an image");
-    }
+    throw PException("ReadFromFits: the fits file seems not to be an image");
   int dimension = is.nbDimOfImage();
   if (dimension != 2 )
-    {
-      cout << " WARNING::ReadFromFits: the fits image seems not to be a matrix" << endl;
-    }
+    cout << " WARNING::ReadFromFits: the fits image seems not to be a matrix" << endl;
+
   nbentries =  is.nbOfImageData();
   //
@@ -149 +145 @@
   int_4 nPix = dvl.GetI("NPIX");
   if (nPix != nbentries)
-    {
-      throw IOExc("longueur datablock incompatible avec nPix");
-    }
+    throw IOExc("longueur datablock incompatible avec nPix");
   dobj_->ReSize(nSzX, nSzY); 
   int_4 localMappingDone = dvl.GetI("LCMP");

trunk/SophyaExt/FitsIOServer/fitslocalmap.h

@@ -52 +52 @@
 template <class T>
 inline FitsInOutFile& operator >> (FitsInOutFile& fiis, LocalMap<T> & lm)
-  { FITS_LocalMap<T> fih(&lm); fih.Read(fiis); return (fiis); }
+  { FITS_LocalMap<T> fih(&lm); fih.Read(fiis); 
+  fiis.MoveToNextHDU(); return (fiis); }
 
 } // Fin du namespace

trunk/SophyaExt/FitsIOServer/fitsntuple.h

@@ -81 +81 @@
 
 inline FitsInOutFile& operator >> (FitsInOutFile& fiis, NTuple & nt)
-  { FITS_NTuple fih(&nt); fih.Read(fiis); return (fiis); }
+  { FITS_NTuple fih(&nt); fiis.SkipEmptyFirstHDU();
+  fih.Read(fiis); fiis.MoveToNextHDU(); return (fiis); }
 
 

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -172 +172 @@
 void FITS_SphereHEALPix<T>::ReadFromFits(FitsInFile& is)
 {
-  if(dobj_ == NULL) 
-    {
-      dobj_= new SphereHEALPix<T>;
-      ownobj_= true;      
-    }
+  if (is.CurrentHDUType() != BINARY_TBL )
+    throw FitsIOException("FITS_SphereHEALPix<T>::ReadFromFits Not a binary table HDU");
+
+  if(dobj_ == NULL) {
+    dobj_= new SphereHEALPix<T>;
+    ownobj_= true;      
+  }
   int nbcols, nbentries;
   //

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h

@@ -56 +56 @@
 template <class T>
 inline FitsInOutFile& operator >> (FitsInOutFile& fiis, SphereHEALPix<T> & sph)
-  { FITS_SphereHEALPix<T> fih(&sph); fih.Read(fiis); return (fiis); }
+  { FITS_SphereHEALPix<T> fih(&sph); fiis.SkipEmptyFirstHDU();
+  fih.Read(fiis); fiis.MoveToNextHDU(); return (fiis); }
 
 

trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.h

@@ -58 +58 @@
 template <class T>
 inline FitsInOutFile& operator >> (FitsInOutFile& fiis, SphereThetaPhi<T> & sph)
-  { FITS_SphereThetaPhi<T> fih(&sph); fih.Read(fiis); return (fiis); }
+  { FITS_SphereThetaPhi<T> fih(&sph); fiis.SkipEmptyFirstHDU();
+  fih.Read(fiis); fiis.MoveToNextHDU(); return (fiis); }