Changeset 2905 for trunk

Timestamp:

03/13/14 17:24:50 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5875

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdcoadd

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

MOLECULE_ID is renumbered when IFNO is merged so that each IFNO has unique MOLECULE_ID.

File:

• trunk/src/STMath.cpp (modified) (5 diffs)

trunk/src/STMath.cpp

@@ -2581 +2581 @@
   uInt ifnoCounter = max(ifnocol.getColumn()) + 1;
   
+  // Here we assume that each IFNO has unique MOLECULE_ID
+  // molIdMap:
+  //    KEY: IFNO
+  //    VALUE: MOLECULE_ID
+  map<uInt, uInt> molIdMap;
+  {
+    TableIterator ifit(tout, "IFNO");
+    while (!ifit.pastEnd()) {
+      ROTableRow row(ifit.table());
+      const TableRecord& rec = row.get(0);
+      molIdMap[rec.asuInt("IFNO")] = rec.asuInt("MOLECULE_ID");
+      ifit.next();
+    }
+  }
+  
   while ( it != in.end() ){
     // Check FREQUENCIES/BASEFRAME
@@ -2599 +2614 @@
     cols[1] = String("MOLECULE_ID");
     cols[2] = String("FOCUS_ID");
-
+    
     TableIterator scanit(tab, "SCANNO");
     while (!scanit.pastEnd()) {
@@ -2624 +2639 @@
         // default value is new unique IFNO
         uInt newifno = ifnoCounter;
+        Bool isIfMerged = False;
         uInt nchan = rec.asArrayFloat("SPECTRA").shape()[0];
         //id = out->frequencies().addEntry(rp, rv, inc);
@@ -2663 +2679 @@
             // renumber IFNO to be same as existing value that corresponds to nchan
             newifno = nchanMap[nchan];
+            isIfMerged = True;
           }
           os << LogIO::DEBUGGING << "newifno = " << newifno << LogIO::POST;
@@ -2676 +2693 @@
         (*it)->molecules().getEntry(rf, name, fname, rec.asuInt("MOLECULE_ID"));
         id = out->molecules().addEntry(rf, name, fname);
+        if (molIdMap.find(newifno) == molIdMap.end()) {
+          // add new entry to molIdMap
+          molIdMap[newifno] = id;
+        }
+        if (isIfMerged) {
+          id = molIdMap[newifno];
+        }
         thecolvals = id;
         molidcol.putColumnRange(slice, thecolvals);