diff --git a/docs/source/sites.rst b/docs/source/sites.rst index 727e481..f0e34f5 100644 --- a/docs/source/sites.rst +++ b/docs/source/sites.rst @@ -12,10 +12,6 @@ Supported sites +---------------------+--------------------------------------------------------------+------------------+-------------------+--------------------+---------------------+------------------------------------------------------------------------+ | cerro_chajnantor | Cerro Chajnantor (CCAT, TAO) | chajnantor | 5600 | -22.9862 | -67.7422 | https://act.princeton.edu/ | +---------------------+--------------------------------------------------------------+------------------+-------------------+--------------------+---------------------+------------------------------------------------------------------------+ -| cerro_pachon | Rubin Observatory (LSST) | cerro_pachon | 2663 | -30.2446 | -70.7494 | https://rubinobservatory.org/about | -+---------------------+--------------------------------------------------------------+------------------+-------------------+--------------------+---------------------+------------------------------------------------------------------------+ -| cerro_paranal | Cerro Paranal (VLT) | cerro_paranal | 2635 | -24.6273 | -70.4042 | https://www.eso.org/public/teles-instr/paranal-observatory/vlt/ | -+---------------------+--------------------------------------------------------------+------------------+-------------------+--------------------+---------------------+------------------------------------------------------------------------+ | cerro_toco | Cerro Toco (ACT, POLARBEAR, SO) | chajnantor | 5190 | -22.9586 | -67.7878 | https://act.princeton.edu/ | +---------------------+--------------------------------------------------------------+------------------+-------------------+--------------------+---------------------+------------------------------------------------------------------------+ | effelsberg | Effelsberg (ERT) | effelsberg | 319 | 50.5247 | 6.8828 | https://www.mpifr-bonn.mpg.de/en/effelsberg | diff --git a/maria/instrument/dets/aca.csv b/maria/instrument/dets/aca.csv new file mode 100644 index 0000000..4a70421 --- /dev/null +++ b/maria/instrument/dets/aca.csv @@ -0,0 +1,11 @@ +baseline_x,baseline_y,baseline_z,diam,pad +-37.01384552, -551.9319303, -2.325092815, 7., N601 +-49.28641965, -547.2313425, -2.314768924, 7., N602 +-58.37145080, -591.2840731, -2.322794526, 7., N604 +-38.88669906, -585.9530019, -2.317152015, 7., N606 +-47.99531371, -564.8585951, -2.318302577, 7., J501 +-55.96985522, -568.8204563, -2.321721131, 7., J502 +-63.03702802, -574.7165969, -2.320317857, 7., J506 +-48.84480314, -574.4357151, -2.325168129, 7., J503 +-35.89239576, -569.6206755, -2.318648465, 7., J504 +-65.31846157, -560.7014943, -2.320087842, 7., J505 diff --git a/maria/instrument/dets/alma.cycle10.2.cfg b/maria/instrument/dets/alma.cycle10.2.cfg new file mode 100644 index 0000000..4414668 --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.2.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +-33.89412596 -712.7516484 -2.330089496 12. A001 +-17.45390887 -709.6086972 -2.32867142 12. A002 +-22.5589292 -691.9838607 -2.323742384 12. A003 +-5.421013146 -723.7911045 -2.334250518 12. A004 +25.24593899 -744.4318445 -2.336684256 12. A005 +20.94634824 -721.464646 -2.333017829 12. A006 +15.93453511 -700.6757482 -2.32967552 12. A007 +9.482335836 -687.0764746 -2.729176727 12. A008 +-20.89371519 -653.559982 -2.43766594 12. A010 +37.82617818 -735.8760818 -2.484749162 12. A011 +10.73987943 -659.5673638 -2.726261907 12. A015 +-20.62042134 -633.9073418 -2.527672839 12. A016 +-6.712372688 -684.9519378 -2.3269437 12. A017 +-50.30411069 -711.209498 -2.332024766 12. A019 +-43.64407228 -652.7424613 -2.322696805 12. A022 +-59.4042934 -667.5717395 -2.130365568 12. A023 +-74.47461587 -684.6574595 -2.129342649 12. A024 +-84.5230042 -704.8937799 -1.937681767 12. A025 +-86.87286754 -732.2620426 -1.928810218 12. A026 +-93.14292454 -745.9594809 -1.941492838 12. A027 +-105.4387377 -755.003357 -1.640752815 12. A033 +-76.90232093 -718.1727584 -1.929073338 12. A034 +-26.04186157 -726.1888088 -2.332575051 12. A035 +-15.39951252 -746.3592279 -2.331879161 12. A036 +-64.18907113 -771.1494896 -1.940145207 12. A039 +-42.33954858 -777.8607093 -2.339781511 12. A040 +-23.09339256 -778.6079363 -2.340774491 12. A041 +2.382622676 -763.2855572 -2.838872989 12. A042 +17.1053716 -766.5338029 -2.842286715 12. A043 +-80.06703001 -780.3740238 -1.336451415 12. A044 +-63.50521219 -786.8199568 -1.341060659 12. A045 +-19.65399721 -794.5952314 -2.338743316 12. A047 +-1.523355241 -788.9452581 -2.8370088 12. A048 +30.35174917 -773.9188068 -3.336231664 12. A049 +-15.04639784 -764.3348031 -2.335016467 12. A050 +-45.35024699 -846.3972056 -1.848567249 12. A058 +-54.71181707 -616.6892211 -2.521178466 12. A066 +-140.507228 -651.1640802 -0.634931252 12. A068 +-159.5516085 -789.4690248 -0.085066708 12. A069 +-5.289167608 -862.8538258 -1.546623172 12. A060 +-79.54380248 -828.9397966 -1.295598765 12. A062 +89.09395348 -599.9597 -5.661962966 12. A072 +103.7166566 -847.9917404 -4.492461166 12. A074 diff --git a/maria/instrument/dets/alma.cycle10.3.cfg b/maria/instrument/dets/alma.cycle10.3.cfg new file mode 100644 index 0000000..3b7b6ff --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.3.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +-33.89412596 -712.7516484 -2.330089496 12. A001 +-17.45390887 -709.6086972 -2.32867142 12. A002 +15.93453511 -700.6757482 -2.32967552 12. A007 +9.482335836 -687.0764746 -2.729176727 12. A008 +-20.89371519 -653.559982 -2.43766594 12. A010 +37.82617818 -735.8760818 -2.484749162 12. A011 +10.73987943 -659.5673638 -2.726261907 12. A015 +-20.62042134 -633.9073418 -2.527672839 12. A016 +-43.64407228 -652.7424613 -2.322696805 12. A022 +-59.4042934 -667.5717395 -2.130365568 12. A023 +-74.47461587 -684.6574595 -2.129342649 12. A024 +-84.5230042 -704.8937799 -1.937681767 12. A025 +-86.87286754 -732.2620426 -1.928810218 12. A026 +-93.14292454 -745.9594809 -1.941492838 12. A027 +-105.4387377 -755.003357 -1.640752815 12. A033 +-76.90232093 -718.1727584 -1.929073338 12. A034 +-26.04186157 -726.1888088 -2.332575051 12. A035 +-15.39951252 -746.3592279 -2.331879161 12. A036 +-42.33954858 -777.8607093 -2.339781511 12. A040 +2.382622676 -763.2855572 -2.838872989 12. A042 +17.1053716 -766.5338029 -2.842286715 12. A043 +-80.06703001 -780.3740238 -1.336451415 12. A044 +-63.50521219 -786.8199568 -1.341060659 12. A045 +-19.65399721 -794.5952314 -2.338743316 12. A047 +-1.523355241 -788.9452581 -2.8370088 12. A048 +30.35174917 -773.9188068 -3.336231664 12. A049 +-15.04639784 -764.3348031 -2.335016467 12. A050 +-45.35024699 -846.3972056 -1.848567249 12. A058 +-5.289167608 -862.8538258 -1.546623172 12. A060 +-79.54380248 -828.9397966 -1.295598765 12. A062 +-54.71181707 -616.6892211 -2.521178466 12. A066 +-140.507228 -651.1640802 -0.634931252 12. A068 +-159.5516085 -789.4690248 -0.085066708 12. A069 +108.0977936 -762.8666359 -4.094737047 12. A070 +89.09395348 -599.9597 -5.661962966 12. A072 +-205.1490475 -724.6895117 0.219354398 12. A073 +103.7166566 -847.9917404 -4.492461166 12. A074 +-62.64949425 -519.0658412 -1.506521335 12. A075 +-136.0704531 -902.0861116 0.926477532 12. A076 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +149.605259 -491.5834663 -7.812779422 12. A085 +-71.16718633 -427.3935079 -0.557779025 12. A088 diff --git a/maria/instrument/dets/alma.cycle10.4.cfg b/maria/instrument/dets/alma.cycle10.4.cfg new file mode 100644 index 0000000..3f3baca --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.4.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +-33.89412596 -712.7516484 -2.330089496 12. A001 +15.93453511 -700.6757482 -2.32967552 12. A007 +9.482335836 -687.0764746 -2.729176727 12. A008 +37.82617818 -735.8760818 -2.484749162 12. A011 +10.73987943 -659.5673638 -2.726261907 12. A015 +-20.62042134 -633.9073418 -2.527672839 12. A016 +-43.64407228 -652.7424613 -2.322696805 12. A022 +-59.4042934 -667.5717395 -2.130365568 12. A023 +-74.47461587 -684.6574595 -2.129342649 12. A024 +-93.14292454 -745.9594809 -1.941492838 12. A027 +-105.4387377 -755.003357 -1.640752815 12. A033 +-26.04186157 -726.1888088 -2.332575051 12. A035 +2.382622676 -763.2855572 -2.838872989 12. A042 +17.1053716 -766.5338029 -2.842286715 12. A043 +-80.06703001 -780.3740238 -1.336451415 12. A044 +-63.50521219 -786.8199568 -1.341060659 12. A045 +-19.65399721 -794.5952314 -2.338743316 12. A047 +-1.523355241 -788.9452581 -2.8370088 12. A048 +30.35174917 -773.9188068 -3.336231664 12. A049 +-45.35024699 -846.3972056 -1.848567249 12. A058 +-5.289167608 -862.8538258 -1.546623172 12. A060 +-79.54380248 -828.9397966 -1.295598765 12. A062 +-54.71181707 -616.6892211 -2.521178466 12. A066 +-140.507228 -651.1640802 -0.634931252 12. A068 +-159.5516085 -789.4690248 -0.085066708 12. A069 +108.0977936 -762.8666359 -4.094737047 12. A070 +89.09395348 -599.9597 -5.661962966 12. A072 +-205.1490475 -724.6895117 0.219354398 12. A073 +103.7166566 -847.9917404 -4.492461166 12. A074 +-62.64949425 -519.0658412 -1.506521335 12. A075 +-136.0704531 -902.0861116 0.926477532 12. A076 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +149.605259 -491.5834663 -7.812779422 12. A085 +-320.565229 -763.8611244 2.921013013 12. A086 +-71.16718633 -427.3935079 -0.557779025 12. A088 +-115.7063626 -1075.443396 6.891886507 12. A089 +278.4170757 -571.5711321 -11.94579167 12. A090 +159.5060551 -1067.094353 -1.914648891 12. A092 +210.9983374 -883.4663621 -6.966940771 12. A087 +-370.9743358 -604.1237343 -0.592510746 12. A091 +28.89945077 -305.4170846 -2.93440994 12. A093 +-322.5251719 -1004.125527 -3.523531944 12. A094 diff --git a/maria/instrument/dets/alma.cycle10.5.cfg b/maria/instrument/dets/alma.cycle10.5.cfg new file mode 100644 index 0000000..039af57 --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.5.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +15.93453511 -700.6757482 -2.32967552 12. A007 +37.82617818 -735.8760818 -2.484749162 12. A011 +10.73987943 -659.5673638 -2.726261907 12. A015 +-43.64407228 -652.7424613 -2.322696805 12. A022 +-74.47461587 -684.6574595 -2.129342649 12. A024 +-93.14292454 -745.9594809 -1.941492838 12. A027 +-105.4387377 -755.003357 -1.640752815 12. A033 +2.382622676 -763.2855572 -2.838872989 12. A042 +17.1053716 -766.5338029 -2.842286715 12. A043 +-63.50521219 -786.8199568 -1.341060659 12. A045 +-19.65399721 -794.5952314 -2.338743316 12. A047 +-45.35024699 -846.3972056 -1.848567249 12. A058 +-5.289167608 -862.8538258 -1.546623172 12. A060 +-79.54380248 -828.9397966 -1.295598765 12. A062 +-54.71181707 -616.6892211 -2.521178466 12. A066 +-140.507228 -651.1640802 -0.634931252 12. A068 +-159.5516085 -789.4690248 -0.085066708 12. A069 +108.0977936 -762.8666359 -4.094737047 12. A070 +89.09395348 -599.9597 -5.661962966 12. A072 +-205.1490475 -724.6895117 0.219354398 12. A073 +103.7166566 -847.9917404 -4.492461166 12. A074 +-62.64949425 -519.0658412 -1.506521335 12. A075 +-136.0704531 -902.0861116 0.926477532 12. A076 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +149.605259 -491.5834663 -7.812779422 12. A085 +-320.565229 -763.8611244 2.921013013 12. A086 +210.9983374 -883.4663621 -6.966940771 12. A087 +-71.16718633 -427.3935079 -0.557779025 12. A088 +-115.7063626 -1075.443396 6.891886507 12. A089 +278.4170757 -571.5711321 -11.94579167 12. A090 +-370.9743358 -604.1237343 -0.592510746 12. A091 +159.5060551 -1067.094353 -1.914648891 12. A092 +28.89945077 -305.4170846 -2.93440994 12. A093 +-322.5251719 -1004.125527 -3.523531944 12. A094 +-405.2355233 -342.1436331 -1.631073652 12. A096 +-588.9825375 -511.8803954 -3.700789767 12. A104 +-134.0818847 -1268.798681 1.417837879 12. A134 +384.7919548 -367.4568568 -11.98122352 12. A135 +-235.4166998 -182.5357693 0.433037607 12. A101 +442.0178226 -1210.840727 -7.453735492 12. A105 +664.4987582 -652.3727712 -21.8190797 12. A108 +336.2164809 47.5583012 -7.732028162 12. A111 diff --git a/maria/instrument/dets/alma.cycle10.6.cfg b/maria/instrument/dets/alma.cycle10.6.cfg new file mode 100644 index 0000000..60507cb --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.6.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +15.93453511 -700.6757482 -2.32967552 12. A007 +10.73987943 -659.5673638 -2.726261907 12. A015 +-93.14292454 -745.9594809 -1.941492838 12. A027 +2.382622676 -763.2855572 -2.838872989 12. A042 +17.1053716 -766.5338029 -2.842286715 12. A043 +-5.289167608 -862.8538258 -1.546623172 12. A060 +-54.71181707 -616.6892211 -2.521178466 12. A066 +-140.507228 -651.1640802 -0.634931252 12. A068 +-159.5516085 -789.4690248 -0.085066708 12. A069 +108.0977936 -762.8666359 -4.094737047 12. A070 +89.09395348 -599.9597 -5.661962966 12. A072 +-205.1490475 -724.6895117 0.219354398 12. A073 +103.7166566 -847.9917404 -4.492461166 12. A074 +-62.64949425 -519.0658412 -1.506521335 12. A075 +-136.0704531 -902.0861116 0.926477532 12. A076 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +149.605259 -491.5834663 -7.812779422 12. A085 +-320.565229 -763.8611244 2.921013013 12. A086 +210.9983374 -883.4663621 -6.966940771 12. A087 +-71.16718633 -427.3935079 -0.557779025 12. A088 +-115.7063626 -1075.443396 6.891886507 12. A089 +278.4170757 -571.5711321 -11.94579167 12. A090 +-370.9743358 -604.1237343 -0.592510746 12. A091 +159.5060551 -1067.094353 -1.914648891 12. A092 +28.89945077 -305.4170846 -2.93440994 12. A093 +-322.5251719 -1004.125527 -3.523531944 12. A094 +-405.2355233 -342.1436331 -1.631073652 12. A096 +-235.4166998 -182.5357693 0.433037607 12. A101 +-588.9825375 -511.8803954 -3.700789767 12. A104 +442.0178226 -1210.840727 -7.453735492 12. A105 +664.4987582 -652.3727712 -21.8190797 12. A108 +186.6412212 -1550.361343 -8.703981158 12. A110 +336.2164809 47.5583012 -7.732028162 12. A111 +-175.9057296 -1647.546291 2.32885338 12. A115 +738.7298503 -82.15574023 -22.70625636 12. A116 +-1137.979807 9.995963548 -19.62539408 12. A122 +-134.0818847 -1268.798681 1.417837879 12. A134 +384.7919548 -367.4568568 -11.98122352 12. A135 +-768.8428762 -1726.664524 -12.40502338 12. A120 +1123.288651 -455.2698864 -48.84410577 12. A121 +386.3476965 -1962.095365 13.56319193 12. A123 +-124.3585508 -2293.772461 -9.807477083 12. A128 diff --git a/maria/instrument/dets/alma.cycle10.7.cfg b/maria/instrument/dets/alma.cycle10.7.cfg new file mode 100644 index 0000000..d1ac0e1 --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.7.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +15.93453511 -700.6757482 -2.32967552 12. A007 +-93.14292454 -745.9594809 -1.941492838 12. A027 +2.382622676 -763.2855572 -2.838872989 12. A042 +89.09395348 -599.9597 -5.661962966 12. A072 +103.7166566 -847.9917404 -4.492461166 12. A074 +-62.64949425 -519.0658412 -1.506521335 12. A075 +-136.0704531 -902.0861116 0.926477532 12. A076 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +149.605259 -491.5834663 -7.812779422 12. A085 +-320.565229 -763.8611244 2.921013013 12. A086 +210.9983374 -883.4663621 -6.966940771 12. A087 +-71.16718633 -427.3935079 -0.557779025 12. A088 +-115.7063626 -1075.443396 6.891886507 12. A089 +278.4170757 -571.5711321 -11.94579167 12. A090 +-370.9743358 -604.1237343 -0.592510746 12. A091 +159.5060551 -1067.094353 -1.914648891 12. A092 +28.89945077 -305.4170846 -2.93440994 12. A093 +-322.5251719 -1004.125527 -3.523531944 12. A094 +-405.2355233 -342.1436331 -1.631073652 12. A096 +-235.4166998 -182.5357693 0.433037607 12. A101 +-588.9825375 -511.8803954 -3.700789767 12. A104 +442.0178226 -1210.840727 -7.453735492 12. A105 +664.4987582 -652.3727712 -21.8190797 12. A108 +186.6412212 -1550.361343 -8.703981158 12. A110 +336.2164809 47.5583012 -7.732028162 12. A111 +-175.9057296 -1647.546291 2.32885338 12. A115 +738.7298503 -82.15574023 -22.70625636 12. A116 +-768.8428762 -1726.664524 -12.40502338 12. A120 +1123.288651 -455.2698864 -48.84410577 12. A121 +-1137.979807 9.995963548 -19.62539408 12. A122 +386.3476965 -1962.095365 13.56319193 12. A123 +448.2469953 646.1269628 -10.66960173 12. A124 +-1275.851495 -1433.665865 -34.63327806 12. A125 +1241.720549 -1079.905151 -31.51453723 12. A126 +-883.2209323 539.7100503 8.238992337 12. A127 +-124.3585508 -2293.772461 -9.807477083 12. A128 +-134.0818847 -1268.798681 1.417837879 12. A134 +384.7919548 -367.4568568 -11.98122352 12. A135 +755.8413206 -1622.601264 6.020971975 12. A118 +1145.061894 515.9088394 -40.82860935 12. A129 +-1700.499584 -820.6421264 -29.47741911 12. A130 +-452.4801064 1329.185665 2.539863632 12. A132 diff --git a/maria/instrument/dets/alma.cycle10.8.cfg b/maria/instrument/dets/alma.cycle10.8.cfg new file mode 100644 index 0000000..d92c32e --- /dev/null +++ b/maria/instrument/dets/alma.cycle10.8.cfg @@ -0,0 +1,46 @@ +# observatory=ALMA +# coordsys=LOC (local tangent plane) +# x y z diam pad# +-93.14292454 -745.9594809 -1.941492838 12. A027 +103.7166566 -847.9917404 -4.492461166 12. A074 +210.9519612 -760.3395825 -7.722003145 12. A082 +-201.6202627 -507.5851383 2.951531452 12. A083 +210.9983374 -883.4663621 -6.966940771 12. A087 +-115.7063626 -1075.443396 6.891886507 12. A089 +278.4170757 -571.5711321 -11.94579167 12. A090 +-370.9743358 -604.1237343 -0.592510746 12. A091 +159.5060551 -1067.094353 -1.914648891 12. A092 +28.89945077 -305.4170846 -2.93440994 12. A093 +-322.5251719 -1004.125527 -3.523531944 12. A094 +-405.2355233 -342.1436331 -1.631073652 12. A096 +-235.4166998 -182.5357693 0.433037607 12. A101 +-588.9825375 -511.8803954 -3.700789767 12. A104 +442.0178226 -1210.840727 -7.453735492 12. A105 +664.4987582 -652.3727712 -21.8190797 12. A108 +186.6412212 -1550.361343 -8.703981158 12. A110 +336.2164809 47.5583012 -7.732028162 12. A111 +-175.9057296 -1647.546291 2.32885338 12. A115 +738.7298503 -82.15574023 -22.70625636 12. A116 +755.8413206 -1622.601264 6.020971975 12. A118 +-768.8428762 -1726.664524 -12.40502338 12. A120 +1123.288651 -455.2698864 -48.84410577 12. A121 +-1137.979807 9.995963548 -19.62539408 12. A122 +386.3476965 -1962.095365 13.56319193 12. A123 +448.2469953 646.1269628 -10.66960173 12. A124 +-1275.851495 -1433.665865 -34.63327806 12. A125 +1241.720549 -1079.905151 -31.51453723 12. A126 +-883.2209323 539.7100503 8.238992337 12. A127 +-124.3585508 -2293.772461 -9.807477083 12. A128 +1145.061894 515.9088394 -40.82860935 12. A129 +-1700.499584 -820.6421264 -29.47741911 12. A130 +1365.742594 -1889.698289 26.4958042 12. A131 +-452.4801064 1329.185665 2.539863632 12. A132 +384.7919548 -367.4568568 -11.98122352 12. A135 +-2807.877 1412.598 -66.202 12. W207 +-1195.851 2825.334 17.292 12. W210 +2280.787 1505.548 -114.843 12. P401 +-1175.121588 -1860.249587 -36.16558544 12. A133 +1691.043 -3392.262 -15.496 12. S301 +4763.027 -2555.54 -59.388 12. S307 +2972.535 1946.262 -125.463 12. P404 +3691.342 4644.145 -158.006 12. P410 diff --git a/maria/instrument/dets/alma1.csv b/maria/instrument/dets/alma1.csv new file mode 100644 index 0000000..a0ea235 --- /dev/null +++ b/maria/instrument/dets/alma1.csv @@ -0,0 +1,44 @@ +band,baseline_x,baseline_y,baseline_z,primary_size,pad +alma,-33.89412596,-712.7516484,-2.330089496,12.0, A001 +alma,-17.45390887,-709.6086972,-2.32867142,12.0, A002 +alma,-22.5589292,-691.9838607,-2.323742384,12.0, A003 +alma,-5.421013146,-723.7911045,-2.334250518,12.0, A004 +alma,25.24593899,-744.4318445,-2.336684256,12.0, A005 +alma,20.94634824,-721.464646,-2.333017829,12.0, A006 +alma,15.93453511,-700.6757482,-2.32967552,12.0, A007 +alma,9.482335836,-687.0764746,-2.729176727,12.0, A008 +alma,-9.835100334,-663.8265957,-2.722704263,12.0, A009 +alma,-20.89371519,-653.559982,-2.43766594,12.0, A010 +alma,37.82617818,-735.8760818,-2.484749162,12.0, A011 +alma,0.965953711,-702.6549839,-2.325874408,12.0, A013 +alma,10.73987943,-659.5673638,-2.726261907,12.0, A015 +alma,-20.62042134,-633.9073418,-2.527672839,12.0, A016 +alma,-6.712372688,-684.9519378,-2.3269437,12.0, A017 +alma,-41.23929872,-725.9777278,-2.33663097,12.0, A018 +alma,-50.30411069,-711.209498,-2.332024766,12.0, A019 +alma,-43.64407228,-652.7424613,-2.322696805,12.0, A022 +alma,-59.4042934,-667.5717395,-2.130365568,12.0, A023 +alma,-74.47461587,-684.6574595,-2.129342649,12.0, A024 +alma,-84.5230042,-704.8937799,-1.937681767,12.0, A025 +alma,-86.87286754,-732.2620426,-1.928810218,12.0, A026 +alma,-93.14292454,-745.9594809,-1.941492838,12.0, A027 +alma,-57.04992893,-645.4388456,-2.129055948,12.0, A028 +alma,-68.48107366,-698.470785,-2.334779889,12.0, A030 +alma,-95.8997254,-694.8901111,-1.927739915,12.0, A031 +alma,-105.4387377,-755.003357,-1.640752815,12.0, A033 +alma,-76.90232093,-718.1727584,-1.929073338,12.0, A034 +alma,-26.04186157,-726.1888088,-2.332575051,12.0, A035 +alma,-15.39951252,-746.3592279,-2.331879161,12.0, A036 +alma,-80.49715673,-765.1118313,-1.942599619,12.0, A038 +alma,-64.18907113,-771.1494896,-1.940145207,12.0, A039 +alma,-42.33954858,-777.8607093,-2.339781511,12.0, A040 +alma,-23.09339256,-778.6079363,-2.340774491,12.0, A041 +alma,2.382622676,-763.2855572,-2.838872989,12.0, A042 +alma,17.1053716,-766.5338029,-2.842286715,12.0, A043 +alma,-80.06703001,-780.3740238,-1.336451415,12.0, A044 +alma,-63.50521219,-786.8199568,-1.341060659,12.0, A045 +alma,-36.66707354,-762.1662821,-2.339843364,12.0, A046 +alma,-19.65399721,-794.5952314,-2.338743316,12.0, A047 +alma,-1.523355241,-788.9452581,-2.8370088,12.0, A048 +alma,30.35174917,-773.9188068,-3.336231664,12.0, A049 +alma,-15.04639784,-764.3348031,-2.335016467,12.0, A050 diff --git a/maria/map/__init__.py b/maria/map/__init__.py index 3f10967..a0d5112 100644 --- a/maria/map/__init__.py +++ b/maria/map/__init__.py @@ -30,7 +30,7 @@ class Map: inbright: float = 1 header: ap.io.fits.header.Header = None frame: str = "ra_dec" - units: str = "K" + units: str = "K_RJ" data: np.array = None # 3D instrument def __post_init__(self): diff --git a/maria/map/mappers.py b/maria/map/mappers.py index 55344b0..9b18aa6 100644 --- a/maria/map/mappers.py +++ b/maria/map/mappers.py @@ -86,10 +86,12 @@ def save_maps(self, filepath): self.header["BTYPE"] = "Intensity" - if self.tods[0].unit == "Jy/pixel": + if self.map.units == "Jy/pixel": self.header["BUNIT"] = "Jy/pixel " - else: + elif self.map.units == "K_RJ": self.header["BUNIT"] = "Kelvin RJ" # tods are always in Kelvin + else: + raise ValueError(f"Units {self.map.units} not implemented.") save_maps = np.zeros((len(self.map.freqs), self.n_x, self.n_y)) @@ -99,7 +101,7 @@ def save_maps(self, filepath): save_maps[i] = self.map.data[i] - if self.tods[0].unit == "Jy/pixel": + if self.map.units == "Jy/pixel": save_maps[i] *= utils.units.KbrightToJyPix( self.header["CRVAL3"], self.header["CDELT1"], self.header["CDELT2"] ) @@ -166,11 +168,17 @@ def run(self): else: D = tod.data.copy()[band_mask] - if "highpass" in self.tod_postprocessing.keys(): - D = sp.signal.detrend(D, axis=-1) + # windowing + W = np.ones(D.shape[0])[:, None] * sp.signal.windows.tukey( + D.shape[-1], alpha=0.1 + ) - D = utils.signal.highpass( - D, + WD = W * sp.signal.detrend(D, axis=-1) + del D + + if "highpass" in self.tod_postprocessing.keys(): + WD = utils.signal.highpass( + WD, fc=self.tod_postprocessing["highpass"]["f"], fs=tod.fs, order=self.tod_postprocessing["highpass"].get("order", 1), @@ -181,9 +189,9 @@ def run(self): n_modes_to_remove = self.tod_postprocessing["remove_modes"]["n"] U, V = utils.signal.decompose( - D, downsample_rate=np.maximum(int(tod.fs / 16), 1), mode="uv" + WD, downsample_rate=np.maximum(int(tod.fs / 16), 1), mode="uv" ) - D = U[:, n_modes_to_remove:] @ V[n_modes_to_remove:] + WD = U[:, n_modes_to_remove:] @ V[n_modes_to_remove:] if "despline" in self.tod_postprocessing.keys(): B = utils.signal.get_bspline_basis( @@ -194,19 +202,14 @@ def run(self): ), ) - A = np.linalg.inv(B @ B.T) @ B @ D.T + A = np.linalg.inv(B @ B.T) @ B @ WD.T - D -= A.T @ B - - # windowing - W = np.ones(D.shape[0])[:, None] * sp.signal.windows.tukey( - D.shape[-1], alpha=0.1 - ) + WD -= A.T @ B map_sum = sp.stats.binned_statistic_2d( dx[band_mask].ravel(), dy[band_mask].ravel(), - (D * W).ravel(), + WD.ravel(), bins=(self.x_bins, self.y_bins), statistic="sum", )[0] @@ -219,7 +222,7 @@ def run(self): statistic="sum", )[0] - self.DATA = D + self.DATA = WD self.raw_map_sums[band] += map_sum self.raw_map_cnts[band] += map_cnt