Changeset 2531

Timestamp:

05/16/12 12:37:33 (12 years ago)

Author:

Malte Marquarding

Message:

Issue #265: Support multiple chains in IF in summary

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/Scantable.cpp (modified) (2 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
 
 * reworked build system to work as 'normal' python package
-* fixed bug in average_time introduced in 4.0
+* Ticket #257 fixed bug in average_time introduced in 4.0
 * experimental merging of IFs
 * speed ups
 * move to ipython>=0.11
-* fixed regression of reference scan detection for Hobart data
+* Ticket #269 fixed regression of reference scan detection for Hobart data
 * work under OS X 10.7 
+* fixed logging control through rcParams
+* fix for frequency_alignment
+* Ticket #264 silence skydip.
+* Ticket #265 fix summary for multiple IF chains 
 
 Release 4.0.0 [2011-10-05]

trunk/src/Scantable.cpp

@@ -1269 +1269 @@
     // List row=i of FREQUENCIES subtable
     ifNos[i].shape(tmplen);
-    if (tmplen == 1) {
+    if (tmplen >= 1) {
       oss << std::right << setw(5) << ftabIds(i) << setw(2) << ""
           << setw(3) << ifNos[i](0) << setw(1) << ""
@@ -1275 +1275 @@
           << setw(2) << ""
           << std::right << setw(8) << fIdchans[i] << setw(2) << ""
-          << std::left << polNos[i] << endl;
-    } else if (tmplen > 0 ) {
-      // You shouldn't come here
-      oss << std::left
-          << "Multiple IFNOs in FREQ_ID = " << ftabIds(i) 
-          << " !!!" << endl;
-    }
+          << std::left << polNos[i];
+      if (tmplen > 1) {
+        oss  << " (" << tmplen << " chains)";
+      }
+      oss << endl;
+    }
+    
   }
   oss << asap::SEPERATOR << endl;