Changeset 1334 in Sophya for trunk/SophyaExt/FitsIOServer/fitsautoreader.cc

Timestamp:

Nov 15, 2000, 4:29:11 PM (25 years ago)

Author:

ansari

Message:

modifs returns de autoreader

File:

• trunk/SophyaExt/FitsIOServer/fitsautoreader.cc (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsautoreader.cc

@@ -25 +25 @@
 }
 
+int FITS_AutoReader::NbBlocks()
+{
+  return inFits_->NbBlocks();
+}
 
 AnyDataObj* FITS_AutoReader::ReadObject(int hdunum) const
 {
+  if (hdunum<=0) 
+    {
+      throw PException(" FITS_AutoReader::ReadObject : hdu number must be positive");
+    }
   inFits_->ReadHeader(hdunum);
+  if (inFits_->IsFitsEOF()) return NULL;
+  if (inFits_->IsFitsERROR())
+    {
+      throw IOExc("FITS_AutoReader::ReadObject: FITSIO error in reading");
+    }
   DVList dvl=inFits_->DVListFromFits();
   string nameObj = dvl.GetS("CONTENT");
-  cout << " SOPHYA object identified as: " << dvl.GetS("CONTENT") << endl;
+  //    cout << " SOPHYA object identified as: " << dvl.GetS("CONTENT") << endl;
   if (nameObj == string("TArray") )
     {
@@ -83 +96 @@
   else
     {
-      throw IOExc("FITS_AutoReader::ReadObject : object not recognized as a  SOPHYA object");
+      cout << " WARNING ( FITS_AutoReader::ReadObject) : object not recognized as a  SOPHYA object" << endl;
+      return new DVList(dvl);
     }