Changeset 2786 for trunk/src/STCalTsys.cpp

Timestamp:

03/11/13 12:46:39 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdcal2

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on handling data selection of input Scantable object.

File:

• trunk/src/STCalTsys.cpp (modified) (3 diffs)

trunk/src/STCalTsys.cpp

@@ -12 +12 @@
 
 #include <vector>
+
+#include <casa/Arrays/ArrayMath.h>
+#include <casa/Logging/LogIO.h>
+
 #include "STSelector.h"
 #include "STCalTsys.h"
@@ -18 +22 @@
 #include "STDefs.h"
 #include <atnf/PKSIO/SrcType.h>
-
-#include <casa/Arrays/ArrayMath.h>
 
 using namespace std;
@@ -32 +34 @@
 }
 
-void STCalTsys::setupSelector()
+void STCalTsys::setupSelector(const STSelector &sel)
 {
-  sel_.reset();
-  sel_.setIFs(iflist_);
+  sel_ = sel;
+  vector<int> ifnos = sel_.getIFs();
+  if (ifnos.size() > 0) {
+    int nif = 0;
+    int nifOrg = iflist_.size();
+    vector<int> iflistNew(iflist_);
+    for (int i = 0; i < nifOrg; i++) {
+      if (find(ifnos.begin(), ifnos.end(), iflist_[i]) != ifnos.end()) {
+        iflistNew[nif] = iflist_[i];
+        ++nif;
+      }
+    }
+    if (nif == 0) {
+      LogIO os(LogOrigin("STCalTsys", "setupSelector", WHERE));
+      os << LogIO::SEVERE << "Selection contains no data." << LogIO::EXCEPTION;
+    }
+    sel_.setIFs(iflistNew);
+  }
+  else {
+    sel_.setIFs(iflist_);
+  }
 }