Changeset 1204


Ignore:
Timestamp:
08/29/06 14:15:56 (18 years ago)
Author:
mar637
Message:

Changes from trunk, whcih accidentally got added there instead of here.

Location:
tags/Release2.1.0b
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tags/Release2.1.0b/python/scantable.py

    r1199 r1204  
    640640        self._add_history("flag", varlist)
    641641
    642     def lag_flag(self, frequency, unit="GHz", width=0.0, insitu=None):
     642    def lag_flag(self, frequency, width=0.0, unit="GHz", insitu=None):
    643643        """
    644644        Flag the data in 'lag' space by providing a frequency to remove.
     
    646646        No taper is applied.
    647647        Parameters:
    648             frequency:    the frequency to remove
    649             unit:         the frequency unit ()default "GHz")
    650             width:        the width of the frequency to remove
     648            frequency:    the frequency (really a period within the bandwidth) to remove
     649            width:        the width of the frequency to remove, to remove a range
     650                          of frequencies aroung the centre.
     651            unit:         the frequency unit (default "GHz")
     652        Notes:
     653            It is recommended to flag edges of the band or strong signals beforehand.
    651654        """
    652655        if insitu is None: insitu = rcParams['insitu']
     
    14301433                            preserve: Output = Toff * (on/off) - Toff
    14311434                            remove:   Output = Toff * (on/off) - Ton
    1432         """
     1435    """
    14331436        if mask is None: mask = ()
    14341437        varlist = vars()
     
    14361439        preoff = scantable(self._math._mx_extract(self, 'off'))
    14371440        off = preoff.average_time(mask=mask, weight=weight, scanav=False)
    1438         from asapmath  import quotient
     1441    from asapmath  import quotient
    14391442        q = quotient(on, off, preserve)
    14401443        q._add_history("mx_quotient", varlist)
    14411444        print_log()
    1442         return q
     1445    return q
    14431446
    14441447    def freq_switch(self, insitu=None):
  • tags/Release2.1.0b/src/STMath.cpp

    r1199 r1204  
    14071407      }
    14081408      Vector<Complex> lags;
    1409       ffts.fft(lags, spec);
     1409      ffts.fft0(lags, spec);
    14101410      Int start =  max(0, lag0);
    14111411      Int end =  min(Int(lags.nelements()-1), lag1);
     
    14171417        }
    14181418      }
    1419       ffts.fft(spec, lags);
     1419      ffts.fft0(spec, lags);
    14201420      specCol.put(i, spec);
    14211421    }
Note: See TracChangeset for help on using the changeset viewer.