Changeset 2130 for branches/casa-prerelease

Timestamp:

04/11/11 21:00:42 (14 years ago)

Author:

WataruKawasaki

Message:

merged bug fix from trunk (r2128)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/scantable.py (modified) (8 diffs)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

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

@@ -2090 +2090 @@
                            default is 1.0 (unit: spectral range). 
             clipthresh:    Clipping threshold. (default is 3.0, unit: sigma)
-            clipniter:     maximum number of iteration of 'clipthresh'-sigma clipping (default is 1)
+            clipniter:     maximum number of iteration of 'clipthresh'-sigma clipping (default is 0)
             plot:      *** CURRENTLY UNAVAILABLE, ALWAYS FALSE ***
                            plot the fit and the residual. In this each
@@ -2128 +2128 @@
         if maxwavelength is None: maxwavelength = 1.0
         if clipthresh    is None: clipthresh    = 3.0
-        if clipniter     is None: clipniter     = 1
+        if clipniter     is None: clipniter     = 0
         if plot          is None: plot          = False
         if getresidual   is None: getresidual   = True
@@ -2186 +2186 @@
                            default is 1.0 (unit: spectral range). 
             clipthresh:    Clipping threshold. (default is 3.0, unit: sigma)
-            clipniter:     maximum number of iteration of 'clipthresh'-sigma clipping (default is 1)
+            clipniter:     maximum number of iteration of 'clipthresh'-sigma clipping (default is 0)
             edge:          an optional number of channel to drop at
                            the edge of spectrum. If only one value is
@@ -2241 +2241 @@
         if maxwavelength  is None: maxwavelength  = 1.0
         if clipthresh     is None: clipthresh     = 3.0
-        if clipniter      is None: clipniter      = 1
+        if clipniter      is None: clipniter      = 0
         if edge           is None: edge           = (0,0)
         if threshold      is None: threshold      = 3
@@ -2319 +2319 @@
             npiece:     Number of pieces. (default is 2)
             clipthresh: Clipping threshold. (default is 3.0, unit: sigma)
-            clipniter:  maximum number of iteration of 'clipthresh'-sigma clipping (default is 1)
+            clipniter:  maximum number of iteration of 'clipthresh'-sigma clipping (default is 0)
             plot:   *** CURRENTLY UNAVAILABLE, ALWAYS FALSE ***
                         plot the fit and the residual. In this each
@@ -2355 +2355 @@
         if npiece      is None: npiece      = 2
         if clipthresh  is None: clipthresh  = 3.0
-        if clipniter   is None: clipniter   = 1
+        if clipniter   is None: clipniter   = 0
         if plot        is None: plot        = False
         if getresidual is None: getresidual = True
@@ -2400 +2400 @@
             npiece:     Number of pieces. (default is 2)
             clipthresh: Clipping threshold. (default is 3.0, unit: sigma)
-            clipniter:  maximum number of iteration of 'clipthresh'-sigma clipping (default is 1)
+            clipniter:  maximum number of iteration of 'clipthresh'-sigma clipping (default is 0)
             edge:       an optional number of channel to drop at
                         the edge of spectrum. If only one value is
@@ -2455 +2455 @@
         if npiece         is None: npiece         = 2
         if clipthresh     is None: clipthresh     = 3.0
-        if clipniter      is None: clipniter      = 1
+        if clipniter      is None: clipniter      = 0
         if edge           is None: edge           = (0, 0)
         if threshold      is None: threshold      = 3