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

Timestamp:

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

Author:

aubourg

Message:

gestion des flags

File:

• trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc (modified) (9 diffs)

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -10 +10 @@
   fname = fn;
   fstatus = 0;
-  outFlags = false;
+  nCols = 1;
 
   // Open file
@@ -23 +23 @@
 }
 
-void FITSTOIWriter::setOutFlags(bool yn) {
-  outFlags = yn;
-}
 
-void FITSTOIWriter::addInput(string name, TOI* toi) {
+void FITSTOIWriter::addInput(string name, TOI* toi, bool withFlag) {
   declareInput(name);
+  int iTOI = fwinputs.size();
   fwinputs.push_back(toi);
+  colsinput[iTOI] = pair<int,bool>(nCols, withFlag);
+  nCols++;
+  if (withFlag) nCols++;
 }
 
@@ -50 +51 @@
 
   int ndata = inIx.size();
-  int ncols = inIx.size() * (outFlags ? 2 : 1) + 1;
+  //int ncols = inIx.size() * (outFlags ? 2 : 1) + 1;
 
-  char** colnames = new (char*[ncols]);
-  char** coltypes = new (char*[ncols]);
-  char** colunits = new (char*[ncols]);
+  char** colnames = new (char*[nCols]);
+  char** coltypes = new (char*[nCols]);
+  char** colunits = new (char*[nCols]);
 
   colnames[0] = "sampleNum";
@@ -63 +64 @@
        << fname << endl;
 
-  string * coln = new string[ncols];
+  string * coln = new string[nCols];
   for (map<string, int>::iterator ii = inIx.begin(); ii != inIx.end(); ii++) {
-    int j = (*ii).second;
-    if (outFlags) j += j;
-    int ck = j+1;
+    int jTOI = (*ii).second;
+    pair<int,bool> p = colsinput[jTOI];
+    int ck = p.first;
     coln[ck] = (*ii).first;
     colnames[ck] = const_cast<char*>(coln[ck].c_str());  
@@ -73 +74 @@
     coltypes[ck] = "1D";
     colunits[ck] = "double";
-    if (outFlags) {
+    if (p.second) {
       ck++;
       coln[ck] = "fg_" + coln[ck-1]; 
       colnames[ck] = const_cast<char*>(coln[ck].c_str());  
       cout << " Column[" << ck << "] -Flag- Name=" << coln[ck] << endl;
-      coltypes[ck] = "1I";
+      coltypes[ck] = "1J";
       colunits[ck] = "Int_8Flag";
     }
@@ -84 +85 @@
 
   fits_lock();
-  fits_create_tbl(fptr, BINARY_TBL, 0, ncols, colnames, coltypes, colunits, NULL, &fstatus);
+  fits_create_tbl(fptr, BINARY_TBL, 0, nCols, colnames, coltypes, colunits, NULL, &fstatus);
   fits_write_date(fptr, &fstatus);
   fits_unlock();
@@ -102 +103 @@
 
   double* tabdata = new double[ndata];
-  int* tabflag = new int[ndata]; // ? pas int_8 ?? $CHECK$ - Reza
+  int_8* tabflag = new int_8[ndata]; 
+  long* tabflagl = (long*) tabflag; // il faut int_8 == long, 
+                                    // c'est long long dans sophya
   bool* tabck = new bool[ndata];
   int i;
@@ -121 +124 @@
           getData(i,sn, out_val, out_flg);
           tabdata[i] = out_val;
-          if (outFlags) tabflag[i] = out_flg;
+          tabflag[i] = out_flg;
         }
       }
@@ -131 +134 @@
       
       for (i=0; i<ndata; i++) {
-        if (outFlags) {
-          fits_write_col_dbl(fptr, 2*i+2, fitsLine, 1, 1, tabdata+i, &fstatus);
-          fits_write_col_int(fptr, 2*i+3, fitsLine, 1, 1, tabflag+i, &fstatus);
-        } else {
-          fits_write_col_dbl(fptr, i+2, fitsLine, 1, 1, tabdata+i, &fstatus);
-        }
+        pair<int,bool> p = colsinput[i];
+        fits_write_col_dbl(fptr, p.first+1, fitsLine, 1, 1, tabdata+i, &fstatus);
+        if (p.second) {
+          fits_write_col_lng(fptr, p.first+2, fitsLine, 1, 1, tabflagl+i, &fstatus);
+        } 
         if (fstatus != 0) {
           cerr << "fitstoiwtr error sn = " << sn << " i = "<< i << endl;