Changeset 2985 for trunk

Timestamp:

08/15/14 15:14:57 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-2356)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap.sbseparator

Description: Fixed a bug that causes the failure of execution when incriment of frequencies is negative.

File:

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

trunk/src/STSideBandSep.cpp

@@ -397 +397 @@
     os << "Found IFNO = " << sigIfno_
        << " in the first table." << LogIO::POST;
+#ifdef KS_DEBUG
+    cout << "Frequencies in the first table: freq0 = " << basech0 << ", incr = " << baseinc << ", nch = " << basench << endl;
+#endif
   }
   if (ftol_.getUnit().empty()) {
     // tolerance in unit of channels
-    ftolval = ftol_.getValue() * baseinc;
+    ftolval = abs(ftol_.getValue() * baseinc);
   }
   else {
-    ftolval = ftol_.getValue("Hz");
+    ftolval = abs(ftol_.getValue("Hz"));
   }
   inctolval = abs(baseinc/(double) basench);
   const string poltype0 = stab->getPolType();
+#ifdef KS_DEBUG
+  cout << "Looking for pairs that satisfies freqtol = " << ftolval << ", inctol = " << inctolval << endl;
+#endif
 
   // Initialize shift values
@@ -448 +454 @@
       double freq0, incr;
       if ( getFreqInfo(stab, *iter, freq0, incr, nch) ){
+#ifdef KS_DEBUG
+        cout << "Checking IF=" << *iter << " int Table " << itab <<": freq0 = " << freq0 << ", incr = " << incr << ", nch = " << nch << endl;
+        cout << "- number of channels: " << nch << endl;
+        cout << "- chan0 difference: " << abs(freq0-basech0) << " (threshold: " << ftolval << ")" << endl;
+        cout << "- inc difference: " << abs(incr-baseinc) << " (threshold: " << inctolval << ")" << endl;
+#endif
         if ( (nch == basench) && (abs(freq0-basech0) < ftolval)
              && (abs(incr-baseinc) < inctolval) ){