Changeset 1439 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Mar 13, 2001, 7:23:14 PM (25 years ago)

Author:

ansari

Message:

Correction bugs, protections, ameliorations - Reza 13/3/2001

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoiwtr.cc (modified) (3 diffs)
• fitstoiwtr.h (modified) (1 diff)
• toiprocessor.cc (modified) (5 diffs)

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -32 +32 @@
 }
 
-
-void FITSTOIWriter::run() {
-  cout << "fitstoiwriter running" << endl;
-  // init done here
-  delete[] inTOIs;
+void FITSTOIWriter::afterinit()
+{
+  if (inTOIs) delete[] inTOIs;
   inTOIs = new (TOI*[fwinputs.size()]);
 
@@ -42 +40 @@
     inTOIs[i] = fwinputs[i];
   }
+  
+}
+
+void FITSTOIWriter::run() {
+  cout << "fitstoiwriter running" << endl;
+  // init done here
+  afterinit();
+  inited=true;
 
   int ndata = inIx.size();
@@ -54 +60 @@
   colunits[0] = "integer";
 
+  cout << " FITSTOIWriter::run() - Creating output FITS file: "
+       << name << endl;
+
+  vector<string> coln;
+  int ck=0;
   for (map<string, int>::iterator ii = inIx.begin(); ii != inIx.end(); ii++) {
     int j = (*ii).second;
-    string n = (*ii).first;
+    coln.push_back((*ii).first);
     if (outFlags) j += j;
-    colnames[j+1] = const_cast<char*>(n.c_str());
+    colnames[j+1] = const_cast<char*>(coln[ck].c_str());  
+    cout << " Column[" << j+1 << "] Name=" << coln[ck] << endl;
+    ck++;
     coltypes[j+1] = "1D";
-    colunits[j+1] = "?";
+    colunits[j+1] = "double";
     if (outFlags) {
-      colnames[j+2] = const_cast<char*>((n+"_flg").c_str());
+      coln.push_back("fg_" + coln[ck-1]); 
+      colnames[j+2] = const_cast<char*>(coln[ck].c_str());  
+      cout << " Column[" << j+1 << "] -Flag- Name=" << coln[ck] << endl;
+      ck++;
       coltypes[j+2] = "1D";
-      colunits[j+2] = "?";
+      colunits[j+2] = "IntFlag";
     }
   }

trunk/ArchTOIPipe/Kernel/fitstoiwtr.h

@@ -16 +16 @@
   ~FITSTOIWriter();
   
+  virtual void afterinit();
+
   virtual void  addInput(string name, TOI* toi);
 

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -47 +47 @@
   inTOIs = new (TOI*[inIx.size()]);
   for(i=0; i<inIx.size(); i++) 
-    inTOIs[i] = NULL;
+    inTOIs[i] = NULL;     // Protection-Initialisation - Reza  11/3/2001
   outTOIs = new (TOI*[outIx.size()]);
   for(i=0; i<outIx.size(); i++) 
-    outTOIs[i] = NULL;
+    outTOIs[i] = NULL;    // Protection-Initialisation - Reza  11/3/2001
 }
 
@@ -80 +80 @@
   for (int i=0; i<nIn; i++) {
     TOI* toi = inTOIs[i];
+    if (toi == NULL) continue;  // Protection - Reza  13/3/2001
     int x = toi->getMinSn();
     if (x > minIn) minIn = x;
@@ -91 +92 @@
   for (int i=0; i<nIn; i++) {
     TOI* toi = inTOIs[i];
+    if (toi == NULL) continue;  // Protection - Reza  13/3/2001
     int x = toi->getMaxSn();
     if (x < maxIn) maxIn = x;
@@ -163 +165 @@
 void TOIProcessor::PrintStatus(ostream & os) 
 {
+  chkinit();
   os << " TOIProcessor::PrintStatus() - Name= " << name 
      << " MinIn=" << getMinIn() << " MaxIn=" << getMaxIn() << endl;
@@ -191 +194 @@
   if (i == inIx.end()) throw NotFoundExc("TOIProcessor::addInput "+
                                          name+" not declared");
-  inTOIs[(*i).second] = toi; 
+  inTOIs[(*i).second] = toi;
+  toi->addConsumer(this);   // $CHECK$  Reza 13/3/2001 
 }