Changeset 2786 for trunk/src/STCalSkyPSAlma.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/STCalSkyPSAlma.cpp (modified) (2 diffs)

trunk/src/STCalSkyPSAlma.cpp

@@ -12 +12 @@
 
 #include <vector>
+
+#include <casa/Logging/LogIO.h>
+
 #include "STSelector.h"
 #include "STCalSkyPSAlma.h"
@@ -29 +32 @@
 }
 
-void STCalSkyPSAlma::setupSelector()
+void STCalSkyPSAlma::setupSelector(const STSelector &sel)
 {
-  sel_.reset();
-  vector<int> types(1,SrcType::PSOFF);
-  sel_.setTypes(types);
+  sel_ = sel;
+  vector<int> types = sel_.getTypes();
+  if (types.size() == 0) {
+    types.resize(1);
+    types[0] = SrcType::PSOFF;
+    sel_.setTypes(types);
+  }
+  else if (find(types.begin(), types.end(), SrcType::PSOFF) == types.end()) {
+    LogIO os(LogOrigin("STCalSkyPSAlma", "setupSelector", WHERE));
+    os << LogIO::SEVERE << "Selection contains no data." << LogIO::EXCEPTION;
+  }
+  else {
+    types.resize(1);
+    types[0] = SrcType::PSOFF;
+    sel_.setTypes(types);
+  }
 }