Changeset 2004 for trunk/src/STWriter.cpp

Timestamp:

02/22/11 20:24:33 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes .CAS-2718

Ready for Test: Yes

Interface Changes: 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...

The MSFiller is called instead of PKSFiller when input data is MS.
I have tested all task regressions as well as sdsave unit test and passed.

A few modification was needed for STMath::dototalpower() and
STWriter::write().

File:

• trunk/src/STWriter.cpp (modified) (2 diffs)

trunk/src/STWriter.cpp

@@ -228 +228 @@
           inst->molecules().getEntry(pksrec.restFreq,stmp0,stmp1,
                                    rec.asuInt("MOLECULE_ID"));
-          inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
-                              rec.asuInt("TCAL_ID"));
+//           inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
+//                               rec.asuInt("TCAL_ID"));
           inst->weather().getEntry(pksrec.temperature, pksrec.pressure,
                                  pksrec.humidity, pksrec.windSpeed,
@@ -240 +240 @@
           // dummy data
           uInt npol = pksrec.spectra.ncolumn();
+
+          // TCAL
+          inst->tcal().getEntry( pksrec.tcalTime, pksrec.tcal,
+                                 rec.asuInt("TCAL_ID") ) ;
+          if ( pksrec.tcal.nelements() == 1 ) {
+            ROScalarColumn<uInt> uintCol( itable, "TCAL_ID" ) ;
+            Vector<uInt> tcalids = uintCol.getColumn() ;
+            pksrec.tcal.resize( npol ) ;
+            Vector<Float> dummyA ;
+            String dummyS ;
+            for ( uInt ipol = 0 ; ipol < npol ; ipol++ ) {
+              inst->tcal().getEntry( dummyS, dummyA, tcalids[ipol] ) ;
+              pksrec.tcal[ipol] = dummyA[0] ;
+            }
+          }
+          else if ( pksrec.tcal.nelements() == nchan ) {
+            ROScalarColumn<uInt> uintCol( itable, "TCAL_ID" ) ;
+            Vector<uInt> tcalids = uintCol.getColumn() ;
+            pksrec.tcal.resize( npol ) ;
+            Vector<Float> dummyA ;
+            String dummyS ;
+            for ( uInt ipol = 0 ; ipol < npol ; ipol++ ) {
+              inst->tcal().getEntry( dummyS, dummyA, tcalids[ipol] ) ;
+              pksrec.tcal[ipol] = mean( dummyA ) ;
+            }
+          }
+          //LogIO os ;
+          //os << "npol = " << npol << " pksrec.tcal = " << pksrec.tcal << LogIO::POST ;
 
           pksrec.mjd       = rec.asDouble("TIME");