Changeset 2712 for trunk

Timestamp:

12/28/12 13:35:27 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-4141)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added temporal methods to set scantable to STSideBandSep for a workaround.

Test Programs:

Put in Release Notes: No

Module(s): STSideBandSep and sbseparator

Description:

Enabled getting LO1 frequency based on information in scantable header
(if necessary information exists).

Location:

trunk

Files:

• python/sbseparator.py (modified) (10 diffs)
• src/STSideBandSep.cpp (modified) (4 diffs)
• src/STSideBandSep.h (modified) (2 diffs)
• src/python_STSideBandSep.cpp (modified) (1 diff)

trunk/python/sbseparator.py

@@ -57 +57 @@
         self.set_data(infiles)
         
-        self.separator = SBSeparator()
+        self._separator = SBSeparator()
 
     @asaplog_post_dec
@@ -75 +75 @@
                     raise TypeError, "Input data is not a list of scantables."
 
-            #self.separator._setdata(infiles)
+            #self._separator._setdata(infiles)
             self._reset_data()
             self.intables = infiles
@@ -85 +85 @@
                     raise ValueError, "Could not find input file '%s'" % name
             
-            #self.separator._setdataname(infiles)
+            #self._separator._setdataname(infiles)
             self._reset_data()
             self.intables = infiles
@@ -200 +200 @@
         Set rejection limit of solution.
         """
-        #self.separator._setlimit(abs(threshold))
+        #self._separator._setlimit(abs(threshold))
         self.rejlimit = threshold
         asaplog.push("The threshold of rejection is set to %f" % self.rejlimit)
@@ -230 +230 @@
             asaplog.post("WARN")
         else:
-            self.separator.set_lo1(lo1val)
+            self._separator.set_lo1(lo1val)
 
 
@@ -241 +241 @@
                'ASDM_RECEIVER' tables.
         """
-        self.separator.set_lo1root(name)
+        self._separator.set_lo1root(name)
 
 
@@ -253 +253 @@
         """
         # List up valid scantables and IFNOs to convolve.
-        #self.separator._separate()
+        #self._separator._separate()
         self._setup_shift()
         #self._preprocess_tables()
+
+        ### TEMPORAL ###
+        self._separator._get_asistb_from_scantb(self.tables[0])
+        ################
 
         nshift = len(self.tables)
@@ -314 +318 @@
                     shutil.rmtree(imagename)
             # Update frequency information
-            self.separator.set_imgtable(imagetab)
-            self.separator.solve_imgfreq()
+            self._separator.set_imgtable(imagetab)
+            self._separator.solve_imgfreq()
             imagetab.save(imagename)
 
@@ -613 +617 @@
 #             raise RuntimeError, "Output file '%s' already exists" % outfile
 # 
-#         #self.separator._save(outfile, outform)
+#         #self._separator._save(outfile, outform)
 
 #     def done(self):
@@ -620 +624 @@
 #     def close(self):
 #         pass
-#         #del self.separator
+#         #del self._separator
     
 

trunk/src/STSideBandSep.cpp

@@ -130 +130 @@
 #endif
 };
+
+///// TEMPORAL FUNCTION!!! /////
+void STSideBandSep::setScanTb0(const ScantableWrapper &s){
+  st0_ = s.getCP();
+};
+////////////////////////////////
 
 void STSideBandSep::solveImageFreqency()
@@ -229 +235 @@
     // Try getting ASDM name from scantable header
     os << "Try getting information from scantable header" << LogIO::POST;
-    if (!getLo1FromScanTab(imgTab_p, sigrefval, refpix, increment, nChan)) {
+    if (!getLo1FromScanTab(st0_, sigrefval, refpix, increment, nChan)) {
       //throw AipsError("Failed to get LO1 frequency from asis table");
       os << LogIO::WARN << "Failed to get LO1 frequency using information in scantable." << LogIO::POST;
@@ -333 +339 @@
 {
   LogIO os(LogOrigin("STSideBandSep","getLo1FromScanTab()", WHERE));
-  Table& tab = scantab->table();
   // Check for relevant tables.
+  const TableRecord &rec = scantab->table().keywordSet() ;
   String spwname, recname;
-  try {
-    spwname = tab.keywordSet().asString("ASDM_SPECTRALWINDOW");
-    recname = tab.keywordSet().asString("ASDM_RECEIVER");
-  } catch (...) {
+  if (rec.isDefined("ASDM_SPECTRALWINDOW") && rec.isDefined("ASDM_RECEIVER")){
+    spwname = rec.asString("ASDM_SPECTRALWINDOW");
+    recname = rec.asString("ASDM_RECEIVER");
+  }
+  else {
     // keywords are not there
     os << LogIO::WARN
@@ -353 +360 @@
   const String recsuff = "/ASDM_RECEIVER";
   String::size_type pos;
-  pos = recname.size()-recsuff.size()-1;
+  pos = recname.size()-recsuff.size();
   if (recname.substr(pos) == recsuff)
-    msname = recname.substr(0, pos-1);
+    msname = recname.substr(0, pos);
   else
     throw(AipsError("Internal error in parsing table name from a scantable keyword."));

trunk/src/STSideBandSep.h

@@ -47 +47 @@
 
   /**
-   * Set separated scantable to fill frequencies of image sideband (temporal)
+   * Set scantable to fill frequencies of image sideband (temporal)
    **/
   void setImageTable(const ScantableWrapper &s);
+  void setScanTb0(const ScantableWrapper &s);
   /**
    * Set additional information to fill frequencies of image sideband
@@ -80 +81 @@
   string asdmName_, asisName_;
 
-  CountedPtr< Scantable > imgTab_p, sigTab_p;
+  CountedPtr<Scantable> imgTab_p, sigTab_p;
+  // TEMPORAL member
+  CountedPtr<Scantable> st0_;
 
 }; // class

trunk/src/python_STSideBandSep.cpp

@@ -31 +31 @@
     .def( "set_imgtable", &STSideBandSep::setImageTable )
     .def( "solve_imgfreq", &STSideBandSep::solveImageFreqency )
+    .def( "_get_asistb_from_scantb", &STSideBandSep::setScanTb0 )
   ;
 };