Changeset 3095 for trunk

Timestamp:

02/19/16 12:09:15 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on receiver name handling when determining polarization id.

File:

• trunk/external-alma/atnf/PKSIO/NRODataset.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NRODataset.cc

@@ -45 +45 @@
 #include <math.h>
 #include <fstream>
+#include <iostream>
 
 #define STRING2CHAR(s) const_cast<char *>((s).c_str())
@@ -1221 +1222 @@
   Bool match2 = false;
   for (int i = 0; i < arrayMax(); i++) {
-    //cout << "RX[" << i << "]=" << RX[i] << endl;
+    //cout << "RX[" << i << "]=\"" << RX[i] << "\"" << endl;
+
+    String rxString(RX[i]);
+    //cout << "rxString = \"" << rxString << "\" rxString.size() = " << rxString.size() << endl;
+
+    // RX may contain some null characters at the end
+    // Remove it for pattern matching
+    rxString.rtrim('\0');
+    //cout << "rxString (rtrim) = \"" << rxString << "\" rxString.size() = " << rxString.size() << endl;
+
+    // Also remove whitespaces
+    rxString.trim();
+    //cout << "rxString (trim) = \"" << rxString << "\" rxString.size() = " << rxString.size() << endl;
+
     if (!match1) {
-      match1 = (reRx1.match(RX[i].c_str(), RX[i].size()) != String::npos);
+      match1 = (reRx1.match(rxString.c_str(), rxString.size()) != String::npos);
     }
     if (!match2) {
-      match2 = (reRx2.match(RX[i].c_str(), RX[i].size()) != String::npos);
+      match2 = (reRx2.match(rxString.c_str(), rxString.size()) != String::npos);
     }
   }
@@ -1577 +1591 @@
   // For others, POLNO is always 0.
   String rxString(rx);
+  //cout << "rx='" << rxString << "' (size " << rxString.length() << ")" << endl;
+
+  // see getPolarizationNum for detail why we need to trim
+  rxString.rtrim('\0');
   rxString.trim();
-  //cout << "rx='" << rxString << "' (size " << rxString.size() << ")" << endl;
+
   Regex reRx("(.*V|H20ch2)$");
-  if (reRx.match(rxString.c_str(), rxString.size()) != String::npos) {
+  if (reRx.match(rxString.c_str(), rxString.length()) != String::npos) {
     //cout << "match!" << endl;
     polno = 1;
   }
+  //cout << "polno = " << polno << endl;
   return polno ;
 }