Changeset 2711 for trunk/python

Timestamp:

12/27/12 17:37:43 (12 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/python/sbseparator.py (modified) (5 diffs)

trunk/python/sbseparator.py

@@ -49 +49 @@
         self.solveother = False
         self.dirtol = [1.e-5, 1.e-5] # direction tolerance in rad (2 arcsec)
-        self.lo1 = 0.
+        #self.lo1 = 0.
 
         self.tables = []
@@ -57 +57 @@
         self.set_data(infiles)
         
-        #self.separator = sidebandsep()
+        self.separator = SBSeparator()
 
     @asaplog_post_dec
@@ -221 +221 @@
         lo1 : LO1 frequency in float
         """
+        lo1val = -1.
         if isinstance(lo1, dict) and lo1["unit"] == "Hz":
-            self.lo1 = lo1["value"]
-        else:
-            self.lo1 = float(lo1)
-        if self.lo1 <= 0.:
+            lo1val = lo1["value"]
+        else:
+            lo1val = float(lo1)
+        if lo1val <= 0.:
             asaplog.push("Got negative LO1 frequency. It will be ignored.")
             asaplog.post("WARN")
+        else:
+            self.separator.set_lo1(lo1val)
+
+
+    def set_lo1root(self, name):
+        """
+        Set MS name which stores LO1 frequency of signal side band.
+        It is used to calculate frequency of image sideband.
+
+        name : MS name which contains 'ASDM_SPECTRALWINDOW' and
+               'ASDM_RECEIVER' tables.
+        """
+        self.separator.set_lo1root(name)
 
 
@@ -289 +303 @@
             asaplog.post()
             asaplog.push("Saving IMAGE sideband.")
-            asaplog.push("Note, frequency information of IMAGE sideband cannot be properly filled so far. (future development)")
-            asaplog.push("Storing frequency setting of SIGNAL sideband in FREQUENCIES table for now.")
-            asaplog.post("WARN")
+            #asaplog.push("Note, frequency information of IMAGE sideband cannot be properly filled so far. (future development)")
+            #asaplog.push("Storing frequency setting of SIGNAL sideband in FREQUENCIES table for now.")
+            #asaplog.post("WARN")
 
             imagename = outname + ".imageband"
@@ -300 +314 @@
                     shutil.rmtree(imagename)
             # Update frequency information
-            sbsep = SBSeparator()
-            sbsep.set_imgtable(imagetab)
-            if self.lo1 > 0.:
-                sbsep.set_lo1(self.lo1)
-            sbsep.solve_imgfreq()
+            self.separator.set_imgtable(imagetab)
+            self.separator.solve_imgfreq()
             imagetab.save(imagename)
-            del sbsep