Changeset 2065 in Sophya for trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

Timestamp:

Jun 18, 2002, 9:15:04 PM (23 years ago)

Author:

ansari

Message:

Debug de setSepFlagFile (3) - Reza 18/6/2002

File:

• trunk/ArchTOIPipe/Kernel/fitstoirdr.cc (modified) (5 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.34 2002-06-18 18:51:06 ansari Exp $
+// $Id: fitstoirdr.cc,v 1.35 2002-06-18 19:15:04 ansari Exp $
 
 #include "fitstoirdr.h"
@@ -110 +110 @@
       throw IOExc("FITSTOIReader::openFile() - sepFlagfile fits_movabs_hdu(2) fitsio error");
     }
-    long nrowsflg;
+    long nrowsflg = 0;
     fits_get_num_rows(fptrflg,&nrowsflg,&fstatus);
     if (nrows != nrowsflg) {
       cerr << " FITSTOIReader::openFile()/Error: Different NRows in flag and data files!" << endl;
+      fits_unlock();
+      throw ParmError("FITSTOIReader::openFile() Different NRows in flag and data files");
+    }
+    int ncolsflg = 0;
+    fits_get_num_cols(fptr,&ncolsflg,&fstatus);    
+    if (ncolsflg < sepFlagCols.size()) {
+      cerr << " FITSTOIReader::openFile()/Error: ncolsflg (=" << ncolsflg
+           << ") < sepFlagCols.size() (=" << sepFlagCols.size() << ")" << endl;
       fits_unlock();
       throw ParmError("FITSTOIReader::openFile() Different NRows in flag and data files");
@@ -259 +267 @@
 
       if (sepFlagfile) { // Ajout Reza (18/6/2002) pour fichier de flags separe
-        int sflg;
+        unsigned char sflg;
         flg = 0;
         for(int skf=0; skf<sepFlagCols.size(); skf++) {
-          fits_read_col_int(fptrflg, skf+1, i+1,1,1,0,&sflg,&anyNul,&fstatus);
+          fits_read_col_byt(fptrflg, skf+1, i+1,1,1,0,&sflg,&anyNul,&fstatus);
           if (sflg) flg |= sepFlagCols[skf];
         }
@@ -309 +317 @@
 
  // Ajout Reza (18/6/2002) pour fichier de flags separe
- int* stmpflg = NULL; 
- if (sepFlagfile) stmpflg = new int[Buff_Sz];
+ unsigned char* stmpflg = NULL; 
+ if (sepFlagfile) stmpflg = new unsigned char[Buff_Sz];
  long nonzeroflg = 0;
  long nbckflg = 0;
@@ -365 +373 @@
        //--- Ajout Reza (18/6/2002) pour fichier de flags separe
        if (sepFlagfile) { 
-         uint_8 sflg = 0;
          int sjj;
          for(sjj=0; sjj<n; sjj++) colflg[k][sjj] = 0;
          for(int skf=0; skf<sepFlagCols.size(); skf++) {
-           fits_read_col_int(fptrflg, skf+1, ideb+1,1,n,0,stmpflg,&anyNul,&fstatus);
+           fits_read_col_byt(fptrflg, skf+1, ideb+1,1,n,0,stmpflg,&anyNul,&fstatus);
+           if (fstatus !=0) {
+             fits_report_error(stderr,fstatus);
+             cerr << " RzBug - skf=" << skf << " ideb= " << ideb << endl;  
+           }
            for(sjj=0; sjj<n; sjj++) {
              nbckflg++;
-             if (stmpflg) { 
+             if (stmpflg[sjj]) { 
                nonzeroflg++;
                colflg[k][sjj] |= sepFlagCols[skf];