Changeset 2786 for trunk

Timestamp:

03/11/13 12:46:39 (12 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.

Location:

trunk/src

Files:

• STCalSkyOtfAlma.cpp (modified) (1 diff)
• STCalSkyOtfAlma.h (modified) (1 diff)
• STCalSkyPSAlma.cpp (modified) (2 diffs)
• STCalSkyPSAlma.h (modified) (1 diff)
• STCalTsys.cpp (modified) (3 diffs)
• STCalTsys.h (modified) (1 diff)
• STCalibration.cpp (modified) (1 diff)
• STCalibration.h (modified) (2 diffs)

trunk/src/STCalSkyOtfAlma.cpp

@@ -30 +30 @@
 {}
 
-void STCalSkyOtfAlma::setupSelector()
+void STCalSkyOtfAlma::setupSelector(const STSelector &sel)
 {
-  sel_.reset();
+  sel_ = sel;
 
   // Detect edges using EdgeMarker

trunk/src/STCalSkyOtfAlma.h

@@ -41 +41 @@
   
 protected:
-  virtual void setupSelector();
+  virtual void setupSelector(const STSelector &sel);
   //virtual void fillCalTable();
 

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);
+  }
 }
 

trunk/src/STCalSkyPSAlma.h

@@ -42 +42 @@
   
 protected:
-  virtual void setupSelector();
+  virtual void setupSelector(const STSelector &sel);
   virtual void fillCalTable();
 };

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_);
+  }
 }
 

trunk/src/STCalTsys.h

@@ -43 +43 @@
   
 private:
-  void setupSelector();
+  void setupSelector(const STSelector &sel);
   void fillCalTable();
 

trunk/src/STCalibration.cpp

@@ -25 +25 @@
 {
   STSelector selOrg = scantable_->getSelection();
-  setupSelector();
+  setupSelector(selOrg);
   scantable_->setSelection(sel_);
   

trunk/src/STCalibration.h

@@ -25 +25 @@
 #include "STDefs.h"
 #include "STApplyTable.h"
+#include "STSelector.h"
 
 namespace asap {
@@ -47 +48 @@
 
 protected:
-  virtual void setupSelector() = 0;
+  virtual void setupSelector(const STSelector &sel) = 0;
   virtual void fillCalTable() = 0;