Changeset 2176


Ignore:
Timestamp:
05/20/11 15:44:24 (14 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...

Separater for OBS_MODE is changed from "_" to "#".


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/MSWriter.cpp

    r2104 r2176  
    16831683  // OBS_MODE string of MS created by importasdm task is slightly
    16841684  // (but critically) changed.
     1685  // 2011/05/20 TN
     1686  // OBS_MODE string of MS created by importasdm task is changed
     1687  // again (separator is now "#" instead of "_"
     1688  String sep1="#" ;
     1689  String sep2="," ;
     1690  String target="OBSERVE_TARGET" ;
     1691  String atmcal="CALIBRATE_TEMPERATURE" ;
     1692  String onstr="ON_SOURCE" ;
     1693  String offstr="OFF_SOURCE" ;
     1694  String pswitch="POSITION_SWITCH" ;
     1695  String nod="NOD" ;
     1696  String fswitch="FREQUENCY_SWITCH" ;
     1697  String sigstr="SIG" ;
     1698  String refstr="REF" ;
     1699  String unspecified="UNSPECIFIED" ;
     1700  String ftlow="LOWER" ;
     1701  String fthigh="HIGHER" ;
    16851702  switch ( type ) {
    16861703  case SrcType::PSON:
    1687     stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
     1704    //stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
     1705    stype = target+sep1+onstr+sep2+pswitch ;
    16881706    b = True ;
    16891707    t = 0.0 ;
    … …  
    16911709    break ;
    16921710  case SrcType::PSOFF:
    1693     stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
     1711    //stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
     1712    stype = target+sep1+offstr+sep2+pswitch ;
    16941713    b = False ;
    16951714    t = 0.0 ;
    … …  
    16971716    break ;
    16981717  case SrcType::NOD:
    1699     stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
     1718    //stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
     1719    stype = target+sep1+onstr+sep2+nod ;
    17001720    b = True ;
    17011721    t = 0.0 ;
    … …  
    17031723    break ;
    17041724  case SrcType::FSON:
    1705     stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
     1725    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
     1726    stype = target+sep1+onstr+sep2+fswitch+sep1+sigstr ;
    17061727    b = True ;
    17071728    t = 0.0 ;
    … …  
    17091730    break ;
    17101731  case SrcType::FSOFF:
    1711     stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
     1732    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
     1733    stype = target+sep1+onstr+sep2+fswitch+sep1+refstr ;
    17121734    b = False ;
    17131735    t = 0.0 ;
    … …  
    17151737    break ;
    17161738  case SrcType::SKY:
    1717     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1739    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1740    stype = atmcal+sep1+offstr+sep2+unspecified ;
    17181741    b = False ;
    17191742    t = 0.0 ;
    … …  
    17211744    break ;
    17221745  case SrcType::HOT:
    1723     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1746    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1747    stype = atmcal+sep1+offstr+sep2+unspecified ;
    17241748    b = False ;
    17251749    t = 0.0 ;
    … …  
    17271751    break ;
    17281752  case SrcType::WARM:
    1729     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1753    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1754    stype = atmcal+sep1+offstr+sep2+unspecified ;
    17301755    t = 0.0 ;
    17311756    b = False ;
    … …  
    17331758    break ;
    17341759  case SrcType::COLD:
    1735     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1760    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
     1761    stype = atmcal+sep1+offstr+sep2+unspecified ;
    17361762    b = False ;
    17371763    t = 0.0 ;
    … …  
    17391765    break ;
    17401766  case SrcType::PONCAL:
    1741     stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
     1767    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
     1768    stype = atmcal+sep1+onstr+sep2+pswitch ;
    17421769    b = True ;
    17431770    t = 1.0 ;
    … …  
    17451772    break ;
    17461773  case SrcType::POFFCAL:
    1747     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
     1774    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
     1775    stype = atmcal+sep1+offstr+sep2+pswitch ;
    17481776    b = False ;
    17491777    t = 1.0 ;
    … …  
    17511779    break ;
    17521780  case SrcType::NODCAL:
    1753     stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
     1781    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
     1782    stype = atmcal+sep1+onstr+sep2+nod ;
    17541783    b = True ;
    17551784    t = 1.0 ;
    … …  
    17571786    break ;
    17581787  case SrcType::FONCAL:
    1759     stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
     1788    //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
     1789    stype = atmcal+sep1+onstr+sep2+fswitch+sep1+sigstr ;
    17601790    b = True ;
    17611791    t = 1.0 ;
    … …  
    17631793    break ;
    17641794  case SrcType::FOFFCAL:
    1765     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
     1795    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
     1796    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+refstr ;
    17661797    b = False ;
    17671798    t = 1.0 ;
    … …  
    17691800    break ;
    17701801  case SrcType::FSLO:
    1771     stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1802    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1803    stype = target+sep1+onstr+sep2+fswitch+sep1+ftlow ;
    17721804    b = True ;
    17731805    t = 0.0 ;
    … …  
    17751807    break ;
    17761808  case SrcType::FLOOFF:
    1777     stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1809    //stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1810    stype = target+sep1+offstr+sep2+fswitch+sep1+ftlow ;
    17781811    b = False ;
    17791812    t = 0.0 ;
    … …  
    17811814    break ;
    17821815  case SrcType::FLOSKY:
    1783     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1816    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1817    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
    17841818    b = False ;
    17851819    t = 0.0 ;
    … …  
    17871821    break ;
    17881822  case SrcType::FLOHOT:
    1789     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1823    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1824    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
    17901825    b = False ;
    17911826    t = 0.0 ;
    … …  
    17931828    break ;
    17941829  case SrcType::FLOWARM:
    1795     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1830    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1831    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
    17961832    b = False ;
    17971833    t = 0.0 ;
    … …  
    17991835    break ;
    18001836  case SrcType::FLOCOLD:
    1801     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1837    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
     1838    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ;
    18021839    b = False ;
    18031840    t = 0.0 ;
    … …  
    18051842    break ;
    18061843  case SrcType::FSHI:
    1807     stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1844    //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1845    stype = target+sep1+onstr+sep2+fswitch+sep1+fthigh ;
    18081846    b = True ;
    18091847    t = 0.0 ;
    … …  
    18111849    break ;
    18121850  case SrcType::FHIOFF:
    1813     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1851    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1852    stype = target+sep1+offstr+sep2+fswitch+sep1+fthigh ;
    18141853    b = False ;
    18151854    t = 0.0 ;
    … …  
    18171856    break ;
    18181857  case SrcType::FHISKY:
    1819     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1858    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1859    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
    18201860    b = False ;
    18211861    t = 0.0 ;
    … …  
    18231863    break ;
    18241864  case SrcType::FHIHOT:
    1825     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1865    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1866    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
    18261867    b = False ;
    18271868    t = 0.0 ;
    … …  
    18291870    break ;
    18301871  case SrcType::FHIWARM:
    1831     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1872    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1873    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
    18321874    b = False ;
    18331875    t = 0.0 ;
    … …  
    18351877    break ;
    18361878  case SrcType::FHICOLD:
    1837     stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1879    //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
     1880    stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ;
    18381881    b = False ;
    18391882    t = 0.0 ;
    … …  
    18411884    break ;
    18421885  case SrcType::SIG:
    1843     stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
     1886    //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
     1887    stype = target+sep1+onstr+sep2+unspecified ;
    18441888    b = True ;
    18451889    t = 0.0 ;
    … …  
    18471891    break ;
    18481892  case SrcType::REF:
    1849     stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
     1893    //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
     1894    stype = target+sep1+offstr+sep2+unspecified ;
    18501895    b = False ;
    18511896    t = 0.0 ;
    … …  
    18531898    break ;
    18541899  default:
    1855     stype = "UNSPECIFIED" ;
     1900    //stype = "UNSPECIFIED" ;
     1901    stype = unspecified ;
    18561902    b = True ;
    18571903    t = 0.0 ;
Note: See TracChangeset for help on using the changeset viewer.