Changeset 2711 for trunk/src/STSideBandSep.h

Timestamp:

12/27/12 17:37:43 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-4141/CSV-1526)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Added asap.sbseparator.set_lo1root() = SBSeparator::set_lo1root(),

and STSideBandSep::setLO1Root()

Test Programs:

Put in Release Notes: No

Module(s): sbseparator and STSideBandSep

Description:

Added a new python method asap.sbseparator.set_lo1root() to set MS
name to search for LO1 frequency.
Underlying c++ functions are SBSeparator::set_lo1root (interface) and STSideBandSep::setLO1Root().
Also developed a capability to get relevant table names from scantable header and
fill frequencies of image side band.

File:

• trunk/src/STSideBandSep.h (modified) (3 diffs)

trunk/src/STSideBandSep.h

@@ -54 +54 @@
    **/
   void setLO1(const double lo1, string frame="TOPO", double reftime=-1, string refdir="");
-  void setLO1Asdm(const string asdmname);
+  void setLO1Root(const string name);
   /**
    * Actual calculation of frequencies of image sideband
@@ -62 +62 @@
 private:
   Bool checkFile(const string name, string type="");
-  bool getLo1FromAsdm(string asdmname);
-  bool getLo1FromTab(casa::CountedPtr< Scantable > &scantab);
+  bool getLo1FromAsdm(const string asdmname,
+                      const double refval, const double refpix,
+                      const double increment, const int nChan);
+  bool getLo1FromAsisTab(const string msname,
+                         const double refval, const double refpix,
+                         const double increment, const int nChan);
+  bool getLo1FromScanTab(casa::CountedPtr< Scantable > &scantab,
+                         const double refval, const double refpix,
+                         const double increment, const int nChan);
 
   unsigned int sigIfno_;
@@ -71 +78 @@
   double loTime_;
   string loDir_;
-  string asdmName_;
+  string asdmName_, asisName_;
 
   CountedPtr< Scantable > imgTab_p, sigTab_p;