Changeset 2103 for branches

Timestamp:

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

Merged bug fixes in trunk (r2101).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/asapmath.py (modified) (2 diffs)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (3 diffs)
• src/SConscript (modified) (1 prop)
• src/STMath.cpp (modified) (1 diff)

branches/casa-prerelease/pre-asap/python/asapmath.py

@@ -863 +863 @@
         verify:        verify calibration
     """
+    import re
     antname = scantab.get_antennaname()
     if ( calmode == 'nod' ):
@@ -874 +875 @@
         if ( antname.find( 'APEX' ) != -1 ):
             scal = apexcal( scantab, scannos, calmode, verify )
-        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1 ):
+        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1
+               or re.match('DV[0-9][0-9]$',antname) is not None
+               or re.match('PM[0-9][0-9]$',antname) is not None
+               or re.match('CM[0-9][0-9]$',antname) is not None
+               or re.match('DA[0-9][0-9]$',antname) is not None ):
             scal = almacal( scantab, scannos, calmode, verify )
         else:

branches/casa-prerelease/pre-asap/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 ;

branches/casa-prerelease/pre-asap/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);