From 05f97bfb0c535f9062be7807b6edcbf947108bf7 Mon Sep 17 00:00:00 2001 From: smsimon Date: Thu, 17 Oct 2024 08:53:18 -0500 Subject: [PATCH 1/7] add SAT MF single bands --- s4sim/hardware/config.py | 85 +++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index 292b1ac..f848ebf 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -525,6 +525,36 @@ def sim_nominal(): bnd["pwv_poly"] = 0.801865, 0.192474, 0.007107 bands["SAT_f155"] = bnd + bnd = OrderedDict() + bnd["center"] = 91.5 + bnd["low"] = 77.0 + bnd["high"] = 106.0 + bnd["bandpass"] = "" + bnd["NET"] = 259.0 + bnd["fknee"] = 50.0 + bnd["fmin"] = 0.01 + bnd["alpha"] = 1.0 + bnd["A"] = 0.26241 + bnd["C"] = 0.65892 + bnd["NET_corr"] = 1.02 + bnd["pwv_poly"] = 0.956092, 0.042784, 0.001444 + bands["SAT_f090"] = bnd + + bnd = OrderedDict() + bnd["center"] = 148.5 + bnd["low"] = 128.0 + bnd["high"] = 169.0 + bnd["bandpass"] = "" + bnd["NET"] = 311.0 + bnd["fknee"] = 50.0 + bnd["fmin"] = 0.01 + bnd["alpha"] = 1.0 + bnd["A"] = 0.20697 + bnd["C"] = 0.73043 + bnd["NET_corr"] = 1.01 + bnd["pwv_poly"] = 0.848750, 0.146717, 0.005639 + bands["SAT_f150"] = bnd + bnd = OrderedDict() bnd["center"] = 227.0 bnd["low"] = 198.0 @@ -619,7 +649,7 @@ def sim_nominal(): wafers = OrderedDict() - wtypes = ["CHLAT_ULF","SPLAT_ULF", "CHLAT_LF", "SPLAT_LF", "SAT_LF", "CHLAT_MF", "SPLAT_MF", "SAT_MFL", "SAT_MFH", "CHLAT_HF", "SPLAT_HF", "SAT_HF"] + wtypes = ["CHLAT_ULF","SPLAT_ULF", "CHLAT_LF", "SPLAT_LF", "SAT_LF", "CHLAT_MF", "SPLAT_MF", "SAT_MFL", "SAT_MFH", "SAT_MF", "CHLAT_HF", "SPLAT_HF", "SAT_HF"] wcnt = { "CHLAT_ULF": 4*2, "SPLAT_ULF": 4, @@ -628,8 +658,9 @@ def sim_nominal(): "SAT_LF": (12) * 1, "CHLAT_MF": 54*2, "SPLAT_MF": 54, - "SAT_MFL": (12) * 3, - "SAT_MFH": (12) * 3, + "SAT_MFL": 0, + "SAT_MFH": 0, + "SAT_MF": (12) * 6, "CHLAT_HF": 19*2, "SPLAT_HF": 18, "SAT_HF": (12) * 2, @@ -644,6 +675,7 @@ def sim_nominal(): "SPLAT_MF": "RP", "SAT_MFL": "HP", "SAT_MFH": "HP", + "SAT_MF": "HP", "CHLAT_HF": "HP", "SPLAT_HF": "HP", "SAT_HF": "HP", @@ -658,6 +690,7 @@ def sim_nominal(): "SPLAT_MF": 432, "SAT_MFL": 217, "SAT_MFH": 271, + "SAT_MF": 217, "CHLAT_HF": 469, "SPLAT_HF": 469, "SAT_HF": 469, @@ -672,6 +705,7 @@ def sim_nominal(): "SPLAT_MF": 5.3, "SAT_MFL": 7.65, "SAT_MFH": 6.85, + "SAT_MF": 7.65, "CHLAT_HF": 5.2, "SPLAT_HF": 5.2, "SAT_HF": 5.2, @@ -686,6 +720,7 @@ def sim_nominal(): "SPLAT_MF": 0.71, "SAT_MFL": 1.273, "SAT_MFH": 0.71, + "SAT_MF": 1.273, "CHLAT_HF": 0.71, "SPLAT_HF": 0.71, "SAT_HF": 0.71, @@ -700,6 +735,7 @@ def sim_nominal(): "SPLAT_MF": ["SPLAT_f090", "SPLAT_f150"], "SAT_MFL": ["SAT_f085", "SAT_f145"], "SAT_MFH": ["SAT_f095", "SAT_f155"], + "SAT_MF": ["SAT_f090", "SAT_f150"], "CHLAT_HF": ["CHLAT_f220", "CHLAT_f280"], "SPLAT_HF": ["SPLAT_f220", "SPLAT_f280"], "SAT_HF": ["SAT_f220", "SAT_f280"], @@ -715,6 +751,7 @@ def sim_nominal(): "SPLAT_MF": [210,220], "SAT_MFL": [0,127], "SAT_MFH": [0,169], + "SAT_MF": [0,127], "CHLAT_HF": [0,331], "SPLAT_HF": [0,331], "SAT_HF": [0,331], @@ -751,6 +788,7 @@ def sim_nominal(): "SPLAT_MF": 0, "SAT_MFL": 0, "SAT_MFH": 0, + "SAT_MF": 0, "CHLAT_HF": 0, "SPLAT_HF": 0, "SAT_HF": 0, @@ -1308,14 +1346,14 @@ def sim_nominal(): tubes[nm] = tb stubes = [ - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_HF", - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_HF", - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_LF", ] stube_toasthex_pos = [0, 0, 0, 0, 0, 0, 0, 0, 0] @@ -1407,6 +1445,33 @@ def sim_nominal(): # 30 deg, 3552 det/band tb["platescale"] = 0.070093/0.9931 tb["FOV_cut"] = 30.0 + elif ttyp == "SAT_MF": + for tw in range(12): + off = 0 + for w, props in cnf["wafers"].items(): + if props["type"] == ttyp: + if off == woff[ttyp]: + tb["wafers"].append(w) + woff[ttyp] += 1 + break + off += 1 + tb["wafer_angle"] = [ # Degrees + 30.0, + 30.0, + 30.0, + -150.0, + -150.0, + 30.0, + 30.0, + 30.0, + -30.0, + 90.0, + 30.0, + 30.0, + ] + # 30 deg, 3048 detectors/band + tb["platescale"] = 0.070093/0.9905 + tb["FOV_cut"] = 30.0 else: for tw in range(12): off = 0 @@ -1753,6 +1818,8 @@ def sim_nominal(): sfwhm["SAT_f145"] = 18.1 sfwhm["SAT_f095"] = 26.4 sfwhm["SAT_f155"] = 16.9 + sfwhm["SAT_f090"] = 27.95 + sfwhm["SAT_f150"] = 17.5 sfwhm["SAT_f220"] = 11.3 sfwhm["SAT_f280"] = 10.1 From aed9c1286d615441e84f906068b437806a85e549 Mon Sep 17 00:00:00 2001 From: smsimon Date: Thu, 17 Oct 2024 13:33:26 -0500 Subject: [PATCH 2/7] add SAT MF single band noises --- s4sim/hardware/config.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index f848ebf..c3515ca 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -530,14 +530,14 @@ def sim_nominal(): bnd["low"] = 77.0 bnd["high"] = 106.0 bnd["bandpass"] = "" - bnd["NET"] = 259.0 + bnd["NET"] = 218.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.26241 - bnd["C"] = 0.65892 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.956092, 0.042784, 0.001444 + bnd["A"] = 0.22935 + bnd["C"] = 0.70169 + bnd["NET_corr"] = 1.01 + bnd["pwv_poly"] = 0.947204, 0.051402, 0.001779 bands["SAT_f090"] = bnd bnd = OrderedDict() @@ -545,14 +545,14 @@ def sim_nominal(): bnd["low"] = 128.0 bnd["high"] = 169.0 bnd["bandpass"] = "" - bnd["NET"] = 311.0 + bnd["NET"] = 293.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.20697 - bnd["C"] = 0.73043 + bnd["A"] = 0.22090 + bnd["C"] = 0.71231 bnd["NET_corr"] = 1.01 - bnd["pwv_poly"] = 0.848750, 0.146717, 0.005639 + bnd["pwv_poly"] = 0.829419, 0.165570, 0.006258 bands["SAT_f150"] = bnd bnd = OrderedDict() From ea435a906ad44ec06a5a29df2d7e1e87b27c41e3 Mon Sep 17 00:00:00 2001 From: smsimon Date: Tue, 22 Oct 2024 09:44:52 -0500 Subject: [PATCH 3/7] Change pixel size to MF2 size --- s4sim/hardware/config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index c3515ca..29371a9 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -690,7 +690,7 @@ def sim_nominal(): "SPLAT_MF": 432, "SAT_MFL": 217, "SAT_MFH": 271, - "SAT_MF": 217, + "SAT_MF": 271, "CHLAT_HF": 469, "SPLAT_HF": 469, "SAT_HF": 469, @@ -705,7 +705,7 @@ def sim_nominal(): "SPLAT_MF": 5.3, "SAT_MFL": 7.65, "SAT_MFH": 6.85, - "SAT_MF": 7.65, + "SAT_MF": 6.85, "CHLAT_HF": 5.2, "SPLAT_HF": 5.2, "SAT_HF": 5.2, @@ -720,7 +720,7 @@ def sim_nominal(): "SPLAT_MF": 0.71, "SAT_MFL": 1.273, "SAT_MFH": 0.71, - "SAT_MF": 1.273, + "SAT_MF": 0.71, "CHLAT_HF": 0.71, "SPLAT_HF": 0.71, "SAT_HF": 0.71, @@ -751,7 +751,7 @@ def sim_nominal(): "SPLAT_MF": [210,220], "SAT_MFL": [0,127], "SAT_MFH": [0,169], - "SAT_MF": [0,127], + "SAT_MF": [0,169], "CHLAT_HF": [0,331], "SPLAT_HF": [0,331], "SAT_HF": [0,331], @@ -1469,8 +1469,8 @@ def sim_nominal(): 30.0, 30.0, ] - # 30 deg, 3048 detectors/band - tb["platescale"] = 0.070093/0.9905 + # 30 deg, 3552 det/band + tb["platescale"] = 0.070093/0.9931 tb["FOV_cut"] = 30.0 else: for tw in range(12): From ba043222cd8b2d84c80ab251d2a2323cdedebd5f Mon Sep 17 00:00:00 2001 From: smsimon Date: Mon, 28 Oct 2024 08:52:35 -0500 Subject: [PATCH 4/7] Updated noise and beam estimates for splits 345 --- s4sim/hardware/config.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index 29371a9..32fc180 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -380,12 +380,12 @@ def sim_nominal(): bnd["low"] = 21.5 bnd["high"] = 28.0 bnd["bandpass"] = "" - bnd["NET"] = 246.0 + bnd["NET"] = 212.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.11488 - bnd["C"] = 0.85083 + bnd["A"] = 0.13859 + bnd["C"] = 0.82000 bnd["NET_corr"] = 1.02 bnd["pwv_poly"] = 0.933680, 0.063919, 0.002889 bands["SAT_f030"] = bnd @@ -395,12 +395,12 @@ def sim_nominal(): bnd["low"] = 28.0 bnd["high"] = 45.0 bnd["bandpass"] = "" - bnd["NET"] = 155.0 + bnd["NET"] = 152.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.21849 - bnd["C"] = 0.71629 + bnd["A"] = 0.22291 + bnd["C"] = 0.71053 bnd["NET_corr"] = 1.04 bnd["pwv_poly"] = 0.984664, 0.015093, 0.000353 bands["SAT_f040"] = bnd @@ -530,13 +530,13 @@ def sim_nominal(): bnd["low"] = 77.0 bnd["high"] = 106.0 bnd["bandpass"] = "" - bnd["NET"] = 218.0 + bnd["NET"] = 215.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.22935 - bnd["C"] = 0.70169 - bnd["NET_corr"] = 1.01 + bnd["A"] = 0.23184 + bnd["C"] = 0.69845 + bnd["NET_corr"] = 1.03 bnd["pwv_poly"] = 0.947204, 0.051402, 0.001779 bands["SAT_f090"] = bnd @@ -545,13 +545,13 @@ def sim_nominal(): bnd["low"] = 128.0 bnd["high"] = 169.0 bnd["bandpass"] = "" - bnd["NET"] = 293.0 + bnd["NET"] = 305.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.22090 - bnd["C"] = 0.71231 - bnd["NET_corr"] = 1.01 + bnd["A"] = 0.21391 + bnd["C"] = 0.72140 + bnd["NET_corr"] = 1.02 bnd["pwv_poly"] = 0.829419, 0.165570, 0.006258 bands["SAT_f150"] = bnd @@ -1818,8 +1818,8 @@ def sim_nominal(): sfwhm["SAT_f145"] = 18.1 sfwhm["SAT_f095"] = 26.4 sfwhm["SAT_f155"] = 16.9 - sfwhm["SAT_f090"] = 27.95 - sfwhm["SAT_f150"] = 17.5 + sfwhm["SAT_f090"] = 27.3 + sfwhm["SAT_f150"] = 17.6 sfwhm["SAT_f220"] = 11.3 sfwhm["SAT_f280"] = 10.1 From 14eb65a9c7307c142fc106d20d2ff5ae0da644a4 Mon Sep 17 00:00:00 2001 From: smsimon Date: Mon, 28 Oct 2024 08:58:19 -0500 Subject: [PATCH 5/7] Updated noise vs pwv scaling for splits 345 --- s4sim/hardware/config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index 32fc180..b8e0736 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -387,7 +387,7 @@ def sim_nominal(): bnd["A"] = 0.13859 bnd["C"] = 0.82000 bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.933680, 0.063919, 0.002889 + bnd["pwv_poly"] = 0.919331, 0.077864, 0.003397 bands["SAT_f030"] = bnd bnd = OrderedDict() @@ -402,7 +402,7 @@ def sim_nominal(): bnd["A"] = 0.22291 bnd["C"] = 0.71053 bnd["NET_corr"] = 1.04 - bnd["pwv_poly"] = 0.984664, 0.015093, 0.000353 + bnd["pwv_poly"] = 0.984349, 0.015404, 0.000360 bands["SAT_f040"] = bnd bnd = OrderedDict() @@ -537,7 +537,7 @@ def sim_nominal(): bnd["A"] = 0.23184 bnd["C"] = 0.69845 bnd["NET_corr"] = 1.03 - bnd["pwv_poly"] = 0.947204, 0.051402, 0.001779 + bnd["pwv_poly"] = 0.946653, 0.051935, 0.001800 bands["SAT_f090"] = bnd bnd = OrderedDict() @@ -552,7 +552,7 @@ def sim_nominal(): bnd["A"] = 0.21391 bnd["C"] = 0.72140 bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.829419, 0.165570, 0.006258 + bnd["pwv_poly"] = 0.834630, 0.160602, 0.005976 bands["SAT_f150"] = bnd bnd = OrderedDict() From 14e2d1c7f9bed6701742f3d6e20c4a78a65ce003 Mon Sep 17 00:00:00 2001 From: smsimon Date: Mon, 28 Oct 2024 09:50:39 -0500 Subject: [PATCH 6/7] Update noise, bands, and beams for split6 --- s4sim/hardware/config.py | 110 +++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index b8e0736..f9ade08 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -380,14 +380,14 @@ def sim_nominal(): bnd["low"] = 21.5 bnd["high"] = 28.0 bnd["bandpass"] = "" - bnd["NET"] = 212.0 + bnd["NET"] = 197.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.13859 - bnd["C"] = 0.82000 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.919331, 0.077864, 0.003397 + bnd["A"] = 0.15298 + bnd["C"] = 0.80128 + bnd["NET_corr"] = 1.03 + bnd["pwv_poly"] = 0.910439, 0.086590, 0.003628 bands["SAT_f030"] = bnd bnd = OrderedDict() @@ -395,14 +395,14 @@ def sim_nominal(): bnd["low"] = 28.0 bnd["high"] = 45.0 bnd["bandpass"] = "" - bnd["NET"] = 152.0 + bnd["NET"] = 146.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.22291 - bnd["C"] = 0.71053 - bnd["NET_corr"] = 1.04 - bnd["pwv_poly"] = 0.984349, 0.015404, 0.000360 + bnd["A"] = 0.23643 + bnd["C"] = 0.69289 + bnd["NET_corr"] = 1.01 + bnd["pwv_poly"] = 0.983379, 0.016362, 0.000379 bands["SAT_f040"] = bnd bnd = OrderedDict() @@ -470,14 +470,14 @@ def sim_nominal(): bnd["low"] = 74.8 bnd["high"] = 95.2 bnd["bandpass"] = "" - bnd["NET"] = 259.0 + bnd["NET"] = 245.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.26241 - bnd["C"] = 0.65892 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.956092, 0.042784, 0.001444 + bnd["A"] = 0.27782 + bnd["C"] = 0.63888 + bnd["NET_corr"] = 1.04 + bnd["pwv_poly"] = 0.953624, 0.045185, 0.001529 bands["SAT_f085"] = bnd bnd = OrderedDict() @@ -485,14 +485,14 @@ def sim_nominal(): bnd["low"] = 129.1 bnd["high"] = 161.0 bnd["bandpass"] = "" - bnd["NET"] = 311.0 + bnd["NET"] = 302.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.20697 - bnd["C"] = 0.73043 + bnd["A"] = 0.21203 + bnd["C"] = 0.72385 bnd["NET_corr"] = 1.01 - bnd["pwv_poly"] = 0.848750, 0.146717, 0.005639 + bnd["pwv_poly"] = 0.845158, 0.150156, 0.005818 bands["SAT_f145"] = bnd bnd = OrderedDict() @@ -500,14 +500,14 @@ def sim_nominal(): bnd["low"] = 83.6 bnd["high"] = 106.4 bnd["bandpass"] = "" - bnd["NET"] = 240.0 + bnd["NET"] = 228.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.21106 - bnd["C"] = 0.72533 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.941450, 0.056990, 0.001986 + bnd["A"] = 0.22131 + bnd["C"] = 0.71200 + bnd["NET_corr"] = 1.03 + bnd["pwv_poly"] = 0.938631, 0.059726, 0.002090 bands["SAT_f095"] = bnd bnd = OrderedDict() @@ -515,14 +515,14 @@ def sim_nominal(): bnd["low"] = 138.0 bnd["high"] = 172.1 bnd["bandpass"] = "" - bnd["NET"] = 365.0 + bnd["NET"] = 345.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.22432 - bnd["C"] = 0.70785 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.801865, 0.192474, 0.007107 + bnd["A"] = 0.23468 + bnd["C"] = 0.69439 + bnd["NET_corr"] = 1.00 + bnd["pwv_poly"] = 0.792946, 0.200998, 0.007569 bands["SAT_f155"] = bnd bnd = OrderedDict() @@ -620,14 +620,14 @@ def sim_nominal(): bnd["low"] = 198.0 bnd["high"] = 256.0 bnd["bandpass"] = "" - bnd["NET"] = 731.0 + bnd["NET"] = 720.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.29945 - bnd["C"] = 0.61031 + bnd["A"] = 0.30314 + bnd["C"] = 0.60552 bnd["NET_corr"] = 1.01 - bnd["pwv_poly"] = 0.731418, 0.255791, 0.014788 + bnd["pwv_poly"] = 0.728284, 0.258698, 0.015039 bands["SAT_f220"] = bnd bnd = OrderedDict() @@ -635,14 +635,14 @@ def sim_nominal(): bnd["low"] = 256.0 bnd["high"] = 315.0 bnd["bandpass"] = "" - bnd["NET"] = 1845.0 + bnd["NET"] = 1817.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.36317 - bnd["C"] = 0.52786 - bnd["NET_corr"] = 1.01 - bnd["pwv_poly"] = 0.662106, 0.316561, 0.023882 + bnd["A"] = 0.36697 + bnd["C"] = 0.52293 + bnd["NET_corr"] = 1.00 + bnd["pwv_poly"] = 0.658761, 0.319594, 0.024221 bands["SAT_f280"] = bnd cnf["bands"] = bands @@ -658,9 +658,9 @@ def sim_nominal(): "SAT_LF": (12) * 1, "CHLAT_MF": 54*2, "SPLAT_MF": 54, - "SAT_MFL": 0, - "SAT_MFH": 0, - "SAT_MF": (12) * 6, + "SAT_MFL": (12) * 3, + "SAT_MFH": (12) * 3, + "SAT_MF": 0, "CHLAT_HF": 19*2, "SPLAT_HF": 18, "SAT_HF": (12) * 2, @@ -1346,14 +1346,14 @@ def sim_nominal(): tubes[nm] = tb stubes = [ - "SAT_MF", - "SAT_MF", + "SAT_MFL", + "SAT_MFH", "SAT_HF", - "SAT_MF", - "SAT_MF", + "SAT_MFL", + "SAT_MFH", "SAT_HF", - "SAT_MF", - "SAT_MF", + "SAT_MFL", + "SAT_MFH", "SAT_LF", ] stube_toasthex_pos = [0, 0, 0, 0, 0, 0, 0, 0, 0] @@ -1812,16 +1812,16 @@ def sim_nominal(): #SAT beams sfwhm = OrderedDict() - sfwhm["SAT_f030"] = 100.9 - sfwhm["SAT_f040"] = 74.4 - sfwhm["SAT_f085"] = 29.5 - sfwhm["SAT_f145"] = 18.1 - sfwhm["SAT_f095"] = 26.4 - sfwhm["SAT_f155"] = 16.9 + sfwhm["SAT_f030"] = 81.0 + sfwhm["SAT_f040"] = 60.8 + sfwhm["SAT_f085"] = 23.6 + sfwhm["SAT_f145"] = 15.0 + sfwhm["SAT_f095"] = 21.2 + sfwhm["SAT_f155"] = 13.9 sfwhm["SAT_f090"] = 27.3 sfwhm["SAT_f150"] = 17.6 - sfwhm["SAT_f220"] = 11.3 - sfwhm["SAT_f280"] = 10.1 + sfwhm["SAT_f220"] = 9.5 + sfwhm["SAT_f280"] = 8.5 tele = OrderedDict() tele["tubes"] = ["ST0", "ST1", "ST2"] From 9c1cef19e33c9ada310ef5155f8670fa6a215191 Mon Sep 17 00:00:00 2001 From: smsimon Date: Mon, 28 Oct 2024 10:00:47 -0500 Subject: [PATCH 7/7] Update noise, bands, and beams for split7 --- s4sim/hardware/config.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/s4sim/hardware/config.py b/s4sim/hardware/config.py index f9ade08..07a3877 100755 --- a/s4sim/hardware/config.py +++ b/s4sim/hardware/config.py @@ -530,14 +530,14 @@ def sim_nominal(): bnd["low"] = 77.0 bnd["high"] = 106.0 bnd["bandpass"] = "" - bnd["NET"] = 215.0 + bnd["NET"] = 207.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.23184 - bnd["C"] = 0.69845 + bnd["A"] = 0.24100 + bnd["C"] = 0.68654 bnd["NET_corr"] = 1.03 - bnd["pwv_poly"] = 0.946653, 0.051935, 0.001800 + bnd["pwv_poly"] = 0.944616, 0.053912, 0.001876 bands["SAT_f090"] = bnd bnd = OrderedDict() @@ -545,14 +545,14 @@ def sim_nominal(): bnd["low"] = 128.0 bnd["high"] = 169.0 bnd["bandpass"] = "" - bnd["NET"] = 305.0 + bnd["NET"] = 280.0 bnd["fknee"] = 50.0 bnd["fmin"] = 0.01 bnd["alpha"] = 1.0 - bnd["A"] = 0.21391 - bnd["C"] = 0.72140 - bnd["NET_corr"] = 1.02 - bnd["pwv_poly"] = 0.834630, 0.160602, 0.005976 + bnd["A"] = 0.22947 + bnd["C"] = 0.70118 + bnd["NET_corr"] = 1.00 + bnd["pwv_poly"] = 0.822978, 0.171742, 0.006575 bands["SAT_f150"] = bnd bnd = OrderedDict() @@ -658,9 +658,9 @@ def sim_nominal(): "SAT_LF": (12) * 1, "CHLAT_MF": 54*2, "SPLAT_MF": 54, - "SAT_MFL": (12) * 3, - "SAT_MFH": (12) * 3, - "SAT_MF": 0, + "SAT_MFL": 0, + "SAT_MFH": 0, + "SAT_MF": (12) * 6, "CHLAT_HF": 19*2, "SPLAT_HF": 18, "SAT_HF": (12) * 2, @@ -1346,14 +1346,14 @@ def sim_nominal(): tubes[nm] = tb stubes = [ - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_HF", - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_HF", - "SAT_MFL", - "SAT_MFH", + "SAT_MF", + "SAT_MF", "SAT_LF", ] stube_toasthex_pos = [0, 0, 0, 0, 0, 0, 0, 0, 0] @@ -1818,8 +1818,8 @@ def sim_nominal(): sfwhm["SAT_f145"] = 15.0 sfwhm["SAT_f095"] = 21.2 sfwhm["SAT_f155"] = 13.9 - sfwhm["SAT_f090"] = 27.3 - sfwhm["SAT_f150"] = 17.6 + sfwhm["SAT_f090"] = 21.9 + sfwhm["SAT_f150"] = 14.5 sfwhm["SAT_f220"] = 9.5 sfwhm["SAT_f280"] = 8.5