Changeset 2006

Timestamp:

02/23/11 20:08:16 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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...

Added iteration for SRCTYPE.

File:

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

trunk/src/STWriter.cpp

@@ -204 +204 @@
       while (!cycit.pastEnd() ) {
         Table ctable = cycit.table();
-        TableIterator ifit(ctable, "IFNO", TableIterator::Ascending, TableIterator::HeapSort);
-        MDirection::ScalarColumn dirCol(ctable, "DIRECTION");
-        pksrec.direction = dirCol(0).getAngle("rad").getValue();
-        pksrec.IFno = 1;
-        while (!ifit.pastEnd() ) {
-          Table itable = ifit.table();
-          TableRow row(itable);
-          // use the first row to fill in all the "metadata"
-          const TableRecord& rec = row.get(0);
-          ROArrayColumn<Float> specCol(itable, "SPECTRA");
-          pksrec.IFno = rec.asuInt("IFNO")+1;
-          uInt nchan = specCol(0).nelements();
-          Double crval,crpix;
-          //Vector<Double> restfreq;
-          Float tmp0,tmp1,tmp2,tmp3,tmp4;
-          String tcalt;
-          Vector<String> stmp0, stmp1;
-          inst->frequencies().getEntry(crpix,crval, pksrec.freqInc,
-                                     rec.asuInt("FREQ_ID"));
-          inst->focus().getEntry(pksrec.parAngle, pksrec.focusAxi, pksrec.focusTan,
-                                 pksrec.focusRot, tmp0,tmp1,tmp2,tmp3,tmp4,
-                                 rec.asuInt("FOCUS_ID"));
-          inst->molecules().getEntry(pksrec.restFreq,stmp0,stmp1,
-                                   rec.asuInt("MOLECULE_ID"));
-//           inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
-//                               rec.asuInt("TCAL_ID"));
-          inst->weather().getEntry(pksrec.temperature, pksrec.pressure,
-                                 pksrec.humidity, pksrec.windSpeed,
-                                 pksrec.windAz, rec.asuInt("WEATHER_ID"));
-          Double pixel = Double(nchan/2);
-          pksrec.refFreq = (pixel-crpix)*pksrec.freqInc + crval;
-          // ok, now we have nrows for the n polarizations in this table
-          polConversion(pksrec.spectra, pksrec.flagged, pksrec.xPol, itable);
-          pksrec.tsys = tsysFromTable(itable);
-          // 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] ;
+        TableIterator typeit( ctable, "SRCTYPE" ) ;
+        while(!typeit.pastEnd() ) {
+          Table ttable = typeit.table() ;
+          TableIterator ifit(ctable, "IFNO", TableIterator::Ascending, TableIterator::HeapSort);
+          MDirection::ScalarColumn dirCol(ctable, "DIRECTION");
+          pksrec.direction = dirCol(0).getAngle("rad").getValue();
+          pksrec.IFno = 1;
+          while (!ifit.pastEnd() ) {
+            Table itable = ifit.table();
+            TableRow row(itable);
+            // use the first row to fill in all the "metadata"
+            const TableRecord& rec = row.get(0);
+            ROArrayColumn<Float> specCol(itable, "SPECTRA");
+            pksrec.IFno = rec.asuInt("IFNO")+1;
+            uInt nchan = specCol(0).nelements();
+            Double crval,crpix;
+            //Vector<Double> restfreq;
+            Float tmp0,tmp1,tmp2,tmp3,tmp4;
+            String tcalt;
+            Vector<String> stmp0, stmp1;
+            inst->frequencies().getEntry(crpix,crval, pksrec.freqInc,
+                                         rec.asuInt("FREQ_ID"));
+            inst->focus().getEntry(pksrec.parAngle, pksrec.focusAxi, pksrec.focusTan,
+                                   pksrec.focusRot, tmp0,tmp1,tmp2,tmp3,tmp4,
+                                   rec.asuInt("FOCUS_ID"));
+            inst->molecules().getEntry(pksrec.restFreq,stmp0,stmp1,
+                                       rec.asuInt("MOLECULE_ID"));
+//             inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
+//                                   rec.asuInt("TCAL_ID"));
+            inst->weather().getEntry(pksrec.temperature, pksrec.pressure,
+                                     pksrec.humidity, pksrec.windSpeed,
+                                     pksrec.windAz, rec.asuInt("WEATHER_ID"));
+            Double pixel = Double(nchan/2);
+            pksrec.refFreq = (pixel-crpix)*pksrec.freqInc + crval;
+            // ok, now we have nrows for the n polarizations in this table
+            polConversion(pksrec.spectra, pksrec.flagged, pksrec.xPol, itable);
+            pksrec.tsys = tsysFromTable(itable);
+            // 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");
+            pksrec.interval  = rec.asDouble("INTERVAL");
+            pksrec.fieldName = rec.asString("FIELDNAME");
+            pksrec.srcName   = rec.asString("SRCNAME");
+            //pksrec.obsType   = obstypes[rec.asInt("SRCTYPE")];
+            pksrec.obsType = getObsTypes( rec.asInt("SRCTYPE") ) ;
+            pksrec.bandwidth = nchan * abs(pksrec.freqInc);
+            pksrec.azimuth   = rec.asFloat("AZIMUTH");
+            pksrec.elevation = rec.asFloat("ELEVATION");
+            pksrec.refBeam   = rec.asInt("REFBEAMNO") + 1;
+            pksrec.sigma.resize(npol);
+            pksrec.sigma     = 0.0f;
+            pksrec.calFctr.resize(npol);
+            pksrec.calFctr   = 0.0f;
+            pksrec.baseLin.resize(npol,2);
+            pksrec.baseLin   = 0.0f;
+            pksrec.baseSub.resize(npol,9);
+            pksrec.baseSub   = 0.0f;
+            pksrec.xCalFctr  = 0.0;
+            pksrec.flagrow = rec.asuInt("FLAGROW");
+            
+            status = writer_->write(pksrec);
+            if ( status ) {
+              writer_->close();
+              throw(AipsError("STWriter: Failed to export Scantable."));
+            }
+            ++count;
+            //++pksrec.IFno;
+            ++ifit;
           }
-          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");
-          pksrec.interval  = rec.asDouble("INTERVAL");
-          pksrec.fieldName = rec.asString("FIELDNAME");
-          pksrec.srcName   = rec.asString("SRCNAME");
-          //pksrec.obsType   = obstypes[rec.asInt("SRCTYPE")];
-          pksrec.obsType = getObsTypes( rec.asInt("SRCTYPE") ) ;
-          pksrec.bandwidth = nchan * abs(pksrec.freqInc);
-          pksrec.azimuth   = rec.asFloat("AZIMUTH");
-          pksrec.elevation = rec.asFloat("ELEVATION");
-          pksrec.refBeam   = rec.asInt("REFBEAMNO") + 1;
-          pksrec.sigma.resize(npol);
-          pksrec.sigma     = 0.0f;
-          pksrec.calFctr.resize(npol);
-          pksrec.calFctr   = 0.0f;
-          pksrec.baseLin.resize(npol,2);
-          pksrec.baseLin   = 0.0f;
-          pksrec.baseSub.resize(npol,9);
-          pksrec.baseSub   = 0.0f;
-          pksrec.xCalFctr  = 0.0;
-          pksrec.flagrow = rec.asuInt("FLAGROW");
-
-          status = writer_->write(pksrec);
-          if ( status ) {
-            writer_->close();
-            throw(AipsError("STWriter: Failed to export Scantable."));
-          }
-          ++count;
-          //++pksrec.IFno;
-          ++ifit;
+          ++typeit ;
         }
         ++pksrec.cycleNo;
@@ -311 +316 @@
   oss << "STWriter: wrote " << count << " rows to " << filename;
   pushLog(String(oss));
+  
   writer_->close();
   //if MS2 delete POINTING table exists and copy the one in the keyword