Changeset 2923 for trunk

Timestamp:

04/08/14 11:28:23 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6382

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_tsdcal2

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Implement averaged Tsys calibration.

Location:

trunk/src

Files:

• CalibrationManager.cpp (modified) (5 diffs)
• CalibrationManager.h (modified) (1 diff)
• STCalTsys.cpp (modified) (2 diffs)
• STCalTsys.h (modified) (3 diffs)

trunk/src/CalibrationManager.cpp

@@ -37 +37 @@
     calmode_(""),
     spwlist_(0),
-    spwlist_withrange_()
+    spwlist_withrange_(),
+    do_average_(false)
 {
   applicator_ = new STApplyCal();
@@ -155 +156 @@
   os_ << LogIO::DEBUGGING << ((average) ? "with averaging" : "without averaging") << LogIO::POST;
   spwlist_withrange_ = spwlist;
+  do_average_ = average;
 }
 
@@ -165 +167 @@
   spwlist_.clear();
   spwlist_withrange_ = Record();
+  do_average_ = false;
 }
 
@@ -175 +178 @@
   spwlist_.clear();
   spwlist_withrange_ = Record();
+  do_average_ = false;
 }
 
@@ -192 +196 @@
     }
     else {
-      uInt nfield = spwlist_withrange_.nfields();
-      vector<int> spwlist(nfield);
-      for (uInt i = 0; i < nfield; ++i) {
-        spwlist[i] = std::atoi(spwlist_withrange_.name(i).c_str());
-      }
-      STCalTsys cal(target_, spwlist);
+      STCalTsys cal(target_, spwlist_withrange_, do_average_);
       cal.calibrate();
       tsystables_.push_back(cal.applytable());

trunk/src/CalibrationManager.h

@@ -76 +76 @@
   std::vector<int> spwlist_;
   casa::Record spwlist_withrange_;
+  bool do_average_;
 
   casa::LogIO os_;

trunk/src/STCalTsys.cpp

@@ -25 +25 @@
 
 namespace asap {
-  STCalTsys::STCalTsys(CountedPtr<Scantable> &s, vector<int> &iflist)
-    : STCalibration(s, "TSYS"),
-      iflist_(iflist)
+STCalTsys::STCalTsys(CountedPtr<Scantable> &s, vector<int> &iflist)
+  : STCalibration(s, "TSYS"),
+    iflist_(iflist),
+    tsysspw_(),
+    do_average_(false)
 {
+  applytable_ = new STCalTsysTable(*s);
+}
+
+STCalTsys::STCalTsys(CountedPtr<Scantable> &s, Record &iflist, bool average)
+  : STCalibration(s, "TSYS"),
+    iflist_(),
+    tsysspw_(iflist),
+    do_average_(average)
+{
+  iflist_.resize(tsysspw_.nfields());
+  for (uInt i = 0; i < tsysspw_.nfields(); ++i) {
+    iflist_[i] = std::atoi(tsysspw_.name(i).c_str());
+  }
   applytable_ = new STCalTsysTable(*s);
 }
@@ -63 +78 @@
 {
   STCalTsysTable *p = dynamic_cast<STCalTsysTable *>(&(*applytable_));
-  p->appenddata(scanno, cycleno, beamno, ifno, polno,
-                freqid, time, elevation, any_data);
+  if (do_average_ && tsysspw_.isDefined(String::toString(ifno))) {
+    LogIO os(LogOrigin("STCalTsys", "appenddata", WHERE));
+    Vector<Float> averaged_data(any_data.size());
+    Float averaged_value = 0.0;
+    uInt num_value = 0;
+    Vector<Double> channel_range = tsysspw_.asArrayDouble(String::toString(ifno));
+    os << LogIO::DEBUGGING << "do averaging: channel range for IFNO " << ifno << " is " << channel_range << LogIO::POST;
+    for (uInt i = 1; i < channel_range.size(); i += 2) {
+      uInt start = (uInt)channel_range[i-1];
+      uInt end = std::min((uInt)channel_range[i] + 1, (uInt)averaged_data.size());
+      os << LogIO::DEBUGGING << "start=" << start << ", end=" << end << LogIO::POST;
+      for (uInt j = start; j < end; ++j) {
+        averaged_value += any_data[j];
+        num_value++;
+      }
+    }
+    averaged_value /= (Float)num_value;
+    averaged_data = averaged_value;
+    os << LogIO::DEBUGGING << "averaged_data = " << averaged_data << LogIO::POST;
+    os << LogIO::DEBUGGING << "any_data = " << any_data << LogIO::POST;
+    p->appenddata(scanno, cycleno, beamno, ifno, polno,
+                  freqid, time, elevation, averaged_data);
+  }
+  else {
+    p->appenddata(scanno, cycleno, beamno, ifno, polno,
+                  freqid, time, elevation, any_data);
+  }
 }
 

trunk/src/STCalTsys.h

@@ -20 +20 @@
 #include <casa/BasicSL/String.h>
 #include <casa/Utilities/CountedPtr.h>
+#include <casa/Containers/Record.h>
 
 #include <scimath/Mathematics/InterpolateArray1D.h>
@@ -39 +40 @@
 public:
   STCalTsys(casa::CountedPtr<Scantable> &s, vector<int> &iflist);
+  STCalTsys(casa::CountedPtr<Scantable> &s, casa::Record &iflist, bool average=false);
 
   ~STCalTsys() {;}
@@ -50 +52 @@
 
   vector<int> iflist_;
+  casa::Record tsysspw_;
+  bool do_average_;
 };