Changeset 2580 for trunk/python

Timestamp:

06/28/12 14:22:10 (12 years ago)

Author:

ShinnosukeKawakami

Message:

hpc33 merged asap-trunk

Location:

trunk

Files:

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

trunk/python/asapmath.py

@@ -915 +915 @@
     stm = stmath()
     antname = scantab.get_antennaname()
-    ssub = scantab.get_scan( scannos )
-    scal = scantable( stm.cwcal( ssub, calmode, antname ) )
+    selection=selector()
+    selection.set_scans(scannos)
+    orig = scantab.get_selection()
+    scantab.set_selection(orig+selection)
+##     ssub = scantab.get_scan( scannos )
+##     scal = scantable( stm.cwcal( ssub, calmode, antname ) )
+    scal = scantable( stm.cwcal( scantab, calmode, antname ) )
+    scantab.set_selection(orig)
     return scal
 
@@ -932 +938 @@
     from asap._asap import stmath
     stm = stmath()
-    ssub = scantab.get_scan( scannos )
-    scal = scantable( stm.almacal( ssub, calmode ) )
+    selection=selector()
+    selection.set_scans(scannos)
+    orig = scantab.get_selection()
+    scantab.set_selection(orig+selection)
+##     ssub = scantab.get_scan( scannos )
+##     scal = scantable( stm.almacal( ssub, calmode ) )
+    scal = scantable( stm.almacal( scantab, calmode ) )
+    scantab.set_selection(orig)
     return scal