Changeset 1722

Timestamp:

04/15/10 15:09:34 (14 years ago)

Author:

Malte Marquarding

Message:

Adjusted skydip method after feedback from Kate Brooks

File:

• trunk/python/opacity.py (modified) (4 diffs)

trunk/python/opacity.py

@@ -6 +6 @@
 from asap import selector
 from asap import rcParams
+from asap import xyplotter
 
 def _import_data(data):
-    if not hasattr(data, "__len__"):
+    if not isinstance(data, (list,tuple)):
         if isinstance(data, scantable):
             return data
@@ -57 +58 @@
         plot:       Plot each fit (airmass vs. Tsys). Default is 'False'
     """
+    rcsave = rcParams['verbose']
+    rcParams['verbose'] = False
     scan = _import_data(data)
     f = fitter()
@@ -68 +71 @@
         sel.set_ifs(ino)
         opacity = []
+        fits = []
+        airms = []
+        tsyss = []
+
+        if plot:
+            xyplotter.cla()
+            xyplotter.ioff()
+            xyplotter.clf()
+            xyplotter.xlabel("Airmass")
+            xyplotter.ylabel(r"$T_{sys}$")
         for pno in pnos:
             sel.set_polarisations(pno)
             scan.set_selection(basesel+sel)
+            freq = scan.get_coordinate(0).get_reference_value()/1e9
+            freqstr = "%0.4f GHz" % freq
             tsys = scan.get_tsys()
             elev = scan.get_elevation()
             airmass = [ 1./math.sin(i) for i in elev ]
+            airms.append(airmass)
+            tsyss.append(tsys)
             f.set_data(airmass, tsys)
             f.fit()
-            if plot:
-                f.plot(residual=True, plotparms=True)
-                raw_input("Hit <return> for next fit...")
+            fits.append(f.get_fit())
             params = f.get_parameters()["params"]
             opacity.append(params[1]/tsky)
@@ -85 +100 @@
         else:
             opacities += opacity
+        if plot:
+            colors = ['b','g','k']
+            for i in range(len(airms)):
+                xyplotter.plot(airms[i], tsyss[i], 'o', color=colors[i])
+                xyplotter.plot(airms[i], fits[i], '-', color=colors[i])
+                xyplotter.figtext(0.7,0.3-(i/30.0),
+                                  r"$\tau_{fit}=%0.2f$" % opacity[i],
+                                  color=colors[i])
+            if averagepol:
+                xyplotter.figtext(0.7,0.3-(len(airms)/30.0),
+                                  r"$\tau=%0.2f$" % opacities[-1],
+                                  color='r')
+            xyplotter.title("IF%d : %s" % (ino, freqstr))
+
+            xyplotter.ion()
+            xyplotter.draw()
+            raw_input("Hit <return> for next fit...")
         sel.reset()
+
     scan.set_selection(basesel)
+    rcParams['verbose'] = rcsave
+    if plot:
+        xyplotter.close()
     return opacities