Changeset 2900 for trunk/src/STMath.cpp

Timestamp:

03/12/14 12:23:31 (10 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): sd

Description: Describe your changes here...

Added freq_tol parameter to asapmath.merge.
The freq_tol allows to specify frequency tolerance as
numeric value (1.0e6) or string ('1MHz'). The value will
be used to merge FREQUENCIES rows, FREQ_ID, and IFNO.

File:

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

trunk/src/STMath.cpp

@@ -2541 +2541 @@
 
 CountedPtr< Scantable >
-STMath::merge( const std::vector< CountedPtr < Scantable > >& in )
-//STMath::merge( const std::vector< CountedPtr < Scantable > >& in,
-//             const std::string &freqTol )
-{
-  /**
-  LogIO os;
-  Double freqTolInHz = 0.0;
+STMath::merge( const std::vector< CountedPtr < Scantable > >& in,
+               const std::string &freqTol )
+{
+  Double freqTolInHz = 1.0; // default is 1.0Hz according to concat task
   if (freqTol.size() > 0) {
     Quantum<Double> freqTolInQuantity;
@@ -2558 +2555 @@
     freqTolInHz = freqTolInQuantity.getValue("Hz");
   }
-  **/
   
   if ( in.size() < 2 ) {
@@ -2579 +2575 @@
   uInt newscanno = max(scannos)+1;
   ++it;
+
+  // new IFNO
+  uInt ifnoCounter = max(ifnocol.getColumn()) + 1;
+  
   while ( it != in.end() ){
-    /**
     // Check FREQUENCIES/BASEFRAME
     if ( out->frequencies().getFrame(true) != (*it)->frequencies().getFrame(true) ) {
       throw(AipsError("BASEFRAME is not identical"));
     }
-    **/
     
     if ( ! (*it)->conformant(*out) ) {
@@ -2621 +2619 @@
         (*it)->frequencies().getEntry(rp, rv, inc, rec.asuInt("FREQ_ID"));
         uInt id;
-        id = out->frequencies().addEntry(rp, rv, inc);
-        //if ( !out->frequencies().match(rp, rv, inc, freqTolInHz, id) ) {
-        //  id = out->frequencies().addEntry(rp, rv, inc);
-        //}
+        
+        // default value is new unique IFNO
+        uInt newifno = ifnoCounter;
+        uInt nchan = rec.asArrayFloat("SPECTRA").shape()[0];
+        //id = out->frequencies().addEntry(rp, rv, inc);
+        if ( !out->frequencies().match(rp, rv, inc, freqTolInHz, id) ) {
+          // add new entry to FREQUENCIES table
+          id = out->frequencies().addEntry(rp, rv, inc);
+
+          // increment counter for IFNO
+          ifnoCounter++;
+        }
+        else {
+          // should renumber IFNO to be same as existing rows that have same FREQ_ID
+          LogIO os(LogOrigin("STMath", "merge", WHERE));
+          Table outFreqIdSelected = tout(tout.col("FREQ_ID") == id);
+          TableIterator _iter(outFreqIdSelected, "IFNO");
+          map<uInt, uInt> nchanMap;
+          while (!_iter.pastEnd()) {
+            const Table _table = _iter.table();
+            ROTableRow _row(_table);
+            const TableRecord &_rec = _row.get(0); 
+            uInt nchan = _rec.asArrayFloat("SPECTRA").shape()[0];
+            if (nchanMap.find(nchan) != nchanMap.end()) {
+              throw(AipsError("There are non-unique IFNOs assigned to spectra that have same FREQ_ID and same nchan. Something wrong."));
+            }
+            nchanMap[nchan] = _rec.asuInt("IFNO");
+            _iter.next();
+          }
+
+          os << LogIO::DEBUGGING << "nchanMap for " << id << ":" << LogIO::POST;
+          for (map<uInt, uInt>::iterator i = nchanMap.begin(); i != nchanMap.end(); ++i) {
+            os << LogIO::DEBUGGING << "nchanMap[" << i->first << "] = " << i->second << LogIO::POST;
+          }
+
+          if (nchanMap.find(nchan) == nchanMap.end()) {
+            // increment counter for IFNO
+            ifnoCounter++;
+          }
+          else {
+            // renumber IFNO to be same as existing value that corresponds to nchan
+            newifno = nchanMap[nchan];
+          }
+          os << LogIO::DEBUGGING << "newifno = " << newifno << LogIO::POST;
+        }
         thecolvals = id;
         freqidcol.putColumnRange(slice, thecolvals);
+
+        thecolvals = newifno;
+        ifnocol.putColumnRange(slice, thecolvals);
         
         // Set the proper MOLECULE_ID