Changeset 2188
- Timestamp:
- 06/09/11 11:38:13 (14 years ago)
- Location:
- branches/casa-prerelease/pre-asap
- Files:
-
- 13 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/Makefile
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/SConstruct
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/apps
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/external-alma
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/getsvnrev.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/python
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/casa-prerelease/pre-asap/python/flagtoolbar.py
- Property svn:mergeinfo changed
/trunk/python/flagtoolbar.py 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 } -
branches/casa-prerelease/pre-asap/src/MSWriter.cpp
r2105 r2188 583 583 // double startSec = gettimeofday_sec() ; 584 584 // os_ << "start MSWriter::setupMS() startSec=" << startSec << LogIO::POST ; 585 586 String dunit = table_->getHeader().fluxunit ; 585 587 586 588 TableDesc msDesc = MeasurementSet::requiredTableDesc() ; … … 593 595 594 596 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 ) ; 595 604 596 605 // create subtables … … 1275 1284 1276 1285 // RESOLUTION, CHAN_WIDTH, EFFECTIVE_BW 1277 Vector<Double> sharedDoubleArr( nchan, inc) ;1286 Vector<Double> sharedDoubleArr( nchan, abs(inc) ) ; 1278 1287 msSpwCols.resolution().put( spwid, sharedDoubleArr ) ; 1279 1288 msSpwCols.chanWidth().put( spwid, sharedDoubleArr ) ; … … 1683 1692 // OBS_MODE string of MS created by importasdm task is slightly 1684 1693 // (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" ; 1685 1711 switch ( type ) { 1686 1712 case SrcType::PSON: 1687 stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ; 1713 //stype = "OBSERVE_TARGET_ON_SOURCE,POSITION_SWITCH" ; 1714 stype = target+sep1+onstr+sep2+pswitch ; 1688 1715 b = True ; 1689 1716 t = 0.0 ; … … 1691 1718 break ; 1692 1719 case SrcType::PSOFF: 1693 stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ; 1720 //stype = "OBSERVE_TARGET_OFF_SOURCE,POSITION_SWITCH" ; 1721 stype = target+sep1+offstr+sep2+pswitch ; 1694 1722 b = False ; 1695 1723 t = 0.0 ; … … 1697 1725 break ; 1698 1726 case SrcType::NOD: 1699 stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ; 1727 //stype = "OBSERVE_TARGET_ON_SOURCE,NOD" ; 1728 stype = target+sep1+onstr+sep2+nod ; 1700 1729 b = True ; 1701 1730 t = 0.0 ; … … 1703 1732 break ; 1704 1733 case SrcType::FSON: 1705 stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ; 1734 //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_SIG" ; 1735 stype = target+sep1+onstr+sep2+fswitch+sep1+sigstr ; 1706 1736 b = True ; 1707 1737 t = 0.0 ; … … 1709 1739 break ; 1710 1740 case SrcType::FSOFF: 1711 stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ; 1741 //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_REF" ; 1742 stype = target+sep1+onstr+sep2+fswitch+sep1+refstr ; 1712 1743 b = False ; 1713 1744 t = 0.0 ; … … 1715 1746 break ; 1716 1747 case SrcType::SKY: 1717 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1748 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1749 stype = atmcal+sep1+offstr+sep2+unspecified ; 1718 1750 b = False ; 1719 1751 t = 0.0 ; … … 1721 1753 break ; 1722 1754 case SrcType::HOT: 1723 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1755 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1756 stype = atmcal+sep1+offstr+sep2+unspecified ; 1724 1757 b = False ; 1725 1758 t = 0.0 ; … … 1727 1760 break ; 1728 1761 case SrcType::WARM: 1729 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1762 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1763 stype = atmcal+sep1+offstr+sep2+unspecified ; 1730 1764 t = 0.0 ; 1731 1765 b = False ; … … 1733 1767 break ; 1734 1768 case SrcType::COLD: 1735 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1769 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,UNSPECIFIED" ; 1770 stype = atmcal+sep1+offstr+sep2+unspecified ; 1736 1771 b = False ; 1737 1772 t = 0.0 ; … … 1739 1774 break ; 1740 1775 case SrcType::PONCAL: 1741 stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ; 1776 //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,POSITION_SWITCH" ; 1777 stype = atmcal+sep1+onstr+sep2+pswitch ; 1742 1778 b = True ; 1743 1779 t = 1.0 ; … … 1745 1781 break ; 1746 1782 case SrcType::POFFCAL: 1747 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ; 1783 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,POSITION_SWITCH" ; 1784 stype = atmcal+sep1+offstr+sep2+pswitch ; 1748 1785 b = False ; 1749 1786 t = 1.0 ; … … 1751 1788 break ; 1752 1789 case SrcType::NODCAL: 1753 stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ; 1790 //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,NOD" ; 1791 stype = atmcal+sep1+onstr+sep2+nod ; 1754 1792 b = True ; 1755 1793 t = 1.0 ; … … 1757 1795 break ; 1758 1796 case SrcType::FONCAL: 1759 stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ; 1797 //stype = "CALIBRATE_TEMPERATURE_ON_SOURCE,FREQUENCY_SWITCH_SIG" ; 1798 stype = atmcal+sep1+onstr+sep2+fswitch+sep1+sigstr ; 1760 1799 b = True ; 1761 1800 t = 1.0 ; … … 1763 1802 break ; 1764 1803 case SrcType::FOFFCAL: 1765 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ; 1804 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_REF" ; 1805 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+refstr ; 1766 1806 b = False ; 1767 1807 t = 1.0 ; … … 1769 1809 break ; 1770 1810 case SrcType::FSLO: 1771 stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1811 //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1812 stype = target+sep1+onstr+sep2+fswitch+sep1+ftlow ; 1772 1813 b = True ; 1773 1814 t = 0.0 ; … … 1775 1816 break ; 1776 1817 case SrcType::FLOOFF: 1777 stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1818 //stype = "OBSERVE_TARGET_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1819 stype = target+sep1+offstr+sep2+fswitch+sep1+ftlow ; 1778 1820 b = False ; 1779 1821 t = 0.0 ; … … 1781 1823 break ; 1782 1824 case SrcType::FLOSKY: 1783 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1825 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1826 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ; 1784 1827 b = False ; 1785 1828 t = 0.0 ; … … 1787 1830 break ; 1788 1831 case SrcType::FLOHOT: 1789 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1832 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1833 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ; 1790 1834 b = False ; 1791 1835 t = 0.0 ; … … 1793 1837 break ; 1794 1838 case SrcType::FLOWARM: 1795 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1839 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1840 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ; 1796 1841 b = False ; 1797 1842 t = 0.0 ; … … 1799 1844 break ; 1800 1845 case SrcType::FLOCOLD: 1801 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1846 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_LOWER" ; 1847 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+ftlow ; 1802 1848 b = False ; 1803 1849 t = 0.0 ; … … 1805 1851 break ; 1806 1852 case SrcType::FSHI: 1807 stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1853 //stype = "OBSERVE_TARGET_ON_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1854 stype = target+sep1+onstr+sep2+fswitch+sep1+fthigh ; 1808 1855 b = True ; 1809 1856 t = 0.0 ; … … 1811 1858 break ; 1812 1859 case SrcType::FHIOFF: 1813 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1860 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1861 stype = target+sep1+offstr+sep2+fswitch+sep1+fthigh ; 1814 1862 b = False ; 1815 1863 t = 0.0 ; … … 1817 1865 break ; 1818 1866 case SrcType::FHISKY: 1819 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1867 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1868 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ; 1820 1869 b = False ; 1821 1870 t = 0.0 ; … … 1823 1872 break ; 1824 1873 case SrcType::FHIHOT: 1825 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1874 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1875 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ; 1826 1876 b = False ; 1827 1877 t = 0.0 ; … … 1829 1879 break ; 1830 1880 case SrcType::FHIWARM: 1831 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1881 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1882 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ; 1832 1883 b = False ; 1833 1884 t = 0.0 ; … … 1835 1886 break ; 1836 1887 case SrcType::FHICOLD: 1837 stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1888 //stype = "CALIBRATE_TEMPERATURE_OFF_SOURCE,FREQUENCY_SWITCH_HIGHER" ; 1889 stype = atmcal+sep1+offstr+sep2+fswitch+sep1+fthigh ; 1838 1890 b = False ; 1839 1891 t = 0.0 ; … … 1841 1893 break ; 1842 1894 case SrcType::SIG: 1843 stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ; 1895 //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ; 1896 stype = target+sep1+onstr+sep2+unspecified ; 1844 1897 b = True ; 1845 1898 t = 0.0 ; … … 1847 1900 break ; 1848 1901 case SrcType::REF: 1849 stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ; 1902 //stype = "OBSERVE_TARGET_ON_SOURCE,UNSPECIFIED" ; 1903 stype = target+sep1+offstr+sep2+unspecified ; 1850 1904 b = False ; 1851 1905 t = 0.0 ; … … 1853 1907 break ; 1854 1908 default: 1855 stype = "UNSPECIFIED" ; 1909 //stype = "UNSPECIFIED" ; 1910 stype = unspecified ; 1856 1911 b = True ; 1857 1912 t = 0.0 ; -
branches/casa-prerelease/pre-asap/src/SConscript
- Property svn:mergeinfo changed (with no actual effect on merging)
Note:
See TracChangeset
for help on using the changeset viewer.