Changeset 2411 for trunk/src

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/src

Files:

• Scantable.cpp (modified) (5 diffs)
• Scantable.h (modified) (1 diff)

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,