Changeset 999 for trunk

Timestamp:

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

Author:

mar637

Message:

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

Location:

trunk/src

Files:

• STFiller.cpp (modified) (1 diff)
• STWriter.cpp (modified) (6 diffs)
• Scantable.cpp (modified) (1 diff)

trunk/src/STFiller.cpp

@@ -227 +227 @@
     TableRow row(table_->table());
     TableRecord& rec = row.record();
+    // fields that don't get used and are just passed through asap
+    RecordFieldPtr<Array<Double> > srateCol(rec, "SCANRATE");
+    *srateCol = scanRate;
+    RecordFieldPtr<Array<Double> > spmCol(rec, "SRCPROPERMOTION");
+    *spmCol = srcPM;
+    RecordFieldPtr<Array<Double> > sdirCol(rec, "SRCDIRECTION");
+    *sdirCol = srcDir;
+    RecordFieldPtr<Double> svelCol(rec, "SRCVELOCITY");
+    *svelCol = srcVel;
+    // the real stuff
     RecordFieldPtr<Int> fitCol(rec, "FIT_ID");
     *fitCol = -1;

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();

trunk/src/Scantable.cpp

@@ -234 +234 @@
   td.addColumn(ScalarColumnDesc<uInt>("FOCUS_ID"));
   td.addColumn(ScalarColumnDesc<uInt>("WEATHER_ID"));
+
+  // columns which just get dragged along, as they aren't used in asap
+  td.addColumn(ScalarColumnDesc<Double>("SRCVELOCITY"));
+  td.addColumn(ArrayColumnDesc<Double>("SRCPROPERMOTION"));
+  td.addColumn(ArrayColumnDesc<Double>("SRCDIRECTION"));
+  td.addColumn(ArrayColumnDesc<Double>("SCANRATE"));
 
   td.rwKeywordSet().define("OBSMODE", String(""));