Changeset 1295 for trunk/monitor

Timestamp:

11/06/06 22:22:03 (18 years ago)

Author:

mar637

Message:

merge form Release2.1.1 branch

Location:

trunk/monitor/cgi-bin

Files:

• asapmon.py (modified) (14 diffs)
• filelist.py (modified) (3 diffs)

trunk/monitor/cgi-bin/asapmon.py

@@ -10 +10 @@
 abspath= "/var/www/asapmon/"
 cgiloc = "/cgi-bin/asapmon/"
-tmppath = abspath+"tmp/"
+tmppath = os.path.join(abspath,"tmp/")
 htmlloc = "/asapmon/"
 tmploc = "/asapmon/tmp/"
@@ -25 +25 @@
 logsink = WritableObject()
 logsink2 = WritableObject()
-sys.stdout =logsink
+sys.stdout = logsink
 sys.stderr = logsink2
 import asap
@@ -53 +53 @@
         out = []
         for i in fi:
-            out.append(p+"/"+fl.files[i])
+            out.append(os.path.join(p,fl.files[i]))
         return out
 
     def decodeWindow(self,window):
         if not len(window.strip()): return None,None
-        x = window.split(",")
-        return [float(x[0].strip()),float(x[1].strip())]
-
-    def decodeWindows(self,window):
+        x = window.split(", ")
+        return [float(x[0].strip()), float(x[1].strip())]
+
+    def decodeWindows(self, window):
         import re
         p = re.compile("(\\[*\d+\\.*\d*,\d+\\.*\d*\\]*)")
         r = re.compile("[\\[\\]]")
-        return [self.decodeWindow(re.sub(r,'',s)) for s in re.findall(p,window)]
+        return [self.decodeWindow(re.sub(r, '', s)) for s in re.findall(p, window)]
 
     def setDefaultFields(self):
@@ -80 +80 @@
         self.fields['imagename'] = ""
         self.fields['cunit'] = 0
-        self.fields['units'] = ["channel","km/s","GHz"]
+        self.fields['units'] = ["channel", "km/s", "GHz"]
         self.fields['baseline'] = 0
         self.fields['cpolyorder'] = 0
@@ -87 +87 @@
         self.fields['doppler'] = "RADIO"
         self.fields['frame'] = "LSRK"
-        self.fields['restn'] = [11,1]
+        self.fields['restn'] = [11, 1]
         self.fields['stokes'] = 0
         self.fields['summary'] = ""
@@ -98 +98 @@
 
     def getFormFields(self):
-        self.fields['cunit'] = int(self.form.getfirst("unit",0))
-        self.fields['frame'] = self.form.getfirst("frame","TOPO")
-        self.fields['doppler'] = self.form.getfirst("doppler","RADIO")
+        self.fields['cunit'] = int(self.form.getfirst("unit", 0))
+        self.fields['frame'] = self.form.getfirst("frame", "TOPO")
+        self.fields['doppler'] = self.form.getfirst("doppler", "RADIO")
         self.fields['restn'] = []
 
-        self.fields['plotwindow'] = self.form.getfirst("plotwindow","")
+        self.fields['plotwindow'] = self.form.getfirst("plotwindow", "")
         self.fields['baseline'] = int(self.form.has_key("baseline"))
-        self.fields['cpolyorder'] = int(self.form.getfirst("polyorder",0))
+        self.fields['cpolyorder'] = int(self.form.getfirst("polyorder", 0))
         self.fields['quotient'] = int(self.form.has_key("quotient"))
-        self.fields['doppler'] = self.form.getfirst("doppler","RADIO")
-        self.fields['frame'] = self.form.getfirst("frame","LSRK")
-        self.fields['cdir'] = int(self.form.getfirst("dlist",None))
+        self.fields['doppler'] = self.form.getfirst("doppler", "RADIO")
+        self.fields['frame'] = self.form.getfirst("frame", "LSRK")
+        self.fields['cdir'] = int(self.form.getfirst("dlist", None))
         self.fields['cfile'] = [int(k) for k in self.form.getlist("list")]
         self.fields['average'] = int(self.form.has_key("average"))
@@ -115 +115 @@
         self.fields['bin'] = int(self.form.has_key("bin"))
         self.fields['debug'] = ""#self.fields['restn']
-        self.fields['csource'] = self.form.getfirst("csource","")
+        self.fields['csource'] = self.form.getfirst("csource", "")
 
     def getRest(self):
@@ -140 +140 @@
             for i in self.fields['nif']:
                 name = "rest%d" % i
