Changeset 2899 for trunk/src

Timestamp:

03/11/14 14:17:00 (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...

sdcoadd (sd.merge):
Fixed a bug that input scantable may be unexpectedly modified.

File:

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

trunk/src/STMath.cpp

@@ -25 +25 @@
 #include <casa/Exceptions/Error.h>
 #include <casa/Logging/LogIO.h>
+#include <casa/Quanta/Quantum.h>
 
 #include <coordinates/Coordinates/CoordinateSystem.h>
@@ -2540 +2541 @@
 
 CountedPtr< Scantable >
-  STMath::merge( const std::vector< CountedPtr < Scantable > >& in )
-{
+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;
+  if (freqTol.size() > 0) {
+    Quantum<Double> freqTolInQuantity;
+    if (!Quantum<Double>::read(freqTolInQuantity, freqTol)) {
+      throw(AipsError("Failed to convert freqTol string to quantity"));
+    }
+    if (!freqTolInQuantity.isConform("Hz")) {
+      throw(AipsError("Invalid freqTol string"));
+    }
+    freqTolInHz = freqTolInQuantity.getValue("Hz");
+  }
+  **/
+  
   if ( in.size() < 2 ) {
     throw(AipsError("Need at least two scantables to perform a merge."));
@@ -2553 +2571 @@
   ScalarColumn<uInt> freqidcol(tout,"FREQ_ID"), molidcol(tout, "MOLECULE_ID");
   ScalarColumn<uInt> scannocol(tout,"SCANNO"), focusidcol(tout,"FOCUS_ID");
+  ScalarColumn<uInt> ifnocol(tout, "IFNO");
   // Renumber SCANNO to be 0-based
   Vector<uInt> scannos = scannocol.getColumn();
@@ -2561 +2580 @@
   ++it;
   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) ) {
       // non conformant.
@@ -2576 +2602 @@
     TableIterator scanit(tab, "SCANNO");
     while (!scanit.pastEnd()) {
-      ScalarColumn<uInt> thescannocol(scanit.table(),"SCANNO");
-      Vector<uInt> thescannos(thescannocol.nrow(),newscanno);
-      thescannocol.putColumn(thescannos);
       TableIterator subit(scanit.table(), cols);
       while ( !subit.pastEnd() ) {
@@ -2585 +2608 @@
         ROTableRow row(thetab);
         Vector<uInt> thecolvals(thetab.nrow());
-        ScalarColumn<uInt> thefreqidcol(thetab,"FREQ_ID");
-        ScalarColumn<uInt> themolidcol(thetab, "MOLECULE_ID");
-        ScalarColumn<uInt> thefocusidcol(thetab,"FOCUS_ID");
         // The selected subset of table should have 
         // the equal FREQ_ID, MOLECULE_ID, and FOCUS_ID values.
         const TableRecord& rec = row.get(0);
+        tout.addRow(thetab.nrow());
+        TableCopy::copyRows(tout, thetab, nrow, 0, thetab.nrow());
+
+        Slicer slice(IPosition(1, nrow), IPosition(1, thetab.nrow()),
+                     Slicer::endIsLength);
+
         // Set the proper FREQ_ID
         Double rv,rp,inc;
@@ -2596 +2622 @@
         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);
+        //}
         thecolvals = id;
-        thefreqidcol.putColumn(thecolvals);
+        freqidcol.putColumnRange(slice, thecolvals);
+        
         // Set the proper MOLECULE_ID
         Vector<String> name,fname;Vector<Double> rf;
@@ -2603 +2633 @@
         id = out->molecules().addEntry(rf, name, fname);
         thecolvals = id;
-        themolidcol.putColumn(thecolvals);
+        molidcol.putColumnRange(slice, thecolvals);
+        
         // Set the proper FOCUS_ID
         Float fpa,frot,fax,ftan,fhand,fmount,fuser, fxy, fxyp;
@@ -2611 +2642 @@
                                    fxy, fxyp);
         thecolvals = id;
-        thefocusidcol.putColumn(thecolvals);
-
-        tout.addRow(thetab.nrow());
-        TableCopy::copyRows(tout, thetab, nrow, 0, thetab.nrow());
+        focusidcol.putColumnRange(slice, thecolvals);
+
+        // Set the proper SCANNO
+        thecolvals = newscanno;
+        scannocol.putColumnRange(slice, thecolvals);
 
         ++subit;