Skip to content

Uhf labels #1146

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions sotodlib/sim_hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def sim_nominal():
bnd["A"] = 0.29
bnd["C"] = 0.62
bnd["NET_corr"] = 1.02
bands["LAT_f230"] = bnd
bands["LAT_f220"] = bnd

bnd = OrderedDict()
bnd["center"] = 285.4
Expand All @@ -167,7 +167,7 @@ def sim_nominal():
bnd["A"] = 0.36
bnd["C"] = 0.53
bnd["NET_corr"] = 1.00
bands["LAT_f290"] = bnd
bands["LAT_f280"] = bnd

bnd = OrderedDict()
bnd["center"] = 25.7
Expand Down Expand Up @@ -239,7 +239,7 @@ def sim_nominal():
bnd["A"] = 0.35
bnd["C"] = 0.54
bnd["NET_corr"] = 1.00
bands["SAT_f230"] = bnd
bands["SAT_f220"] = bnd

bnd = OrderedDict()
bnd["center"] = 285.4
Expand All @@ -253,7 +253,7 @@ def sim_nominal():
bnd["A"] = 0.42
bnd["C"] = 0.45
bnd["NET_corr"] = 1.00
bands["SAT_f290"] = bnd
bands["SAT_f280"] = bnd

# Special "band" for dark bolometers

Expand Down Expand Up @@ -309,10 +309,10 @@ def sim_nominal():
wbd = {
"LAT_LF": ["LAT_f030", "LAT_f040"],
"LAT_MF": ["LAT_f090", "LAT_f150"],
"LAT_UHF": ["LAT_f230", "LAT_f290"],
"LAT_UHF": ["LAT_f220", "LAT_f280"],
"SAT_LF": ["SAT_f030", "SAT_f040"],
"SAT_MF": ["SAT_f090", "SAT_f150"],
"SAT_UHF": ["SAT_f230", "SAT_f290"]
"SAT_UHF": ["SAT_f220", "SAT_f280"]
}
windx = 0
cardindx = 0
Expand Down Expand Up @@ -484,8 +484,8 @@ def sim_nominal():
fwhm["LAT_f040"] = 5.1
fwhm["LAT_f090"] = 2.2
fwhm["LAT_f150"] = 1.4
fwhm["LAT_f230"] = 1.0
fwhm["LAT_f290"] = 0.9
fwhm["LAT_f220"] = 1.0
fwhm["LAT_f280"] = 0.9
tele["fwhm"] = fwhm
tele["platform_name"] = ""
telescopes["LAT"] = tele
Expand All @@ -495,8 +495,8 @@ def sim_nominal():
fwhm_sat["SAT_f040"] = 63.0
fwhm_sat["SAT_f090"] = 30.0
fwhm_sat["SAT_f150"] = 17.0
fwhm_sat["SAT_f230"] = 11.0
fwhm_sat["SAT_f290"] = 9.0
fwhm_sat["SAT_f220"] = 11.0
fwhm_sat["SAT_f280"] = 9.0

tele = OrderedDict()
tele["tube_slots"] = ["ST1"]
Expand Down
4 changes: 2 additions & 2 deletions sotodlib/site_pipeline/analyze_bright_ptsrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@ def get_hw_positions(tele, band, tube=None):
'f040': 'SAT4',
'f090': 'SAT1',
'f150': 'SAT1',
'f230': 'SAT3',
'f290': 'SAT3',
'f220': 'SAT3',
'f280': 'SAT3',
}

if tube is None:
Expand Down
4 changes: 2 additions & 2 deletions sotodlib/toast/ops/sim_hwpss.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ def _exec(self, data, detectors=None, **kwargs):
"SAT_f040" : "039",
"SAT_f090" : "093",
"SAT_f150" : "145",
"SAT_f230" : "225",
"SAT_f290" : "278",
"SAT_f220" : "225",
"SAT_f280" : "278",
}[band]

# Get incident angle
Expand Down
32 changes: 16 additions & 16 deletions sotodlib/toast/ops/sim_mumux_crosstalk.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
"SAT_f040" : 0.267,
"SAT_f090" : 1.51,
"SAT_f150" : 2.69,
"SAT_f230" : 7.27,
"SAT_f290" : 11.18,
"SAT_f220" : 7.27,
"SAT_f280" : 11.18,
"LAT_f030" : 0.21,
"LAT_f040" : 1.02,
"LAT_f090" : 1.04,
"LAT_f150" : 2.23,
"LAT_f230" : 7.50,
"LAT_f290" : 12.48,
"LAT_f220" : 7.50,
"LAT_f280" : 12.48,
}

