Changeset 3047 in Sophya for trunk/SophyaExt/FitsIOServer/fitslocalmap.cc

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

File:

• trunk/SophyaExt/FitsIOServer/fitslocalmap.cc (modified) (3 diffs)

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");