Changeset 2041 in Sophya

Timestamp:

Jun 3, 2002, 4:23:39 PM (23 years ago)

Author:

ansari

Message:

Modifs fg_ --> FLAG_ ds FITSTOIReader et Writer , Reza 03/06/2002

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoirdr.cc (modified) (2 diffs)
• fitstoiwtr.cc (modified) (3 diffs)
• fitstoiwtr.h (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.28 2002-05-16 14:39:08 ansari Exp $
+// $Id: fitstoirdr.cc,v 1.29 2002-06-03 14:23:39 ansari Exp $
 
 #include "fitstoirdr.h"
@@ -107 +107 @@
     fits_get_colname(fptr, CASESEN, templt, colname, &colnum, &fstatus);
     cout << "FITSTOIReader col " << colname << endl;
-    if (!strncmp(colname, "fg_", 3)) {
+    // On verifie si c'est une colonne de flag 
+    if (!strncmp(colname, "fg_", 3) || !strncmp(colname, "FLAG_", 5) ) {
       colsinput[itoi].second=true;
     } else {

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoiwtr.cc,v 1.20 2001-11-27 22:05:41 aubourg Exp $
+// $Id: fitstoiwtr.cc,v 1.21 2002-06-03 14:23:39 ansari Exp $
 
 #include "fitstoiwtr.h"
@@ -25 +25 @@
   fits_unlock();
   name = "wtr";
-
+  setLongFlagPrefix();
   totnscount = 0;
 }
@@ -92 +92 @@
     if (p.second) {
       ck++;
-      coln[ck] = "fg_" + coln[ck-1]; 
+      if (longfgprefix) coln[ck] = "FLAG_" + coln[ck-1]; 
+      else coln[ck] = "fg_" + coln[ck-1]; 
       colnames[ck] = const_cast<char*>(coln[ck].c_str());  
       cout << " Column[" << ck << "] -Flag- Name=" << coln[ck] << endl;

trunk/ArchTOIPipe/Kernel/fitstoiwtr.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoiwtr.h,v 1.11 2001-11-22 16:54:54 cecile Exp $
+// $Id: fitstoiwtr.h,v 1.12 2002-06-03 14:23:39 ansari Exp $
 
 
@@ -31 +31 @@
 
   virtual void  run(); 
- 
+
+  inline void   setLongFlagPrefix(bool fg = true) { longfgprefix = fg; }
   inline int_8  ProcessedSampleCount() const { return totnscount; }
   
@@ -45 +46 @@
 
   int_8 totnscount;   // Nombre total d'echantillon processe
+  bool longfgprefix;  // if true ---> FLAG_ / sinon fg_ 
 };