Changeset 2040 for trunk


Ignore:
Timestamp:
03/14/11 21:04:00 (14 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-2718

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

Changed OBS_MODE string.


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/MSWriter.cpp

    r2027 r2040  
    16771677//   os_ << "start MSWriter::queryType() startSec=" << startSec << LogIO::POST ;
    16781678
     1679  // 2011/03/14 TN
     1680  // OBS_MODE string of MS created by importasdm task is slightly
     1681  // (but critically) changed.
    16791682  switch ( type ) {
    16801683  case SrcType::PSON:
    1681     stype = "POSITION_SWITCH.OBSERVE_TARGET.ON_SOURCE" ;
     1684    stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ;
    16821685    b = True ;
    16831686    t = 0.0 ;
    … …  
    16851688    break ;
    16861689  case SrcType::PSOFF:
    1687     stype = "POSITION_SWITCH.OBSERVE_TARGET.OFF_SOURCE" ;
     1690    stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ;
    16881691    b = False ;
    16891692    t = 0.0 ;
    … …  
    16911694    break ;
    16921695  case SrcType::NOD:
    1693     stype = "NOD.OBSERVE_TARGET.ON_SOURCE" ;
     1696    stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ;
    16941697    b = True ;
    16951698    t = 0.0 ;
    … …  
    16971700    break ;
    16981701  case SrcType::FSON:
    1699     stype = "FREQUENCY_SWITCH.OBSERVE_TARGET.ON_SOURCE" ;
     1702    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    17001703    b = True ;
    17011704    t = 0.0 ;
    … …  
    17031706    break ;
    17041707  case SrcType::FSOFF:
    1705     stype = "FREQUENCY_SWITCH.OBSERVE_TARGET.ON_SOURCE" ;
     1708    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ;
    17061709    b = False ;
    17071710    t = 0.0 ;
    … …  
    17091712    break ;
    17101713  case SrcType::SKY:
    1711     stype = "UNSPECIFIED.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1714    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17121715    b = False ;
    17131716    t = 0.0 ;
    … …  
    17151718    break ;
    17161719  case SrcType::HOT:
    1717     stype = "UNSPECIFIED.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1720    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17181721    b = False ;
    17191722    t = 0.0 ;
    … …  
    17211724    break ;
    17221725  case SrcType::WARM:
    1723     stype = "UNSPECIFIED.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1726    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17241727    t = 0.0 ;
    17251728    b = False ;
    … …  
    17271730    break ;
    17281731  case SrcType::COLD:
    1729     stype = "UNSPECIFIED.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1732    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ;
    17301733    b = False ;
    17311734    t = 0.0 ;
    … …  
    17331736    break ;
    17341737  case SrcType::PONCAL:
    1735     stype = "POSITION_SWITCH.CALIBRATE_TEMPERATURE.ON_SOURCE" ;
     1738    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ;
    17361739    b = True ;
    17371740    t = 1.0 ;
    … …  
    17391742    break ;
    17401743  case SrcType::POFFCAL:
    1741     stype = "POSITION_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1744    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ;
    17421745    b = False ;
    17431746    t = 1.0 ;
    … …  
    17451748    break ;
    17461749  case SrcType::NODCAL:
    1747     stype = "NOD.CALIBRATE_TEMPERATURE.ON_SOURCE" ;
     1750    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ;
    17481751    b = True ;
    17491752    t = 1.0 ;
    … …  
    17511754    break ;
    17521755  case SrcType::FONCAL:
    1753     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.ON_SOURCE" ;
     1756    stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ;
    17541757    b = True ;
    17551758    t = 1.0 ;
    … …  
    17571760    break ;
    17581761  case SrcType::FOFFCAL:
    1759     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1762    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ;
    17601763    b = False ;
    17611764    t = 1.0 ;
    … …  
    17631766    break ;
    17641767  case SrcType::FSLO:
    1765     stype = "FREQUENCY_SWITCH.OBSERVE_TARGET.ON_SOURCE" ;
     1768    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17661769    b = True ;
    17671770    t = 0.0 ;
    … …  
    17691772    break ;
    17701773  case SrcType::FLOOFF:
    1771     stype = "FREQUENCY_SWITCH.OBSERVE_TARGET.OFF_SOURCE" ;
     1774    stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17721775    b = False ;
    17731776    t = 0.0 ;
    … …  
    17751778    break ;
    17761779  case SrcType::FLOSKY:
    1777     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1780    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17781781    b = False ;
    17791782    t = 0.0 ;
    … …  
    17811784    break ;
    17821785  case SrcType::FLOHOT:
    1783     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1786    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17841787    b = False ;
    17851788    t = 0.0 ;
    … …  
    17871790    break ;
    17881791  case SrcType::FLOWARM:
    1789     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1792    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17901793    b = False ;
    17911794    t = 0.0 ;
    … …  
    17931796    break ;
    17941797  case SrcType::FLOCOLD:
    1795     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1798    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ;
    17961799    b = False ;
    17971800    t = 0.0 ;
    … …  
    17991802    break ;
    18001803  case SrcType::FSHI:
    1801     stype = "FREQUENCY_SWITCH.OBSERVE_TARGET.ON_SOURCE" ;
     1804    stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18021805    b = True ;
    18031806    t = 0.0 ;
    … …  
    18051808    break ;
    18061809  case SrcType::FHIOFF:
    1807     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1810    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18081811    b = False ;
    18091812    t = 0.0 ;
    … …  
    18111814    break ;
    18121815  case SrcType::FHISKY:
    1813     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1816    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18141817    b = False ;
    18151818    t = 0.0 ;
    … …  
    18171820    break ;
    18181821  case SrcType::FHIHOT:
    1819     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1822    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18201823    b = False ;
    18211824    t = 0.0 ;
    … …  
    18231826    break ;
    18241827  case SrcType::FHIWARM:
    1825     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1828    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18261829    b = False ;
    18271830    t = 0.0 ;
    … …  
    18291832    break ;
    18301833  case SrcType::FHICOLD:
    1831     stype = "FREQUENCY_SWITCH.CALIBRATE_TEMPERATURE.OFF_SOURCE" ;
     1834    stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ;
    18321835    b = False ;
    18331836    t = 0.0 ;
    … …  
    18351838    break ;
    18361839  case SrcType::SIG:
    1837     stype = "UNSPECIFIED.OBSERVE_TARGET.ON_SOURCE" ;
     1840    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    18381841    b = True ;
    18391842    t = 0.0 ;
    … …  
    18411844    break ;
    18421845  case SrcType::REF:
    1843     stype = "UNSPECIFIED.OBSERVE_TARGET.ON_SOURCE" ;
     1846    stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ;
    18441847    b = False ;
    18451848    t = 0.0 ;
Note: See TracChangeset for help on using the changeset viewer.