Changeset 2103 for branches/casa-prerelease/pre-asap/python

Timestamp:

04/05/11 15:36:14 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Merged bug fixes in trunk (r2101).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• python (modified) (1 prop)
• python/asapmath.py (modified) (2 diffs)

branches/casa-prerelease/pre-asap/python/asapmath.py

@@ -863 +863 @@
         verify:        verify calibration
     """
+    import re
     antname = scantab.get_antennaname()
     if ( calmode == 'nod' ):
@@ -874 +875 @@
         if ( antname.find( 'APEX' ) != -1 ):
             scal = apexcal( scantab, scannos, calmode, verify )
-        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1 ):
+        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1
+               or re.match('DV[0-9][0-9]$',antname) is not None
+               or re.match('PM[0-9][0-9]$',antname) is not None
+               or re.match('CM[0-9][0-9]$',antname) is not None
+               or re.match('DA[0-9][0-9]$',antname) is not None ):
             scal = almacal( scantab, scannos, calmode, verify )
         else: