Changeset 1370 in Sophya

Timestamp:

Jan 3, 2001, 6:01:30 PM (25 years ago)

Author:

aubourg

Message:

flag handling

Location:

trunk/ArchTOIPipe

Files:

• Kernel/asciitoiwtr.cc (modified) (2 diffs)
• Kernel/asciitoiwtr.h (modified) (2 diffs)
• Kernel/fitstoiwtr.h (modified) (1 diff)
• Kernel/toi.cc (modified) (3 diffs)
• TestPipes/tsttoi2.cc (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/asciitoiwtr.cc

@@ -6 +6 @@
 {
   name = "ascii writer";
+  outFlags = false;
 }
 
 ASCIITOIWriter::~ASCIITOIWriter()
 {}
+
+void ASCIITOIWriter::setOutFlags(bool yn) {
+  outFlags = yn;
+}
 
 void ASCIITOIWriter::addInput(string name, TOI* toi) {
@@ -39 +44 @@
       double x = getData(i, sn);
       s << x << "   ";
+      if (outFlags) {
+        int_4 f = getFlag(i, sn);
+        s << f << "   ";
+      }
     }
     s << '\n';

trunk/ArchTOIPipe/Kernel/asciitoiwtr.h

@@ -14 +14 @@
   
   virtual void  addInput(string name, TOI* toi);
+  virtual void  setOutFlags(bool yn = true);
 
   virtual void  run();  
@@ -21 +22 @@
   ofstream s;
   vector<TOI*> fwinputs;
+  bool outFlags;
 };
 

trunk/ArchTOIPipe/Kernel/fitstoiwtr.h

@@ -20 +20 @@
   virtual void  setOutFlags(bool yn = true);
 
-  //virtual void  init();  
   virtual void  run();  
   

trunk/ArchTOIPipe/Kernel/toi.cc

@@ -212 +212 @@
 #ifndef NO_SOPHYA
 Array TOIRegularWindow::doGetData(int iStart, int iEnd) {
-  if (!isDataAvailNL(iStart, iEnd)) throw RangeCheckError("TOI::getData : data not available");
+  if (!isDataAvailNL(iStart, iEnd)) {
+    throw RangeCheckError("TOI::getData : data not available");
+  }
   Array dat(iEnd - iStart + 1);
   long j0 = iStart - i0;
@@ -223 +225 @@
 
 double TOIRegularWindow::doGetData(int i) {
-  if (isDataAvailNL(i) != DATA_OK) throw RangeCheckError("TOI::getData : data not available");
+  if (isDataAvailNL(i) != DATA_OK) {
+    cerr << "TOI::getData : data not available " << i << endl;
+    throw RangeCheckError("TOI::getData : data not available");
+  }
   double dat = data[i - i0];
   return dat;
@@ -242 +247 @@
 
 int_4 TOIRegularWindow::doGetFlag(int i) {
-  if (!isDataAvailNL(i)) throw RangeCheckError("TOI::getData : data not available");
+  if (isDataAvailNL(i) != DATA_OK) {
+    cerr << "TOI::getFlag : data not available " << i << endl;
+    throw RangeCheckError("TOI::getFlag : data not available");
+  }
   return flags[i - i0]; 
 }

trunk/ArchTOIPipe/TestPipes/tsttoi2.cc

@@ -12 +12 @@
   FITSTOIReader r(argv[1]); cout << "reader created" << endl;
   FITSTOIWriter w(argv[2]);
-
+  w.setOutFlags(true);
   
   TOI* toi = new TOIRegularWindow("t1");