-                self.fields['restn'].append(int(self.form.getfirst(name,0)))
+                self.fields['restn'].append(int(self.form.getfirst(name, 0)))
             restfs = self.getRest()
 
@@ -151 +151 @@
                 if i:
                     # filter off scans
-                    i = not re.search(re.compile("_[R,e,w]$"),i) and i
+                    i = not re.search(re.compile("_[R, e, w]$"), i) and i
                     if i:
                         self.fields['sourcenames'].append(i)
@@ -162 +162 @@
                 if cs in self.fields['sourcenames']:
                     ss = s.get_scan(self.fields['csource'])
-                    if isinstance(ss,asap.scantable):
+                    if isinstance(ss, asap.scantable):
                         s = ss
                     del ss
@@ -172 +172 @@
             if self.fields['cunit'] == 1:
                 srest = s._getrestfreqs()
-                if isinstance(srest,tuple) and len(srest) != s.nif():
-                    s.set_restfreqs(restfs,unit="GHz")
+                if isinstance(srest, tuple) and len(srest) != s.nif():
+                    s.set_restfreqs(restfs, unit="GHz")
             s.set_unit(self.fields['units'][self.fields['cunit']])
-            s.set_freqframe(self.form.getfirst("frame","LSRK"))
-            s.set_doppler(self.form.getfirst("doppler","RADIO"))
+            s.set_freqframe(self.form.getfirst("frame", "LSRK"))
+            s.set_doppler(self.form.getfirst("doppler", "RADIO"))
 
             # baseline
@@ -189 +189 @@
                         self.fields['brangewindow'] = brstr
                         m = s.create_mask(brange)
-                        s.poly_baseline(mask=m,order=order)
+                        s.poly_baseline(mask=m, order=order)
                 else:
                     s.auto_poly_baseline(order=order)
@@ -217 +217 @@
             asap.plotter = asap.asapplotter(False)
             if outscans.nif() > 1:
-                asap.plotter.set_mode("p","i")
+                asap.plotter.set_mode("p", "i")
             else:
                 if outscans.npol() > 2:
-                    asap.plotter.set_mode("t","p")
+                    asap.plotter.set_mode("t", "p")
                 else:
-                    asap.plotter.set_mode("p","t")
+                    asap.plotter.set_mode("p", "t")
             asap.plotter.plot(outscans)
             if self.fields['stokes']:
@@ -231 +231 @@
                 sel.set_polarisations(pols)
                 asap.plotter.set_selection(sel)
-            x0,x1 = self.decodeWindow(self.fields['plotwindow'])
-            asap.plotter.set_range(x0,x1)
+            x0, x1 = self.decodeWindow(self.fields['plotwindow'])
+            asap.plotter.set_range(x0, x1)
             imname = tmppath+"plot.png"
-            asap.plotter.save(imname,dpi=96)
+            asap.plotter.save(imname, dpi=96)
             self.fields['imagename'] = tmploc+"plot.png"
-        except RuntimeError,e:
+        except RuntimeError, e:
             self.fields['debug'] = e
             return

trunk/monitor/cgi-bin/filelist.py

@@ -1 +1 @@
 #!/usr/bin/python
 import os
+import sre
 from obsconfig import observatory
 
 class FileList:
 
-    def __init__(self, loc=None):
+    def __init__(self, loc=None, projectcode=None):
         self.message ="""Content-Type: text/xml
 
 <?xml version="1.0" encoding="ISO-8859-1"?>"""
-
         self.error = None
         if loc is None:
@@ -21 +21 @@
                 loc = observatory['rpfpath'][loc]
         if os.path.exists(loc) and os.path.isdir(loc):
-            self.files = filter(lambda x: x.lower().endswith("rpf"), os.listdir(loc))
+            rx = sre.compile("\d{4}-\d{2}-d{2}_\d{4}-M\d{3}.rpf.*")
+            self.files = [ f for f in os.listdir(loc) if sre.match(rx, f) ]
+            if projectcode is not None:
+                self.files = [ f for f in self.files if sre.match(projectcode,
+                                                                  f) ]
             if len(self.files) == 0:
                 self.error = "No rpfits files found"
@@ -42 +46 @@
     import cgi
     form = cgi.FieldStorage()
+    pfilter = None
+    if form.has_key('project'):
+        pfilter = form.getfirst("project", None)
     if form.has_key('path'):
         pathindex = form.getfirst("path",0)
-        print FileList(pathindex)
+        print FileList(pathindex, pfilter)
     else:
         print FileList()