Changeset 2707 for trunk/python

Timestamp:

12/26/12 16:35:37 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-4141)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

• a new c++ class, STSideBandSep and its python interface.
• a new method set_lo1 in the sbseparator module.

Test Programs: manual tests by CSV scientists.

Put in Release Notes: No

Module(s): STSidebandSep (a new class) and sbseparator

Description:

Added a new c++ class, STSideBandSep, and its python interface (python_STSideBandSep.cpp).
The class works on calculating frequency information of image side band and fill scantable.
Also added a new python method, set_lo1(double), in sbseparator module. This is to allow
user to set LO1 frequency to solve frequencies of image side band manually.

File:

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

trunk/python/sbseparator.py

@@ -9 +9 @@
 from asap.selector import selector
 from asap.asapgrid import asapgrid2
-#from asap._asap import sidebandsep
+from asap._asap import SBSeparator
 
 class sbseparator:
@@ -49 +49 @@
         self.solveother = False
         self.dirtol = [1.e-5, 1.e-5] # direction tolerance in rad (2 arcsec)
+        self.lo1 = 0.
 
         self.tables = []
@@ -166 +167 @@
         Set shift mode and channel shift of image band.
 
-        mode       : shift mode ['DSB'|'SSB']
+        mode       : shift mode ['DSB'|'SSB'(='2SB')]
                      When mode='DSB', imageshift is assumed to be equal
                      to the shift of signal sideband but in opposite direction.
@@ -172 +173 @@
                      each scantable. valid only mode='SSB'
         """
-        if mode.upper().startswith("S"):
+        if mode.upper().startswith("D"):
+            # DSB mode
+            self.dsbmode = True
+            self.imageShift = []
+        else:
             if not imageshift:
                 raise ValueError, "Need to set shift value of image sideband"
@@ -178 +183 @@
             self.imageShift = imageshift
             asaplog.push("Image sideband shift is set manually: %s" % str(self.imageShift))
-        else:
-            # DSB mode
-            self.dsbmode = True
-            self.imageShift = []
 
     @asaplog_post_dec
@@ -213 +214 @@
         if flag:
             asaplog.push("Expert mode: solution are obtained by subtraction of the other sideband.")
+
+    def set_lo1(self,lo1):
+        """
+        Set LO1 frequency to calculate frequency of image sideband.
+
+        lo1 : LO1 frequency in float
+        """
+        if isinstance(lo1, dict) and lo1["unit"] == "Hz":
+            self.lo1 = lo1["value"]
+        else:
+            self.lo1 = float(lo1)
+        if self.lo1 <= 0.:
+            asaplog.push("Got negative LO1 frequency. It will be ignored.")
+            asaplog.post("WARN")
 
 
@@ -229 +244 @@
 
         nshift = len(self.tables)
-        signaltab = self._grid_outtable(self.tables[0].copy())
+        signaltab = self._grid_outtable(self.tables[0])
         if self.getboth:
             imagetab = signaltab.copy()
@@ -249 +264 @@
             signal = self._solve_signal(spec_array, tabidx)
             signaltab.set_spectrum(signal, irow)
+
+            # Solve image side side band
             if self.getboth:
                 image = self._solve_image(spec_array, tabidx)
                 imagetab.set_spectrum(image, irow)
-        
+
         # TODO: Need to remove rejrow form scantables here
         signaltab.flag_row(rejrow)
@@ -267 +284 @@
                 shutil.rmtree(signalname)
         signaltab.save(signalname)
+
         if self.getboth:
             # Warnings
@@ -281 +299 @@
                 else:
                     shutil.rmtree(imagename)
+            # Update frequency information
+            sbsep = SBSeparator()
+            sbsep.set_imgtable(imagetab)
+            if self.lo1 > 0.:
+                sbsep.set_lo1(self.lo1)
+            sbsep.solve_imgfreq()
             imagetab.save(imagename)
+            del sbsep
 
 
@@ -340 +365 @@
         gridder = asapgrid2(table)
         gridder.setIF(self.baseif)
-        
+
         cellx = str(self.dirtol[0])+"rad"
         celly = str(self.dirtol[1])+"rad"
@@ -346 +371 @@
         mapx = dirarr[0].max() - dirarr[0].min()
         mapy = dirarr[1].max() - dirarr[1].min()
-        nx = max(1, numpy.ceil(mapx/self.dirtol[0]))
+        centy = 0.5 * (dirarr[1].max() + dirarr[1].min())
+        nx = max(1, numpy.ceil(mapx*numpy.cos(centy)/self.dirtol[0]))
         ny = max(1, numpy.ceil(mapy/self.dirtol[0]))
 
@@ -393 +419 @@
                 seltab = tab.copy()
                 seltab.set_selection(selector(rows=selrow))
-            
+
             if tab.nrow() > 1:
                 asaplog.push("table %d - More than a spectrum selected. averaging rows..." % (itab))
@@ -414 +440 @@
 
         return spec_array[0:nspec], tabidx
-            
+
 
     @asaplog_post_dec
@@ -452 +478 @@
             asaplog.post()
             asaplog.push("IFNO is not selected. Using the first IF in the first scantable. Reference IFNO = %d" % (self.baseif))
-        
+
         if not (self.baseif in valid_ifs):
             asaplog.post()
@@ -460 +486 @@
 
         asaplog.push("Start selecting tables and IFNOs to solve.")
-        asaplog.push("Cheching frequency of the reference IF")
+        asaplog.push("Checking frequency of the reference IF")
         unit_org = stab.get_unit()
         coord = stab._getcoordinfo()
@@ -473 +499 @@
         baseinc = spx[1]-spx[0]
         self.nchan = len(spx)
-        if isinstance(self.freqtol, float):
-            vftol = abs(baseinc * self.freqtol)
+        # frequency tolerance
+        if isinstance(self.freqtol, dict) and self.freqtol['unit'] == "Hz":
+            vftol = abs(self.freqtol['value'])
+        else:
+            vftol = abs(baseinc * float(self.freqtol))
             self.freqtol = dict(value=vftol, unit="Hz")
-        else:
-            vftol = abs(self.freqtol['value'])
+        # tolerance of frequency increment
         inctol = abs(baseinc/float(self.nchan))
         asaplog.push("Reference frequency setup (Table = 0, IFNO = %d):  nchan = %d, chan0 = %f Hz, incr = %f Hz" % (self.baseif, self.nchan, basech0, baseinc))
         asaplog.push("Allowed frequency tolerance = %f Hz ( %f channels)" % (vftol, vftol/baseinc))
         poltype0 = stab.poltype()
-        
+
         self.tables = []
         self.signalShift = []
@@ -545 +573 @@
             asaplog.post()
             errmsg = "User defined channel shift of image sideband has %d elements, while selected IFNOs are %d" % (len(self.imageShift), len(self.signalShift))
+            errmsg += "\nThe frequency tolerance (freqtol) you set may be too small."
             raise RuntimeError, errmsg
 
@@ -557 +586 @@
         for itab in range(len(self.tables)):
             self.tables[itab] = self.tables[itab].average_time(scanav=False, weight="tintsys")
-        
+
+#     @asaplog_post_dec
+#     def _setup_image_freq(self, table):
+#         # User defined coordinate
+#         # Get from associated MS
+#         # Get from ASDM
+#         lo1 = -1.
+#         if self.lo1 > 0.:
+#             asaplog.push("Using user defined LO1 frequency %e16.12 [Hz]" % self.lo1)
+#             lo1 = self.lo1
+#         else:
+#             print "NOT IMPLEMENTED YET!!!"
 
 #     def save(self, outfile, outform="ASAP", overwrite=False):