# Optical power due to standard atmosphere
Expand All @@ -36,14 +36,14 @@
"SAT_f040" : 0.618673466,
"SAT_f090" : 0.811076040,
"SAT_f150" : 1.343902747,
"SAT_f230" : 4.118517930,
"SAT_f290" : 7.056159517,
"SAT_f220" : 4.118517930,
"SAT_f280" : 7.056159517,
"LAT_f030" : 0.042984911,
"LAT_f040" : 0.495809196,
"LAT_f090" : 0.509838815,
"LAT_f150" : 1.000122526,
"LAT_f230" : 3.359030038,
"LAT_f290" : 6.284548710,
"LAT_f220" : 3.359030038,
"LAT_f280" : 6.284548710,
}

# Optical effiency between the detector and the atmosphere
Expand All @@ -52,14 +52,14 @@
"SAT_f040" : 0.278,
"SAT_f090" : 0.206,
"SAT_f150" : 0.267,
"SAT_f230" : 0.310,
"SAT_f290" : 0.344,
"SAT_f220" : 0.310,
"SAT_f280" : 0.344,
"LAT_f030" : 0.115,
"LAT_f040" : 0.216,
"LAT_f090" : 0.130,
"LAT_f150" : 0.199,
"LAT_f230" : 0.252,
"LAT_f290" : 0.305,
"LAT_f220" : 0.252,
"LAT_f280" : 0.305,
}

# Saturation power [pW]
Expand All @@ -68,14 +68,14 @@
"SAT_f040" : 4.62,
"SAT_f090" : 3.42,
"SAT_f150" : 9.37,
"SAT_f230" : 29.4,
"SAT_f290" : 31.8,
"SAT_f220" : 29.4,
"SAT_f280" : 31.8,
"LAT_f030" : 1.08,
"LAT_f040" : 4.62,
"LAT_f090" : 3.42,
"LAT_f150" : 9.37,
"LAT_f230" : 29.4,
"LAT_f290" : 31.8,
"LAT_f220" : 29.4,
"LAT_f280" : 31.8,
}
# Bolometer Resistance [Ohm]
R_BOLO = 0.008
Expand Down
2 changes: 1 addition & 1 deletion sotodlib/toast/sim_focalplane.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def load_wafer_data(filename, array_name, sub_array_name=None):
if sub_array_name is not None:
switches = {
"L" : {"f090" : "f030", "f150" : "f040"},
"U" : {"f090" : "f230", "f150" : "f290"},
"U" : {"f090" : "f220", "f150" : "f280"},
}
for i in range(len(rs)):
row = rs.rows[i]
Expand Down
4 changes: 2 additions & 2 deletions sotodlib/toast/workflows/sim_observe.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ def setup_simulate_observing(parser, operators):
default=None,
help="Comma-separated list of bands: LAT_f030 (27GHz), LAT_f040 (39GHz), "
"LAT_f090 (93GHz), LAT_f150 (145GHz), "
"LAT_f230 (225GHz), LAT_f290 (285GHz), "
"LAT_f220 (225GHz), LAT_f280 (285GHz), "
"SAT_f030 (27GHz), SAT_f040 (39GHz), "
"SAT_f090 (93GHz), SAT_f150 (145GHz), "
"SAT_f230 (225GHz), SAT_f290 (285GHz). ",
"SAT_f220 (225GHz), SAT_f280 (285GHz). ",
)
group = parser.add_mutually_exclusive_group(required=False)
group.add_argument(
Expand Down
8 changes: 4 additions & 4 deletions sotodlib/vis_hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"LAT_f040": (0.4, 0.4, 1.0, 0.2),
"LAT_f090": (0.4, 1.0, 0.4, 0.2),
"LAT_f150": (0.4, 1.0, 0.4, 0.2),
"LAT_f230": (1.0, 0.4, 0.4, 0.2),
"LAT_f290": (1.0, 0.4, 0.4, 0.2),
"LAT_f220": (1.0, 0.4, 0.4, 0.2),
"LAT_f280": (1.0, 0.4, 0.4, 0.2),
"SAT_f030": (0.4, 0.4, 1.0, 0.2),
"SAT_f040": (0.4, 0.4, 1.0, 0.2),
"SAT_f090": (0.4, 1.0, 0.4, 0.2),
"SAT_f150": (0.4, 1.0, 0.4, 0.2),
"SAT_f230": (1.0, 0.4, 0.4, 0.2),
"SAT_f290": (1.0, 0.4, 0.4, 0.2),
"SAT_f220": (1.0, 0.4, 0.4, 0.2),
"SAT_f280": (1.0, 0.4, 0.4, 0.2),
}


Expand Down
Loading