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

Timestamp:

Jun 14, 2001, 3:39:07 PM (24 years ago)

Author:

aubourg

Message:

gestion des flags

File:

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

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -71 +71 @@
   fits_lock();
   // Dans cette version, on s'attend a ce que la premiere colonne soit le samplenum
+  int itoi=-1;
   for (int i=1; i<ncols; i++) {
     char templt[10];
@@ -78 +79 @@
     fits_get_colname(fptr, CASESEN, templt, colname, &colnum, &fstatus);
     cout << "FITSTOIReader col " << colname << endl;
-    declareOutput(colname);
+    if (!strncmp(colname, "fg_", 3)) {
+      colsinput[itoi].second=true;
+    } else {
+      declareOutput(colname);
+      itoi++;
+      colsinput[itoi] = pair<int,bool>(i,false);
+    }
   }
   fits_unlock();
@@ -130 +137 @@
     if (sn < mgr->getRequestedBegin()) continue;
     // if (sn < mgr->getRequestedBegin()+10) cout << "rdr out " << sn << endl;
-    for (int j=1; j<=ncols; j++) {
-      if ( !checkOutputTOIIndex(j-1) )  continue;  // Reza - Si TOI non connecte
+    for (int k=0; k<getNOut(); k++) {
+      int j = colsinput[k].first;
+      if ( !checkOutputTOIIndex(k) )  continue;  // Reza - Si TOI non connecte
       fits_lock();
       fits_read_col_dbl(fptr,j+1,i+1,1,1,0,&y,&anyNul,&fstatus);
+      long flg = 0;
+      if (colsinput[k].second) {
+        fits_read_col_lng(fptr,j+2,i+1,1,1,0,&flg,&anyNul,&fstatus);
+      }
       fits_unlock();
-      putData(j-1, sn, y);
+      putData(k, sn, y, flg);
     }
   }