Changeset 999 for trunk/src/STWriter.cpp

Timestamp:

04/06/06 16:12:55 (18 years ago)

Author:

mar637

Message:

added "redundant" fields from reader. The aren't used in asap but should be passed on for consistency.

File:

• trunk/src/STWriter.cpp (modified) (6 diffs)

trunk/src/STWriter.cpp

@@ -149 +149 @@
   }
 
-  Double          srcVel = 0.0;
+  Double          srcVel;
 
   String          fieldName, srcName, tcalTime;
   Vector<Float>   calFctr, sigma, tcal, tsys;
-  Vector<Double>  direction(2), scanRate(2), srcDir(2), srcPM(2,0.0);
+  Vector<Double>  direction(2), scanRate(2), srcDir(2), srcPM(2);
   Matrix<Float>   spectra;
   Matrix<uChar>   flagtra;
@@ -171 +171 @@
       Vector<Double> direction = dirCol(0).getAngle("rad").getValue();
       TableIterator cycit(btable, "CYCLENO");
+      ROArrayColumn<Double> srateCol(btable, "SCANRATE");
+      srateCol.get(0, scanRate);
+      ROArrayColumn<Double> spmCol(btable, "SRCPROPERMOTION");
+      spmCol.get(0, srcPM);
+      ROArrayColumn <Double> sdirCol(btable, "SRCDIRECTION");
+      sdirCol.get(0, srcDir);
+      ROScalarColumn<Double> svelCol(btable, "SRCVELOCITY");
+      svelCol.get(0, srcVel);
       Int cycno = 1;
       while (!cycit.pastEnd() ) {
@@ -219 +227 @@
                                       rec.asString("FIELDNAME"),
                                       rec.asString("SRCNAME"),
-                                      direction,
-                                      srcPM, srcVel, // not in scantable yet
+                                      srcDir, srcPM, srcVel,
                                       ifno,
                                       refFreqNew, nchan*abs(cdelt), cdelt,
@@ -234 +241 @@
                                       rec.asInt("REFBEAMNO")+1, beamno,
                                       direction,
-                                      scanRate,// not in scantable
+                                      scanRate,
                                       tsys,
                                       sigma, calFctr,// not in scantable
@@ -245 +252 @@
             throw(AipsError("STWriter: Failed to export Scantable."));
           }
-
+          ++count;
           ++ifno;
           ++ifit;
@@ -259 +266 @@
   }
   ostringstream oss;
-  oss << "STWriter: wrote " << count << " rows to " << filename << endl;
+  oss << "STWriter: wrote " << count << " rows to " << filename;
   pushLog(String(oss));
   writer_->close();