Changeset 2191 for branches/casa-prerelease/pre-asap/src/MSFiller.cpp

Timestamp:

06/13/11 11:41:43 (13 years ago)

Author:

Kana Sugimoto

Message:

Reverted codes to r2187 to save snap shot for CASA3.2.0 and 3.2.1

File:

• branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) (6 diffs)

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 ) {
@@ -951 +949 @@
     sdh.antennaname = telescopeName + "//" + antennaName ;
   }
-  if ( stationName != "" && stationName != antennaName ) {
+  if ( stationName != "" ) {
     sdh.antennaname += "@" + stationName ;
   }
@@ -1052 +1050 @@
   else if ( tmpStr.find( "." ) != String::npos ) {
     sep = "." ;
-  }
-  else if ( tmpStr.find( "#" ) != String::npos ) {
-    sep = "#" ;
   }
   //else if ( obsMode.find( "_" ) != String::npos ) {
@@ -1111 +1106 @@
     }
   }
-  else if ( sep == "." || sep == "#" ) {
-    // sep == "." or "#"
+  else if ( sep == "." ) {
+    // sep == "."
     //
     // ALMA & EVLA case (MS via ASDM) before3.1
@@ -1569 +1564 @@
   if ( !isSysCal_ ) {
     os_ << "No TCAL rows" << LogIO::POST ;
-    Block<uInt> tcalids( 4, 0 ) ;
+    Block<uInt> tcalids( 0 ) ;
     return  tcalids ;
   }    
@@ -1577 +1572 @@
   if ( !tcalrec_.isDefined( key ) ) {
     os_ << "No TCAL rows" << LogIO::POST ;
-    Block<uInt> tcalids( 4, 0 ) ;
+    Block<uInt> tcalids( 0 ) ;
     return tcalids ;
   }