Changeset 2580 for trunk/python


Ignore:
Timestamp:
06/28/12 14:22:10 (12 years ago)
Author:
ShinnosukeKawakami
Message:

hpc33 merged asap-trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/python

  • trunk/python/asapmath.py

    r2574 r2580  
    915915    stm = stmath()
    916916    antname = scantab.get_antennaname()
    917     ssub = scantab.get_scan( scannos )
    918     scal = scantable( stm.cwcal( ssub, calmode, antname ) )
     917    selection=selector()
     918    selection.set_scans(scannos)
     919    orig = scantab.get_selection()
     920    scantab.set_selection(orig+selection)
     921##     ssub = scantab.get_scan( scannos )
     922##     scal = scantable( stm.cwcal( ssub, calmode, antname ) )
     923    scal = scantable( stm.cwcal( scantab, calmode, antname ) )
     924    scantab.set_selection(orig)
    919925    return scal
    920926
     
    932938    from asap._asap import stmath
    933939    stm = stmath()
    934     ssub = scantab.get_scan( scannos )
    935     scal = scantable( stm.almacal( ssub, calmode ) )
     940    selection=selector()
     941    selection.set_scans(scannos)
     942    orig = scantab.get_selection()
     943    scantab.set_selection(orig+selection)
     944##     ssub = scantab.get_scan( scannos )
     945##     scal = scantable( stm.almacal( ssub, calmode ) )
     946    scal = scantable( stm.almacal( scantab, calmode ) )
     947    scantab.set_selection(orig)
    936948    return scal
    937949
Note: See TracChangeset for help on using the changeset viewer.