Changeset 2858 for trunk

Timestamp:

09/14/13 13:04:02 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description: a bug fix to flag definition of lchan and rchan.

File:

• trunk/src/STSideBandSep.cpp (modified) (7 diffs)

trunk/src/STSideBandSep.cpp

@@ -88 +88 @@
 STSideBandSep::~STSideBandSep()
 {
-#ifdef KS_DEBUG
-  cout << "Destructor ~STSideBandSep()" << endl;
-#endif
 };
 
@@ -241 +238 @@
 void STSideBandSep::separate(string outname)
 {
-#ifdef KS_DEBUG
-  cout << "STSideBandSep::separate" << endl;
-#endif
   LogIO os(LogOrigin("STSideBandSep","separate()", WHERE));
   if (outname.empty())
@@ -767 +761 @@
       accflag[j] |= shiftvec[j];
   }
+  outflag = accflag;
   // Shift back Flag
-  shiftFlag(accflag, thisShift->at(0), outflag);
+  //cout << "Shifting FLAG back to " << thisShift->at(0) << " channels" << endl;
+  //shiftFlag(accflag, thisShift->at(0), outflag);
 
   return outflag;
@@ -867 +863 @@
 
 #ifdef KS_DEBUG
-  cout << "Start shifting spectrum for " << shift << "channels" << endl;
+  cout << "Start shifting spectrum for " << shift << " channels" << endl;
 #endif
 
@@ -885 +881 @@
     outvec(lchan) += invec(i) * lweight;
     outvec(rchan) += invec(i) * rweight;
+#ifdef KS_DEBUG
+    if (i == 2350 || i== 2930) {
+      cout << "Channel= " << i << " of input vector: " << endl;
+      cout << "L channel = " << lchan << endl;
+      cout << "R channel = " << rchan << endl;
+      cout << "L weight = " << lweight << endl;
+      cout << "R weight = " << rweight << endl;
+    }
+#endif
   }
 };
@@ -913 +918 @@
   if (rweight < 0.) rweight += 1.;
   if (rweight < tolerance){
+    // the shift is almost lchan
+    ruse = false;
+    luse = true;
+  }
+  if (rweight > 1-tolerance){
+    // the shift is almost rchan
     ruse = true;
     luse = false;
-  }
-  if (rweight > 1-tolerance){
-    ruse = false;
-    luse = true;
   }
   uInt lchan, rchan;
@@ -929 +936 @@
     outvec(lchan) |= (invec(i) && luse);
     outvec(rchan) |= (invec(i) && ruse);
+#ifdef KS_DEBUG
+    if (i == 2350 || i == 2930) {
+      cout << "Channel= " << i << " of input vector: " << endl;
+      cout << "L channel = " << lchan << endl;
+      cout << "R channel = " << rchan << endl;
+      cout << "L channel will be " << (luse ? "used" : "ignored") << endl;
+      cout << "R channel will be " << (ruse ? "used" : "ignored") << endl;
+    }
+#endif
   }
 };