Changeset 2411 for trunk

Timestamp:

02/17/12 16:30:24 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-3759

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: (1) in sinusoidal baselining procedures and their relevants, quit getting nchan info in Python side but in C++ side.

(2) changed the defaults value of addwn from [] to [0] in sd.*_sinusoid_baseline(). (i.e., toolkit level)

Location:

trunk

Files:

• python/scantable.py (modified) (7 diffs)
• src/Scantable.cpp (modified) (5 diffs)
• src/Scantable.h (modified) (1 diff)

trunk/python/scantable.py

@@ -19 +19 @@
 from asap.utils import _n_bools, mask_not, mask_and, mask_or, page
 from asap.asapfitter import fitter
+
+###############################################################
+### WK temporarily added these lines for testing 2011/11/28 ###
+###############################################################
+#from asap._asap import TestClass
+
+#class testclass(TestClass):
+#    def __init__(self, nelem):
+#        TestClass.__init__(self, nelem)
+
+###############################################################
 
 
@@ -1253 +1264 @@
         if rowno is None:
             rowno = []
-        if mask is None:
-            mask = []
         if isinstance(rowno, int):
             rowno = [rowno]
         elif not (isinstance(rowno, list) or isinstance(rowno, tuple)):
             raise TypeError("The row number(s) must be int, list or tuple.")
-
         if len(rowno) == 0: rowno = [i for i in xrange(self.nrow())]
 
-        if not (isinstance(mask, list) or isinstance(mask, tuple)):
+        usecommonmask = True
+        
+        if mask is None:
+            mask = []
+        if isinstance(mask, list) or isinstance(mask, tuple):
+            if len(mask) == 0:
+                mask = [[]]
+            else:
+                if isinstance(mask[0], bool):
+                    if len(mask) != self.nchan(self.getif(rowno[0])):
+                        raise ValueError("The spectra and the mask have "
+                                         "different length.")
+                    mask = [mask]
+                elif isinstance(mask[0], list) or isinstance(mask[0], tuple):
+                    usecommonmask = False
+                    if len(mask) != len(rowno):
+                        raise ValueError("When specifying masks for each "
+                                         "spectrum, the numbers of them "
+                                         "must be identical.")
+                    for i in xrange(mask):
+                        if len(mask[i]) != self.nchan(self.getif(rowno[i])):
+                            raise ValueError("The spectra and the mask have "
+                                             "different length.")
+                else:
+                    raise TypeError("The mask must be a boolean list or "
+                                    "a list of boolean list.")
+        else:
             raise TypeError("The mask must be a boolean list or a list of "
                             "boolean list.")
-        if len(mask) == 0: mask = [True for i in xrange(self.nchan())]
-        if isinstance(mask[0], bool): mask = [mask]
-        elif not (isinstance(mask[0], list) or isinstance(mask[0], tuple)):
-            raise TypeError("The mask must be a boolean list or a list of "
-                            "boolean list.")
-
-        usecommonmask = (len(mask) == 1)
-        if not usecommonmask:
-            if len(mask) != len(rowno):
-                raise ValueError("When specifying masks for each spectrum, "
-                                 "the numbers of them must be identical.")
-        for amask in mask:
-            if len(amask) != self.nchan():
-                raise ValueError("The spectra and the mask have different "
-                                 "length.")
-        
+
         res = []
 
@@ -2311 +2330 @@
                 val = int(wn[:-1])
                 res = [i for i in xrange(val)]
-            elif wn[:2] == '>=' or wn[:2] == '=>':   # cases '>=a','=>a' : return [a,a+1,...,a_nyq]
+            elif wn[:2] == '>=' or wn[:2] == '=>':   # cases '>=a','=>a' : return [a,-999], which is
+                                                     #                     then interpreted in C++
+                                                     #                     side as [a,a+1,...,a_nyq]
+                                                     #                     (CAS-3759)
                 val = int(wn[2:])
-                res = [i for i in xrange(val, self.nchan()/2+1)]
-            elif wn[-2:] == '<=' or wn[-2:] == '=<': # cases 'a<=','a=<' : return [a,a+1,...,a_nyq]
+                res = [val, -999]
+                #res = [i for i in xrange(val, self.nchan()/2+1)]
+            elif wn[-2:] == '<=' or wn[-2:] == '=<': # cases 'a<=','a=<' : return [a,-999], which is
+                                                     #                     then interpreted in C++
+                                                     #                     side as [a,a+1,...,a_nyq]
+                                                     #                     (CAS-3759)
                 val = int(wn[:-2])
-                res = [i for i in xrange(val, self.nchan()/2+1)]
-            elif wn[0] == '>':                       # case '>a' :         return [a+1,a+2,...,a_nyq]
+                res = [val, -999]
+                #res = [i for i in xrange(val, self.nchan()/2+1)]
+            elif wn[0] == '>':                       # case '>a' :         return [a+1,-999], which is
+                                                     #                     then interpreted in C++
+                                                     #                     side as [a+1,a+2,...,a_nyq]
+                                                     #                     (CAS-3759)
                 val = int(wn[1:])+1
-                res = [i for i in xrange(val, self.nchan()/2+1)]
-            elif wn[-1] == '<':                      # case 'a<' :         return [a+1,a+2,...,a_nyq]
+                res = [val, -999]
+                #res = [i for i in xrange(val, self.nchan()/2+1)]
+            elif wn[-1] == '<':                      # case 'a<' :         return [a+1,-999], which is
+                                                     #                     then interpreted in C++
+                                                     #                     side as [a+1,a+2,...,a_nyq]
+                                                     #                     (CAS-3759)
                 val = int(wn[:-1])+1
