Changeset 937 for trunk

Timestamp:

03/27/06 19:36:17 (19 years ago)

Author:

mar637

Message:

asap2 version of test script

Location:

trunk/test

Files:

• mopra.py (modified) (2 diffs)
• parkes-pol.py (modified) (2 diffs)
• tid.py (modified) (2 diffs)

trunk/test/mopra.py

@@ -6 +6 @@
 s = scantable("data/mopra_dualif.rpf")
 q = s.auto_quotient()
-q2 = quotient(s.get_scan("*_S"),s.get_scan("*_R"))
-del q2,s
+del s
 restfreqs = [110.201,86.243]     # 13CO-1/0, SiO the two IF
 q.set_restfreqs(restfreqs,"GHz") # set the restfrequencies, as not in data
@@ -21 +20 @@
 f = fitter()
 f.set_scan(q)
-q.set_cursor(IF=0)
+selection = selector()
+selection.setifs([1])
+q.set_selection(selection)
 f.set_function(gauss=2) # fit two gaussians
 f.fit()

trunk/test/parkes-pol.py

@@ -3 +3 @@
 
 rcParams['verbose'] = 0
+rcParams['plotter.ganged'] = 0
 
 # Don't plot to the screen...
@@ -16 +17 @@
 data_1665.set_freqframe('LSRK')
 
-# Make a copy for the 1667 transition
-data_1667 = data_1665.copy()
-data_1667.set_restfreqs(lines = ['OH1667'])
-data_1667.set_unit('km/s')
-data_1667.set_freqframe('LSRK')
+# Look at the first scan
+from asap._asap import selector
+selection = selector()
+selection._setscans([0])
+data_1665._setselection(selection)
 
+d1_5 = data_1665.copy()
+d1_7 = data_1665.copy()
 
-# Look at the first scan
-d1_5 = data_1665.get_scan(0)
-d1_7 = data_1667.get_scan(0)
+d1_7.set_restfreqs([1667.0],'MHz')
+# merge the two scans back together into a new scantable
+plotscans = merge(d1_5,d1_7)
+print plotscans.summary()
+del d1_5,d1_7
 
 # Baseline
-msk = d1_5.create_mask([-30,-25],[-5,0])
-d1_5.poly_baseline(msk,1)
-msk = d1_7.create_mask([-30,-25],[-5,0])
-d1_7.poly_baseline(msk,1)
-
+msk = plotscans.create_mask([-30,-25],[-5,0])
+plotscans.poly_baseline(msk,1)
 # Plot the results
-plotter.plot(d1_5,d1_7)
 plotter.set_mode('p','s')
 plotter.set_layout(2,1)
 plotter.set_range(-30,0)
-plotter.set_cursor(pol=['I','Q','U','V'])
-plotter.set_cursor(pol=['I','Plinear'])
-plotter.set_cursor(pol=['RR','LL'])
-plotter.save('output/parkes_rrll.png')
+selection._reset()
+selection._setpolstrings(['I','Q', 'U', 'V'])
+#plotter.set_selection(selection)
+#selection._setpolstrings(['I','Plinear'])
+#plotter.set_selection(selection)
+#selection._setpolstrings(['RR','LL'])
+plotter.plot(plotscans)
+plotter.set_selection(selection)
+plotter.save('/nfs/wwwpeople/mmarquar/parkes.png', dpi=80)
+#plotter.save('output/parkes_rrll.png')
 
 print "Parkes-Pol Test successful"

trunk/test/tid.py

@@ -4 +4 @@
 rcParams['verbose'] = 0
 
+rcParams['plotter.ganged'] = 0
 # Don't plot to the screen...
 del plotter
@@ -12 +13 @@
 # Create the quotient spectra
 data = scantable('data/tid-t002.rpf')
-s = data.get_scan('*[^we]')
-r = data.get_scan('*[we]')
-q = quotient(s,r)
-
+q = data.auto_quotient()
 # Set the restfreq for each IF
 q.set_restfreqs(freqs= [23694.4700e6,23722.6336e6])
 q.set_unit('km/s')
 q.set_freqframe('LSRK')
-
 # Align frequencies
-
-q.freq_align(perif=True)
-
+qa = q.freq_align(insitu=False)
 # Recalculate the az/el
-
-q.recalc_azel()
-
+qa.recalc_azel()
 # Correct for gain curve and opacity
-q.gain_el()
-q.opacity(0.075)
-
+qa.gain_el()
+qa.opacity(0.075)
 # Average in time
-av = average_time(q)
-
+av = qa.average_time()
 # Baseline
 msk=av.create_mask([-70,-50],[40,60])
 av.poly_baseline(msk,1)
-
-plotter.set_mode('i')
+plotter.set_mode('i','s')
 plotter.plot(av)
-plotter.save('output/tid.png')
+plotter.save('output/tid.png', dpi=80)
 
 # Do some random processing, just to test these functions