Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/alma

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

    r712 r1757  
    55               'lines' : {} }
    66
     7asapmonhome = "/var/www/htdocs"
     8asapmonrel = "/asapmon/"
    79import os,sys
    8 # This is where asap lives
    9 sys.path.insert(2,'/opt/lib/python2.3/site-packages')
    10 os.environ["AIPSPATH"]="/opt/share/asap linux_gnu somewhere localhost"
    11 
    12 #overwrite /usr/local/... as default
    13 sys.path.insert(2,'/usr/lib/python2.3/site-packages')
    14 
    15 # This is needed for plotting with matplotlib
    16 # where matplotlib data is located
    17 os.environ["MATPLOTLIBDATA"]="/opt/share/matplotlib"
    1810# where matplotlib puts it temporary font files
    1911# this location can also have a custom .matplotlibrc
    20 os.environ["HOME"]="/var/www/asapmon/tmp"
     12os.environ["HOME"]="/var/www/htdocs/asapmon/tmp"
  • branches/alma/monitor/cgi-bin/asapmon.py

    r1295 r1757  
    77from simpletal import simpleTAL, simpleTALES
    88
    9 #absolute home
    10 abspath= "/var/www/asapmon/"
    11 cgiloc = "/cgi-bin/asapmon/"
    12 tmppath = os.path.join(abspath,"tmp/")
    13 htmlloc = "/asapmon/"
    14 tmploc = "/asapmon/tmp/"
    15 
    169from obsconfig import *
     10
     11tmppath = os.path.join(asapmonhome,"tmp/")
     12tmppath = os.path.join(asapmonrel,"tmp/")
    1713
    1814# a redirection object for stdout/stderr
     
    2824sys.stderr = logsink2
    2925import asap
     26asap.rc('scantable', storage="memory")
    3027sys.stdout = sys.__stdout__
    3128sys.stderr = sys.__stderr__
     
    5855    def decodeWindow(self,window):
    5956        if not len(window.strip()): return None,None
    60         x = window.split(", ")
     57        x = window.split(",")
    6158        return [float(x[0].strip()), float(x[1].strip())]
    6259
     
    167164            else:
    168165                # get only the last source in the table if not averaging
    169                 s = s.get_scan(self.fields['sourcenames'][-1])
    170                 #self.fields['debug'] = "DEBUG"
     166                # This doesn't work anymore, but works on the command-line??
     167                # Use explict selection
     168                #s = s.get_scan(str(self.fields['sourcenames'][-1]))
     169                sel = asap.selector()
     170                sel.set_name(str(self.fields['sourcenames'][-1]))
     171                s.set_selection(sel)
     172                s = s.copy()
    171173                self.fields['csource'] = s.get_sourcename()[-1]
    172174            if self.fields['cunit'] == 1:
    173                 srest = s._getrestfreqs()
    174                 if isinstance(srest, tuple) and len(srest) != s.nif():
    175                     s.set_restfreqs(restfs, unit="GHz")
     175                s.set_restfreqs(restfs, unit="GHz")
    176176            s.set_unit(self.fields['units'][self.fields['cunit']])
    177177            s.set_freqframe(self.form.getfirst("frame", "LSRK"))
     
    213213            rcp['figure.subplot.wspace'] = 0.3
    214214            rcp['figure.subplot.hspace'] = 0.3
    215             del asap.plotter
     215            #del asap.plotter
    216216            # plotter without GUI
    217217            asap.plotter = asap.asapplotter(False)
     
    259259        self.setDefaultFields()
    260260        title = "ASAP %s Online Monitor" % (observatory['name'])
    261         tmplname = abspath+"asapmon.html.template"
     261        tmplname = asapmonhome+"asapmon.html.template"
    262262        if ( self.form.has_key("plot")):
    263263            self.plotForm()
  • branches/alma/monitor/cgi-bin/obsconfig.py

    r712 r1757  
    55
    66# Append observing directories
    7 observatory['rpfpath'].append("/u/mar637/brage/singledish/data")
    8 observatory['rpfpath'].append("/u/mar637/brage/singledish/data/mopra200505")
    9 observatory['rpfpath'].append("/u/mar637/brage/singledish/data/mopra/phoenix")
     7observatory['rpfpath'].append("/DATA/MPCCC1_1/corr/dat/")
    108
    119# Restfrequencies in GHz
Note: See TracChangeset for help on using the changeset viewer.