-                res = [i for i in xrange(val, self.nchan()/2+1)]
+                res = [val, -999]
+                #res = [i for i in xrange(val, self.nchan()/2+1)]
 
             return res
@@ -2371 +2406 @@
                                         number corresponding to the Nyquist
                                         frequency for the case of FFT).
-                           default is []. 
+                           default is [0]. 
             rejwn:         the wave numbers NOT to be used for fitting. 
                            can be set just as addwn but has higher priority: 
@@ -2420 +2455 @@
             if fftmethod     is None: fftmethod     = 'fft'
             if fftthresh     is None: fftthresh     = 3.0
-            if addwn         is None: addwn         = []
+            if addwn         is None: addwn         = [0]
             if rejwn         is None: rejwn         = []
             if clipthresh    is None: clipthresh    = 3.0
@@ -2495 +2530 @@
                                          number corresponding to the Nyquist
                                          frequency for the case of FFT).
-                            default is []. 
+                            default is [0]. 
             rejwn:          the wave numbers NOT to be used for fitting. 
                             can be set just as addwn but has higher priority: 
@@ -2561 +2596 @@
             if fftmethod      is None: fftmethod      = 'fft'
             if fftthresh      is None: fftthresh      = 3.0
-            if addwn          is None: addwn          = []
+            if addwn          is None: addwn          = [0]
             if rejwn          is None: rejwn          = []
             if clipthresh     is None: clipthresh     = 3.0

trunk/src/Scantable.cpp

@@ -2697 +2697 @@
   }
 
-  addAuxWaveNumbers(addNWaves, rejectNWaves, nWaves);
+  addAuxWaveNumbers(whichrow, addNWaves, rejectNWaves, nWaves);
 }
 
@@ -2779 +2779 @@
 }
 
-void Scantable::addAuxWaveNumbers(const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, std::vector<int>& nWaves)
-{
+void Scantable::addAuxWaveNumbers(const int whichrow, const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, std::vector<int>& nWaves)
+{
+  std::vector<int> tempAddNWaves, tempRejectNWaves;
   for (uInt i = 0; i < addNWaves.size(); ++i) {
+    tempAddNWaves.push_back(addNWaves[i]);
+  }
+  if ((tempAddNWaves.size() == 2) && (tempAddNWaves[1] == -999)) {
+    setWaveNumberListUptoNyquistFreq(whichrow, tempAddNWaves);
+  }
+
+  for (uInt i = 0; i < rejectNWaves.size(); ++i) {
+    tempRejectNWaves.push_back(rejectNWaves[i]);
+  }
+  if ((tempRejectNWaves.size() == 2) && (tempRejectNWaves[1] == -999)) {
+    setWaveNumberListUptoNyquistFreq(whichrow, tempRejectNWaves);
+  }
+
+  for (uInt i = 0; i < tempAddNWaves.size(); ++i) {
     bool found = false;
     for (uInt j = 0; j < nWaves.size(); ++j) {
-      if (nWaves[j] == addNWaves[i]) {
+      if (nWaves[j] == tempAddNWaves[i]) {
         found = true;
         break;
       }
     }
-    if (!found) nWaves.push_back(addNWaves[i]);
-  }
-
-  for (uInt i = 0; i < rejectNWaves.size(); ++i) {
+    if (!found) nWaves.push_back(tempAddNWaves[i]);
+  }
+
+  for (uInt i = 0; i < tempRejectNWaves.size(); ++i) {
     for (std::vector<int>::iterator j = nWaves.begin(); j != nWaves.end(); ) {
-      if (*j == rejectNWaves[i]) {
+      if (*j == tempRejectNWaves[i]) {
         j = nWaves.erase(j);
       } else {
@@ -2805 +2820 @@
     sort(nWaves.begin(), nWaves.end());
     unique(nWaves.begin(), nWaves.end());
+  }
+}
+
+void Scantable::setWaveNumberListUptoNyquistFreq(const int whichrow, std::vector<int>& nWaves)
+{
+  if ((nWaves.size() == 2)&&(nWaves[1] == -999)) {
+    int val = nWaves[0];
+    int nyquistFreq = nchan(getIF(whichrow))/2+1;
+    nWaves.clear();
+    if (val > nyquistFreq) {  // for safety, at least nWaves contains a constant; CAS-3759
+      nWaves.push_back(0);
+    }
+    while (val <= nyquistFreq) {
+      nWaves.push_back(val);
+      val++;
+    }
   }
 }
@@ -2844 +2875 @@
 
       //FOR DEBUGGING------------
+      /*
       if (whichrow < 0) {// == nRow -1) {
         cout << "+++ i=" << setw(3) << whichrow << ", IF=" << setw(2) << getIF(whichrow);
@@ -2855 +2887 @@
         cout << flush;
       }
+      */
       //-------------------------
 

trunk/src/Scantable.h

@@ -739 +739 @@
                            const std::string& fftThAttr, 
                            std::vector<int>& nWaves);
-  void addAuxWaveNumbers(const std::vector<int>& addNWaves, 
+  void addAuxWaveNumbers(const int whichrow,
+                         const std::vector<int>& addNWaves, 
                          const std::vector<int>& rejectNWaves, 
                          std::vector<int>& nWaves);
+  void setWaveNumberListUptoNyquistFreq(const int whichrow,
+                                        std::vector<int>& nWaves);
   bool hasSameNchanOverIFs();
   std::string getMaskRangeList(const std::vector<bool>& mask,