Changeset 2102 for trunk/src

Timestamp:

04/05/11 15:19:41 (14 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...

Bug fix on calibration script and polarization type resolution.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (3 diffs)
• STMath.cpp (modified) (1 diff)

trunk/src/MSFiller.cpp

@@ -444 +444 @@
 //           os_ << "npol = " << npol << LogIO::POST ;
 //           os_ << "corrtype = " << corrtype << LogIO::POST ;
-          sdh.npol = max( sdh.npol, npol ) ;
-          if ( sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
           // source information
 //           os_ << "srcId = " << srcId << ", spwId = " << spwId << LogIO::POST ;
@@ -561 +559 @@
           tcolr = tpoolr->construct( spwtab, "NUM_CHAN" ) ;
           Int nchan = tcolr->asInt( spwId ) ;
+          Bool iswvr = False ;
+          if ( nchan == 4 ) iswvr = True ;
           tpoolr->destroy( tcolr ) ;
           Bool even = False ;
@@ -645 +645 @@
             scTsysCol.attach( caltabsel, colTsys_ ) ;
           }
+
+          sdh.npol = max( sdh.npol, npol ) ;
+          if ( !iswvr && sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
+
 //           time1 = gettimeofday_sec() ;
 //           os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;

trunk/src/STMath.cpp

@@ -2530 +2530 @@
   vec = 0;
   pols->table_.rwKeywordSet().define("nPol", Int(1));
-  //pols->table_.rwKeywordSet().define("POLTYPE", String("stokes"));
-  pols->table_.rwKeywordSet().define("POLTYPE", in->getPolType());
+  pols->table_.rwKeywordSet().define("POLTYPE", String("stokes"));
+  //pols->table_.rwKeywordSet().define("POLTYPE", in->getPolType());
   std::vector<CountedPtr<Scantable> > vpols;
   vpols.push_back(pols);