Changeset 2712 for trunk/python

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).

File:

• trunk/python/sbseparator.py (modified) (10 diffs)

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