Changeset 1040 for trunk/web/tutorials

Timestamp:

04/27/06 14:08:06 (19 years ago)

Author:

mar637

Message:

Web doc update for usage of ASAP v2

Location:

trunk/web/tutorials

Files:

• tutorial.html (modified) (4 diffs)
• tutorial2.html (modified) (2 diffs)

trunk/web/tutorials/tutorial.html

@@ -67 +67 @@
 plotter.plot(s) # plot s
 </pre></div>
-Now we can build the quotient. This applies the quotient to both IFs. We are taking all scans ending in "_S" to be "on" source and all "_R" to be "off".
+Now we can build the quotient. This applies the quotient to both IFs.
 <div class=code><pre>
-q = quotient(s.get_scan("*_S"),s.get_scan("*_R"))
+q = auto_quotient()
 plotter.plot(q) # plot q
 </pre></div>
@@ -77 +77 @@
 q.set_restfreqs(restfreqs,"GHz") # set the restfrequencies, as not in data
 q.set_unit("km/s")               # set the unit to be used from now on
-q.set_freqframe("LSRK")          # set frequency frame 
-plotter.plot()                   # replot, should show velocity now 
+q.set_freqframe("LSRK")          # set frequency frame
+plotter.plot()                   # replot, should show velocity now
 </pre></div>
-Now we can subtract a baseline. ASAP can do this automatically if ther is good S/N and the lines aren't too broad. 
+Now we can subtract a baseline. ASAP can do this automatically if ther is good S/N and the lines aren't too broad.
 <div class=code><pre>
 q.auto_poly_baseline() # determine and subtract a poly baseline automatically
@@ -115 +115 @@
 <div class=code><pre>
 f = fitter()
+</pre></div>
+We start with the first spectrum (IF=0) bys setting the selection. We want to fit two gaussian components.
+<div class=code><pre>
+sel = selector()
+sel.set_ifs(0)
+q.set_selection(sel)
 f.set_scan(q)
-</pre></div>
-We start with the first spectrum (IF=0) bys setting the cursor. We want to fits to gaussian components.
-<div class=code><pre>
-q.set_cursor(IF=0)
 f.set_function(gauss=2) # fit two gaussians
 f.fit()
@@ -126 +128 @@
 The second IFs spectrum is more complex. We select it and fit seven gaussians to it. Here we also plot residuals, the individual components and the fit parameters.
 <div class=code><pre>
-q.set_cursor(IF=1)
+sel.set_ifs(1)
+q.set_selection(sel)
 f.set_function(gauss=7)
 f.fit()

trunk/web/tutorials/tutorial2.html

@@ -88 +88 @@
 quotients = []                        # to hold the quotient scantables
 for scan in vec:                      # loop over input scantables
-   on = scan.get_source("*_S")        
-   off = scan.get_source("*_R")
-   quotients.append(quotient(on,off)) # add this quotient to the vector
+   quotients.append(scan.auto_quotient()) # add this quotient to the vector
 </pre></div>
 Let's have a look at the vector, and subtract a baseline
@@ -96 +94 @@
 for q in quotients:
    print q
-   q.auto_poly_baseline(order=1,insitu=True) 
+   q.auto_poly_baseline(order=1,insitu=True)
 </pre></div>
 Now we average the lot together: