Changeset 1387 for branches/alma/src/STFiller.cpp

Timestamp:

07/27/07 02:00:22 (17 years ago)

Author:

TakTsutsumi

Message:

merged from NRAO version of ASAP 2.1 with ALMA specific modifications

File:

• branches/alma/src/STFiller.cpp (modified) (9 diffs)

branches/alma/src/STFiller.cpp

@@ -26 +26 @@
 
 #include <atnf/PKSIO/PKSreader.h>
+#include <casa/System/ProgressMeter.h>
+
 
 #include "STDefs.h"
@@ -117 +119 @@
                                   header_->freqref,
                                   header_->utc, header_->reffreq,
-                                  header_->bandwidth);
+                                  header_->bandwidth,
+                                  header_->fluxunit);
 
   if (status) {
@@ -135 +138 @@
   // Determine Telescope and set brightness unit
 
+
   Bool throwIt = False;
   Instrument inst = STAttr::convertInstrument(header_->antennaname, throwIt);
-  header_->fluxunit = "Jy";
+  //header_->fluxunit = "Jy";
   if (inst==ATMOPRA || inst==TIDBINBILLA) {
      header_->fluxunit = "K";
@@ -184 +188 @@
   reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False);
   table_->setHeader(*header_);
+  //For MS, add the location of POINTING of the input MS so one get
+  //pointing data from there, if necessary.
+  //Also find nrow in MS 
+  nInDataRow = 0;
+  if (format == "MS2") {
+    Path datapath(inName); 
+    String ptTabPath = datapath.absoluteName();
+    Table inMS(ptTabPath);
+    nInDataRow = inMS.nrow();
+    ptTabPath.append("/POINTING");
+    table_->table().rwKeywordSet().define("POINTING", ptTabPath);
+    if ((header_->antennaname).matches("GBT")) {
+      String GOTabPath = datapath.absoluteName();
+      GOTabPath.append("/GBT_GO");
+      table_->table().rwKeywordSet().define("GBT_GO", GOTabPath);
+    }
+  }
+     
 }
 
@@ -209 +231 @@
   Complex         xCalFctr;
   Vector<Complex> xPol;
+  Double min = 0.0;
+  Double max = nInDataRow;
+  ProgressMeter fillpm(min, max, "Data importing progress");
+  int n = 0;
   while ( status == 0 ) {
     status = reader_->read(scanNo, cycleNo, mjd, interval, fieldName,
@@ -220 +246 @@
                           spectra, flagtra, xCalFctr, xPol);
     if ( status != 0 ) break;
+    n += 1;
+    
     Regex filterrx(".*[SL|PA]$");
     Regex obsrx("^AT.+");
@@ -250 +278 @@
     RecordFieldPtr<String> srcnCol(rec, "SRCNAME");
     RecordFieldPtr<Int> srctCol(rec, "SRCTYPE");
+    RecordFieldPtr<String> fieldnCol(rec, "FIELDNAME");
+    *fieldnCol = fieldName;
     // try to auto-identify if it is on or off.
     Regex rx(".*[e|w|_R]$");
@@ -340 +370 @@
       row.put(table_->table().nrow()-1, rec);
     }
+    fillpm._update(n);
   }
   if (status > 0) {
@@ -345 +376 @@
     throw(AipsError("Reading error occured, data possibly corrupted."));
   }
+  fillpm.done();
   return status;
 }