Changeset 2188 for branches/casa-prerelease

Timestamp:

06/09/11 11:38:13 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CSV-929 etc.

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

Merge several bug fixes for MSFiller/Writer in trunk
(r2167,r2176,r2184,r2185,r2187).

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/flagtoolbar.py (modified) (1 prop)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (6 diffs)
• src/MSWriter.cpp (modified) (32 diffs)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/src/MSFiller.cpp

@@ -601 +601 @@
           Vector< Quantum<Double> > chanFreqs = (*sharedQDArrCol)( spwId ) ;
           delete sharedQDArrCol ;
+          if ( nchan > 1 && chanFreqs[0].getValue("Hz") > chanFreqs[1].getValue("Hz") ) 
+            increment *= -1.0 ;
           if ( freqRef == MFrequency::LSRK ) {
             if ( even ) {
@@ -949 +951 @@
     sdh.antennaname = telescopeName + "//" + antennaName ;
   }
-  if ( stationName != "" ) {
+  if ( stationName != "" && stationName != antennaName ) {
     sdh.antennaname += "@" + stationName ;
   }
@@ -1050 +1052 @@
   else if ( tmpStr.find( "." ) != String::npos ) {
     sep = "." ;
+  }
+  else if ( tmpStr.find( "#" ) != String::npos ) {
+    sep = "#" ;
   }
   //else if ( obsMode.find( "_" ) != String::npos ) {
@@ -1106 +1111 @@
     }
   }
