Changeset 3042 in Sophya for trunk

Timestamp:

Aug 7, 2006, 11:13:52 AM (19 years ago)

Author:

ansari

Message:

ajout possibilite de specifier numero HDU pour readfits (piappp) - Reza 06/08/2006

File:

• trunk/SophyaPI/ProgPI/fitsbtadapter.cc (modified) (5 diffs)

trunk/SophyaPI/ProgPI/fitsbtadapter.cc

@@ -126 +126 @@
 kw = "scanfits";
 usage = "scanfits: scan fits files and print information on each HDU\n" ;
-usage += "Usage: scanfits FileName [slev=0 ... 3]\n";
-usage += "slev=1,3: header keywords , slev=2,3: try to read each HDU";
+usage += "Usage: scanfits FileName [slev=0...3]\n";
+usage += "slev=1,3: header keywords , slev=2,3: try to read each HDU\n";
+usage += "See also: readfits writefits fitsadapt ";
 mpiac->RegisterCommand(kw, usage, this, hgrp); 
 
@@ -133 +134 @@
 usage = "writefits: Write objects to a fits file \n" ;
 usage += "Usage: writefits nameobj/pattern FileName \n";
-usage += "(use FitsManager) .... ";
-usage += "See also  scanfits readfits fitsadapt ";
+usage += "See also: scanfits readfits fitsadapt ";
 mpiac->RegisterCommand(kw, usage, this, hgrp); 
 
 kw = "readfits";
-usage = "readfits: Read all HDU's of a fits file \n" ;
-usage += "Usage: readfits nameobj/pattern FileName \n";
-usage += "(use FitsManager) .... ";
+usage = "readfits: Read one or all HDU's of a fits file \n" ;
+usage += "Usage: readfits FileName [num_hdu] \n";
+usage += " num_hdu=1,..,NbHDU (uses FitsManager) \n";
 usage += "See also  scanfits writefits fitsadapt ";
 mpiac->RegisterCommand(kw, usage, this, hgrp); 
@@ -207 +207 @@
 else if (kw == "readfits") {
   if(tokens.size() < 1)  {
-    cout<<"Usage: readfits FileName "<<endl;
+    cout<<"Usage: readfits FileName [num_hdu]"<<endl;
     return 1;
   }
-  cout << "readfits: Opening  fits file " << tokens[0] << endl;
+  cout << "readfits: Opening  fits file " << tokens[0];
   FitsInOutFile fis(tokens[0], FitsInOutFile::Fits_RO);
+  int k1 = 1;
+  int k2 = fis.NbHDUs();
+  if (fis.CurrentHDU() > 1) k1 = k2 = fis.CurrentHDU(); 
+  bool fgshdu = false;
+  if (tokens.size() > 1) {  // Numero de HDU specifie
+    k2 = k1 = atoi(tokens[1].c_str());
+    fgshdu = true;
+    cout << " - HDU Num " << k1 << endl;
+  }
+  else cout << " - HDU's " << k1 << "-" << k2 << endl;
+
   string bnom = omg.GetServiceObj()->FileName2Name(tokens[0]);
   string nom = bnom;
   char bun[16];
   int kon = 0;
-  for(int k=0; k<fis.NbHDUs(); k++) {
+  for(int k=k1; k<=k2; k++) {
     try {
+      if (fgshdu) fis.MoveAbsToHDU(k);
       FitsHandlerInterface* fhi = FitsManager::Read(fis);
       AnyDataObj* obj = fhi->DataObj();
@@ -228 +240 @@
        omg.AddObj(obj, nom, false);
        cout << "readfits: " << (string)typeid(*obj).name()
-            << "  read From HDU " << k+1 << " ->" << nom << endl;
+            << "  read From HDU " << k << " ->" << nom << endl;
       }
       else delete fhi; 
@@ -237 +249 @@
       cout << "readfits/Error - HDU=" << k+1 << " : " << exc.Msg() << endl;
     }
-    fis.MoveToNextHDU();
+    if (k<k2) fis.MoveToNextHDU();
   }
   return 0;