Changeset 2188 for branches/casa-prerelease/pre-asap/src/MSFiller.cpp
- Timestamp:
- 06/09/11 11:38:13 (13 years ago)
- Location:
- branches/casa-prerelease/pre-asap
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/casa-prerelease/pre-asap
- Property svn:mergeinfo changed
/trunk merged: 2167,2176,2184-2185,2187
- Property svn:mergeinfo changed
-
branches/casa-prerelease/pre-asap/src
- Property svn:mergeinfo changed
/trunk/src merged: 2167,2176,2184-2185,2187
- Property svn:mergeinfo changed
-
branches/casa-prerelease/pre-asap/src/MSFiller.cpp
r2165 r2188 601 601 Vector< Quantum<Double> > chanFreqs = (*sharedQDArrCol)( spwId ) ; 602 602 delete sharedQDArrCol ; 603 if ( nchan > 1 && chanFreqs[0].getValue("Hz") > chanFreqs[1].getValue("Hz") ) 604 increment *= -1.0 ; 603 605 if ( freqRef == MFrequency::LSRK ) { 604 606 if ( even ) { … … 949 951 sdh.antennaname = telescopeName + "//" + antennaName ; 950 952 } 951 if ( stationName != "" ) {953 if ( stationName != "" && stationName != antennaName ) { 952 954 sdh.antennaname += "@" + stationName ; 953 955 } … … 1050 1052 else if ( tmpStr.find( "." ) != String::npos ) { 1051 1053 sep = "." ; 1054 } 1055 else if ( tmpStr.find( "#" ) != String::npos ) { 1056 sep = "#" ; 1052 1057 } 1053 1058 //else if ( obsMode.find( "_" ) != String::npos ) { … … 1106 1111 } 1107 1112 } 1108 else if ( sep == "." ) {1109 // sep == "." 1113 else if ( sep == "." || sep == "#" ) { 1114 // sep == "." or "#" 1110 1115 // 1111 1116 // ALMA & EVLA case (MS via ASDM) before3.1 … … 1564 1569 if ( !isSysCal_ ) { 1565 1570 os_ << "No TCAL rows" << LogIO::POST ; 1566 Block<uInt> tcalids( 0 ) ;1571 Block<uInt> tcalids( 4, 0 ) ; 1567 1572 return tcalids ; 1568 1573 } … … 1572 1577 if ( !tcalrec_.isDefined( key ) ) { 1573 1578 os_ << "No TCAL rows" << LogIO::POST ; 1574 Block<uInt> tcalids( 0 ) ;1579 Block<uInt> tcalids( 4, 0 ) ; 1575 1580 return tcalids ; 1576 1581 }
Note: See TracChangeset
for help on using the changeset viewer.