Changeset 1757 for branches/alma/monitor

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• monitor/cgi-bin/asapconfig.py (modified) (1 diff)
• monitor/cgi-bin/asapmon.py (modified) (6 diffs)
• monitor/cgi-bin/obsconfig.py (modified) (1 diff)
• monitor/htdocs/asapmon.html.template (modified) (1 diff)
• monitor/htdocs/prototype.js (copied) (copied from tags/asap-3.0.0/monitor/htdocs/prototype.js)

branches/alma/monitor/cgi-bin/asapconfig.py

@@ -5 +5 @@
                'lines' : {} }
 
+asapmonhome = "/var/www/htdocs"
+asapmonrel = "/asapmon/"
 import os,sys
-# This is where asap lives
-sys.path.insert(2,'/opt/lib/python2.3/site-packages')
-os.environ["AIPSPATH"]="/opt/share/asap linux_gnu somewhere localhost"
-
-#overwrite /usr/local/... as default
-sys.path.insert(2,'/usr/lib/python2.3/site-packages')
-
-# This is needed for plotting with matplotlib
-# where matplotlib data is located
-os.environ["MATPLOTLIBDATA"]="/opt/share/matplotlib"
 # where matplotlib puts it temporary font files
 # this location can also have a custom .matplotlibrc
-os.environ["HOME"]="/var/www/asapmon/tmp"
+os.environ["HOME"]="/var/www/htdocs/asapmon/tmp"

branches/alma/monitor/cgi-bin/asapmon.py

@@ -7 +7 @@
 from simpletal import simpleTAL, simpleTALES
 
-#absolute home
-abspath= "/var/www/asapmon/"
-cgiloc = "/cgi-bin/asapmon/"
-tmppath = os.path.join(abspath,"tmp/")
-htmlloc = "/asapmon/"
-tmploc = "/asapmon/tmp/"
-
 from obsconfig import *
+
+tmppath = os.path.join(asapmonhome,"tmp/")
+tmppath = os.path.join(asapmonrel,"tmp/")
 
 # a redirection object for stdout/stderr
@@ -28 +24 @@
 sys.stderr = logsink2
 import asap
+asap.rc('scantable', storage="memory")
 sys.stdout = sys.__stdout__
 sys.stderr = sys.__stderr__
@@ -58 +55 @@
     def decodeWindow(self,window):
         if not len(window.strip()): return None,None
-        x = window.split(", ")
+        x = window.split(",")
         return [float(x[0].strip()), float(x[1].strip())]
 
@@ -167 +164 @@
             else:
                 # get only the last source in the table if not averaging
-                s = s.get_scan(self.fields['sourcenames'][-1])
-                #self.fields['debug'] = "DEBUG"
+                # This doesn't work anymore, but works on the command-line??
+                # Use explict selection
+                #s = s.get_scan(str(self.fields['sourcenames'][-1]))
+                sel = asap.selector()
+                sel.set_name(str(self.fields['sourcenames'][-1]))
+                s.set_selection(sel)
+                s = s.copy()
                 self.fields['csource'] = s.get_sourcename()[-1]
             if self.fields['cunit'] == 1:
-                srest = s._getrestfreqs()
-                if isinstance(srest, tuple) and len(srest) != s.nif():
-                    s.set_restfreqs(restfs, unit="GHz")
+                s.set_restfreqs(restfs, unit="GHz")
             s.set_unit(self.fields['units'][self.fields['cunit']])
             s.set_freqframe(self.form.getfirst("frame", "LSRK"))
@@ -213 +213 @@
             rcp['figure.subplot.wspace'] = 0.3
             rcp['figure.subplot.hspace'] = 0.3
-            del asap.plotter
+            #del asap.plotter
             # plotter without GUI
             asap.plotter = asap.asapplotter(False)
@@ -259 +259 @@
         self.setDefaultFields()
         title = "ASAP %s Online Monitor" % (observatory['name'])
-        tmplname = abspath+"asapmon.html.template"
+        tmplname = asapmonhome+"asapmon.html.template"
         if ( self.form.has_key("plot")):
             self.plotForm()

branches/alma/monitor/cgi-bin/obsconfig.py

@@ -5 +5 @@
 
 # Append observing directories
-observatory['rpfpath'].append("/u/mar637/brage/singledish/data")
-observatory['rpfpath'].append("/u/mar637/brage/singledish/data/mopra200505")
-observatory['rpfpath'].append("/u/mar637/brage/singledish/data/mopra/phoenix")
+observatory['rpfpath'].append("/DATA/MPCCC1_1/corr/dat/")
 
 # Restfrequencies in GHz

branches/alma/monitor/htdocs/asapmon.html.template

@@ -4 +4 @@
     <head>
         <title tal:content="title">ASAP Online Monitor</title>
-        <link rel="stylesheet" href="/asaptest/fields.css" type="text/css">
+        <link rel="stylesheet" href="/asapmon/asapmon.css" type="text/css">
         <script type="text/javascript" src="/asapmon/prototype.js"></script>
         <script type="text/javascript" src="/asapmon/asapmon.js"></script>