-  else if ( sep == "." ) {
-    // sep == "."
+  else if ( sep == "." || sep == "#" ) {
+    // sep == "." or "#"
     //
     // ALMA & EVLA case (MS via ASDM) before3.1
@@ -1564 +1569 @@
   if ( !isSysCal_ ) {
     os_ << "No TCAL rows" << LogIO::POST ;
-    Block<uInt> tcalids( 0 ) ;
+    Block<uInt> tcalids( 4, 0 ) ;
     return  tcalids ;
   }    
@@ -1572 +1577 @@
   if ( !tcalrec_.isDefined( key ) ) {
     os_ << "No TCAL rows" << LogIO::POST ;
-    Block<uInt> tcalids( 0 ) ;
+    Block<uInt> tcalids( 4, 0 ) ;
     return tcalids ;
   }

branches/casa-prerelease/pre-asap/src/MSWriter.cpp

@@ -583 +583 @@
 //   double startSec = gettimeofday_sec() ;
 //   os_ << "start MSWriter::setupMS() startSec=" << startSec << LogIO::POST ;
+  
+  String dunit = table_->getHeader().fluxunit ;
 
   TableDesc msDesc = MeasurementSet::requiredTableDesc() ;
@@ -593 +595 @@
 
   mstable_ = new MeasurementSet( newtab ) ;
+
+  TableColumn col ;
+  if ( useFloatData_ )
+    col.attach( *mstable_, "FLOAT_DATA" ) ;
+  else if ( useData_ )
+    col.attach( *mstable_, "DATA" ) ;
+  col.rwKeywordSet().define( "UNIT", dunit ) ;
 
   // create subtables
@@ -1275 +1284 @@
 
   // RESOLUTION, CHAN_WIDTH, EFFECTIVE_BW
-  Vector<Double> sharedDoubleArr( nchan, inc ) ;
+  Vector<Double> sharedDoubleArr( nchan, abs(inc) ) ;
   msSpwCols.resolution().put( spwid, sharedDoubleArr ) ;
   msSpwCols.chanWidth().put( spwid, sharedDoubleArr ) ;
@@ -1683 +1692 @@
   // OBS_MODE string of MS created by importasdm task is slightly 
   // (but critically) changed.
+  // 2011/05/20 TN
+  // OBS_MODE string of MS created by importasdm task is changed 
+  // again (separator is now "#" instead of "_"
+  String sep1="#" ;
+  String sep2="," ;
+  String target="OBSERVE_TARGET" ;
+  String atmcal="CALIBRATE_TEMPERATURE" ;
+  String onstr="ON_SOURCE" ;
+  String offstr="OFF_SOURCE" ;
+  String pswitch="POSITION_SWITCH" ;
+  String nod="NOD" ;
+  String fswitch="FREQUENCY_SWITCH" ;
+  String sigstr="SIG" ;
+  String refstr="REF" ;
+  String unspecified="UNSPECIFIED" ;
+  String ftlow="LOWER" ;
+  String fthigh="HIGHER" ;
   switch ( type ) {
   case SrcType::PSON:
-    stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
+    stype = target+sep1+onstr+sep2+pswitch ;
     b = True ;
     t = 0.0 ;
@@ -1691 +1718 @@
     break ;
   case SrcType::PSOFF:
-    stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
+    //stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
+    stype = target+sep1+offstr+sep2+pswitch ;
     b = False ;
     t = 0.0 ;
@@ -1697 +1725 @@
     break ;
   case SrcType::NOD:
-    stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
+    stype = target+sep1+onstr+sep2+nod ;
     b = True ;
     t = 0.0 ;
@@ -1703 +1732 @@
     break ;
   case SrcType::FSON:
-    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
+    stype = target+sep1+onstr+sep2+fswitch+sep1+sigstr ;
     b = True ;
     t = 0.0 ;
@@ -1709 +1739 @@
     break ;
   case SrcType::FSOFF:
-    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
+    stype = target+sep1+onstr+sep2+fswitch+sep1+refstr ;
     b = False ;
     t = 0.0 ;
@@ -1715 +1746 @@
     break ;
   case SrcType::SKY:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    stype = atmcal+sep1+offstr+sep2+unspecified ;
     b = False ;
     t = 0.0 ;
@@ -1721 +1753 @@
     break ;
   case SrcType::HOT:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    stype = atmcal+sep1+offstr+sep2+unspecified ;
     b = False ;
     t = 0.0 ;
@@ -1727 +1760 @@
     break ;
   case SrcType::WARM:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    stype = atmcal+sep1+offstr+sep2+unspecified ;
     t = 0.0 ;
     b = False ;
@@ -1733 +1767 @@
     break ;
   case SrcType::COLD:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
+    stype = atmcal+sep1+offstr+sep2+unspecified ;
     b = False ;
     t = 0.0 ;
@@ -1739 +1774 @@
     break ;
   case SrcType::PONCAL:
-    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
+    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
+    stype = atmcal+sep1+onstr+sep2+pswitch ;
     b = True ;
     t = 1.0 ;
@@ -1745 +1781 @@
     break ;
   case SrcType::POFFCAL:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
+    stype = atmcal+sep1+offstr+sep2+pswitch ;
     b = False ;
     t = 1.0 ;
@@ -1751 +1788 @@
     break ;
   case SrcType::NODCAL:
-    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
+    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
+    stype = atmcal+sep1+onstr+sep2+nod ;
     b = True ;
     t = 1.0 ;
@@ -1757 +1795 @@
     break ;
   case SrcType::FONCAL:
-    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
+    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
+    stype = atmcal+sep1+onstr+sep2+fswitch+sep1+sigstr ;
     b = True ;
     t = 1.0 ;
@@ -1763 +1802 @@
     break ;
   case SrcType::FOFFCAL:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+refstr ;
     b = False ;
     t = 1.0 ;
@@ -1769 +1809 @@
     break ;
   case SrcType::FSLO:
-    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = target+sep1+onstr+sep2+fswitch+sep1+ftlow ;
     b = True ;
     t = 0.0 ;
@@ -1775 +1816 @@
     break ;
   case SrcType::FLOOFF:
-    stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = target+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     b = False ;
     t = 0.0 ;
@@ -1781 +1823 @@
     break ;
   case SrcType::FLOSKY:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     b = False ;
     t = 0.0 ;
@@ -1787 +1830 @@
     break ;
   case SrcType::FLOHOT:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     b = False ;
     t = 0.0 ;
@@ -1793 +1837 @@
     break ;
   case SrcType::FLOWARM:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     b = False ;
     t = 0.0 ;
@@ -1799 +1844 @@
     break ;
   case SrcType::FLOCOLD:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     b = False ;
     t = 0.0 ;
@@ -1805 +1851 @@
     break ;
   case SrcType::FSHI:
-    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = target+sep1+onstr+sep2+fswitch+sep1+fthigh ;
     b = True ;
     t = 0.0 ;
@@ -1811 +1858 @@
     break ;
   case SrcType::FHIOFF:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = target+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     b = False ;
     t = 0.0 ;
@@ -1817 +1865 @@
     break ;
   case SrcType::FHISKY:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     b = False ;
     t = 0.0 ;
@@ -1823 +1872 @@
     break ;
   case SrcType::FHIHOT:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     b = False ;
     t = 0.0 ;
@@ -1829 +1879 @@
     break ;
   case SrcType::FHIWARM:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     b = False ;
     t = 0.0 ;
@@ -1835 +1886 @@
     break ;
   case SrcType::FHICOLD:
-    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
+    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     b = False ;
     t = 0.0 ;
@@ -1841 +1893 @@
     break ;
   case SrcType::SIG:
-    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
+    stype = target+sep1+onstr+sep2+unspecified ;
     b = True ;
     t = 0.0 ;
@@ -1847 +1900 @@
     break ;
   case SrcType::REF:
-    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
+    //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
+    stype = target+sep1+offstr+sep2+unspecified ;
     b = False ;
     t = 0.0 ;
@@ -1853 +1907 @@
     break ;
   default:
-    stype = "UNSPECIFIED" ;
+    //stype = "UNSPECIFIED" ;
+    stype = unspecified ;
     b = True ;
     t = 0.0 ;