Changeset 2191 for branches


Ignore:
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

Location:
branches/casa-prerelease/pre-asap/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r2188 r2191  
    601601          Vector< Quantum<Double> > chanFreqs = (*sharedQDArrCol)( spwId ) ;
    602602          delete sharedQDArrCol ;
    603           if ( nchan > 1 && chanFreqs[0].getValue("Hz") > chanFreqs[1].getValue("Hz") )
    604             increment *= -1.0 ;
    605603          if ( freqRef == MFrequency::LSRK ) {
    606604            if ( even ) {
    … …  
    951949    sdh.antennaname = telescopeName + "//" + antennaName ;
    952950  }
    953   if ( stationName != "" && stationName != antennaName ) {
     951  if ( stationName != "" ) {
    954952    sdh.antennaname += "@" + stationName ;
    955953  }
    … …  
    10521050  else if ( tmpStr.find( "." ) != String::npos ) {
    10531051    sep = "." ;
    1054   }
    1055   else if ( tmpStr.find( "#" ) != String::npos ) {
    1056     sep = "#" ;
    10571052  }
    10581053  //else if ( obsMode.find( "_" ) != String::npos ) {
    … …  
    11111106    }
    11121107  }
    1113   else if ( sep == "." || sep == "#" ) {
    1114     // sep == "." or "#"
     1108  else if ( sep == "." ) {
     1109    // sep == "."
    11151110    //
    11161111    // ALMA & EVLA case (MS via ASDM) before3.1
    … …  
    15691564  if ( !isSysCal_ ) {
    15701565    os_ << "No TCAL rows" << LogIO::POST ;
    1571     Block<uInt> tcalids( 4, 0 ) ;
     1566    Block<uInt> tcalids( 0 ) ;
    15721567    return  tcalids ;
    15731568  }   
    … …  
    15771572  if ( !tcalrec_.isDefined( key ) ) {
    15781573    os_ << "No TCAL rows" << LogIO::POST ;
    1579     Block<uInt> tcalids( 4, 0 ) ;
     1574    Block<uInt> tcalids( 0 ) ;
    15801575    return tcalids ;
    15811576  }

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

    r2188 r2191  
    583583//   double startSec = gettimeofday_sec() ;
    584584//   os_ << "start MSWriter::setupMS() startSec=" << startSec << LogIO::POST ;
    585  
    586   String dunit = table_->getHeader().fluxunit ;
    587585
    588586  TableDesc msDesc = MeasurementSet::requiredTableDesc() ;
    … …  
    595593
    596594  mstable_ = new MeasurementSet( newtab ) ;
    597 
    598   TableColumn col ;
    599   if ( useFloatData_ )
    600     col.attach( *mstable_, "FLOAT_DATA" ) ;
    601   else if ( useData_ )
    602     col.attach( *mstable_, "DATA" ) ;
    603   col.rwKeywordSet().define( "UNIT", dunit ) ;
    604595
    605596  // create subtables
    … …  
    12841275
    12851276  // RESOLUTION, CHAN_WIDTH, EFFECTIVE_BW
    1286   Vector<Double> sharedDoubleArr( nchan, abs(inc) ) ;
     1277  Vector<Double> sharedDoubleArr( nchan, inc ) ;
    12871278  msSpwCols.resolution().put( spwid, sharedDoubleArr ) ;
    12881279  msSpwCols.chanWidth().put( spwid, sharedDoubleArr ) ;
    … …  
    16921683  // OBS_MODE string of MS created by importasdm task is slightly
    16931684  // (but critically) changed.
    1694   // 2011/05/20 TN
    1695   // OBS_MODE string of MS created by importasdm task is changed
    1696   // again (separator is now "#" instead of "_"
    1697   String sep1="#" ;
    1698   String sep2="," ;
    1699   String target="OBSERVE_TARGET" ;
    1700   String atmcal="CALIBRATE_TEMPERATURE" ;
    1701   String onstr="ON_SOURCE" ;
    1702   String offstr="OFF_SOURCE" ;
    1703   String pswitch="POSITION_SWITCH" ;
    1704   String nod="NOD" ;
    1705   String fswitch="FREQUENCY_SWITCH" ;
    1706   String sigstr="SIG" ;
    1707   String refstr="REF" ;
    1708   String unspecified="UNSPECIFIED" ;
    1709   String ftlow="LOWER" ;
    1710   String fthigh="HIGHER" ;
    17111685  switch ( type ) {
    17121686  case SrcType::PSON:
    1713     //stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
    1714     stype = target+sep1+onstr+sep2+pswitch ;
     1687    stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
    17151688    b = True ;
    17161689    t = 0.0 ;
    … …  
    17181691    break ;
    17191692  case SrcType::PSOFF:
    1720     //stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
    1721     stype = target+sep1+offstr+sep2+pswitch ;
     1693    stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
    17221694    b = False ;
    17231695    t = 0.0 ;
    … …  
    17251697    break ;
    17261698  case SrcType::NOD:
    1727     //stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
    1728     stype = target+sep1+onstr+sep2+nod ;
     1699    stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
    17291700    b = True ;
    17301701    t = 0.0 ;
    … …  
    17321703    break ;
    17331704  case SrcType::FSON:
    1734     //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    1735     stype = target+sep1+onstr+sep2+fswitch+sep1+sigstr ;
     1705    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    17361706    b = True ;
    17371707    t = 0.0 ;
    … …  
    17391709    break ;
    17401710  case SrcType::FSOFF:
    1741     //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
    1742     stype = target+sep1+onstr+sep2+fswitch+sep1+refstr ;
     1711    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
    17431712    b = False ;
    17441713    t = 0.0 ;
    … …  
    17461715    break ;
    17471716  case SrcType::SKY:
    1748     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    1749     stype = atmcal+sep1+offstr+sep2+unspecified ;
     1717    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17501718    b = False ;
    17511719    t = 0.0 ;
    … …  
    17531721    break ;
    17541722  case SrcType::HOT:
    1755     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    1756     stype = atmcal+sep1+offstr+sep2+unspecified ;
     1723    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17571724    b = False ;
    17581725    t = 0.0 ;
    … …  
    17601727    break ;
    17611728  case SrcType::WARM:
    1762     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    1763     stype = atmcal+sep1+offstr+sep2+unspecified ;
     1729    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17641730    t = 0.0 ;
    17651731    b = False ;
    … …  
    17671733    break ;
    17681734  case SrcType::COLD:
    1769     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    1770     stype = atmcal+sep1+offstr+sep2+unspecified ;
     1735    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17711736    b = False ;
    17721737    t = 0.0 ;
    … …  
    17741739    break ;
    17751740  case SrcType::PONCAL:
    1776     //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
    1777     stype = atmcal+sep1+onstr+sep2+pswitch ;
     1741    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
    17781742    b = True ;
    17791743    t = 1.0 ;
    … …  
    17811745    break ;
    17821746  case SrcType::POFFCAL:
    1783     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
    1784     stype = atmcal+sep1+offstr+sep2+pswitch ;
     1747    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
    17851748    b = False ;
    17861749    t = 1.0 ;
    … …  
    17881751    break ;
    17891752  case SrcType::NODCAL:
    1790     //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
    1791     stype = atmcal+sep1+onstr+sep2+nod ;
     1753    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
    17921754    b = True ;
    17931755    t = 1.0 ;
    … …  
    17951757    break ;
    17961758  case SrcType::FONCAL:
    1797     //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    1798     stype = atmcal+sep1+onstr+sep2+fswitch+sep1+sigstr ;
     1759    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    17991760    b = True ;
    18001761    t = 1.0 ;
    … …  
    18021763    break ;
    18031764  case SrcType::FOFFCAL:
    1804     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
    1805     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+refstr ;
     1765    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
    18061766    b = False ;
    18071767    t = 1.0 ;
    … …  
    18091769    break ;
    18101770  case SrcType::FSLO:
    1811     //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1812     stype = target+sep1+onstr+sep2+fswitch+sep1+ftlow ;
     1771    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18131772    b = True ;
    18141773    t = 0.0 ;
    … …  
    18161775    break ;
    18171776  case SrcType::FLOOFF:
    1818     //stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1819     stype = target+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     1777    stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18201778    b = False ;
    18211779    t = 0.0 ;
    … …  
    18231781    break ;
    18241782  case SrcType::FLOSKY:
    1825     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1826     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     1783    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18271784    b = False ;
    18281785    t = 0.0 ;
    … …  
    18301787    break ;
    18311788  case SrcType::FLOHOT:
    1832     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1833     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     1789    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18341790    b = False ;
    18351791    t = 0.0 ;
    … …  
    18371793    break ;
    18381794  case SrcType::FLOWARM:
    1839     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1840     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     1795    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18411796    b = False ;
    18421797    t = 0.0 ;
    … …  
    18441799    break ;
    18451800  case SrcType::FLOCOLD:
    1846     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    1847     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
     1801    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    18481802    b = False ;
    18491803    t = 0.0 ;
    … …  
    18511805    break ;
    18521806  case SrcType::FSHI:
    1853     //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1854     stype = target+sep1+onstr+sep2+fswitch+sep1+fthigh ;
     1807    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18551808    b = True ;
    18561809    t = 0.0 ;
    … …  
    18581811    break ;
    18591812  case SrcType::FHIOFF:
    1860     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1861     stype = target+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     1813    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18621814    b = False ;
    18631815    t = 0.0 ;
    … …  
    18651817    break ;
    18661818  case SrcType::FHISKY:
    1867     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1868     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     1819    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18691820    b = False ;
    18701821    t = 0.0 ;
    … …  
    18721823    break ;
    18731824  case SrcType::FHIHOT:
    1874     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1875     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     1825    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18761826    b = False ;
    18771827    t = 0.0 ;
    … …  
    18791829    break ;
    18801830  case SrcType::FHIWARM:
    1881     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1882     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     1831    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18831832    b = False ;
    18841833    t = 0.0 ;
    … …  
    18861835    break ;
    18871836  case SrcType::FHICOLD:
    1888     //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    1889     stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
     1837    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18901838    b = False ;
    18911839    t = 0.0 ;
    … …  
    18931841    break ;
    18941842  case SrcType::SIG:
    1895     //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    1896     stype = target+sep1+onstr+sep2+unspecified ;
     1843    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    18971844    b = True ;
    18981845    t = 0.0 ;
    … …  
    19001847    break ;
    19011848  case SrcType::REF:
    1902     //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    1903     stype = target+sep1+offstr+sep2+unspecified ;
     1849    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    19041850    b = False ;
    19051851    t = 0.0 ;
    … …  
    19071853    break ;
    19081854  default:
    1909     //stype = "UNSPECIFIED" ;
    1910     stype = unspecified ;
     1855    stype = "UNSPECIFIED" ;
    19111856    b = True ;
    19121857    t = 0.0 ;
Note: See TracChangeset for help on using the changeset viewer.