Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Splits 3, 4, 5 #36

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 84 additions & 17 deletions s4sim/hardware/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,29 +380,29 @@ 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
bnd["pwv_poly"] = 0.919331, 0.077864, 0.003397
bands["SAT_f030"] = bnd

bnd = OrderedDict()
bnd["center"] = 36.5
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
bnd["pwv_poly"] = 0.984349, 0.015404, 0.000360
bands["SAT_f040"] = bnd

bnd = OrderedDict()
Expand Down Expand Up @@ -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"] = 215.0
bnd["fknee"] = 50.0
bnd["fmin"] = 0.01
bnd["alpha"] = 1.0
bnd["A"] = 0.23184
bnd["C"] = 0.69845
bnd["NET_corr"] = 1.03
bnd["pwv_poly"] = 0.946653, 0.051935, 0.001800
bands["SAT_f090"] = bnd

bnd = OrderedDict()
bnd["center"] = 148.5
bnd["low"] = 128.0
bnd["high"] = 169.0
bnd["bandpass"] = ""
bnd["NET"] = 305.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
bands["SAT_f150"] = bnd

bnd = OrderedDict()
bnd["center"] = 227.0
bnd["low"] = 198.0
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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",
Expand All @@ -658,6 +690,7 @@ def sim_nominal():
"SPLAT_MF": 432,
"SAT_MFL": 217,
"SAT_MFH": 271,
"SAT_MF": 271,
"CHLAT_HF": 469,
"SPLAT_HF": 469,
"SAT_HF": 469,
Expand All @@ -672,6 +705,7 @@ def sim_nominal():
"SPLAT_MF": 5.3,
"SAT_MFL": 7.65,
"SAT_MFH": 6.85,
"SAT_MF": 6.85,
"CHLAT_HF": 5.2,
"SPLAT_HF": 5.2,
"SAT_HF": 5.2,
Expand All @@ -686,6 +720,7 @@ def sim_nominal():
"SPLAT_MF": 0.71,
"SAT_MFL": 1.273,
"SAT_MFH": 0.71,
"SAT_MF": 0.71,
"CHLAT_HF": 0.71,
"SPLAT_HF": 0.71,
"SAT_HF": 0.71,
Expand All @@ -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"],
Expand All @@ -715,6 +751,7 @@ def sim_nominal():
"SPLAT_MF": [210,220],
"SAT_MFL": [0,127],
"SAT_MFH": [0,169],
"SAT_MF": [0,169],
"CHLAT_HF": [0,331],
"SPLAT_HF": [0,331],
"SAT_HF": [0,331],
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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, 3552 det/band
tb["platescale"] = 0.070093/0.9931
tb["FOV_cut"] = 30.0
else:
for tw in range(12):
off = 0
Expand Down Expand Up @@ -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.3
sfwhm["SAT_f150"] = 17.6
sfwhm["SAT_f220"] = 11.3
sfwhm["SAT_f280"] = 10.1

Expand Down