Skip to content
Snippets Groups Projects

Resolve "Do not accept fplan files for simulations without an orbit files"

@@ -528,7 +528,11 @@ class Instrument:
fplan: `fplan` parameter, c.f. `__init__()`
"""
if fplan == 'static':
logger.info("Using default set of locking beatnote frequencies")
logger.warning(
"Using default set of locking beatnote frequencies; this "
"might cause interferometric beatnote frequencies to fall "
"outside the requirement range of 5..25 MHz"
)
self.fplan_file = None
self.fplan = ForEachMOSA({
'12': 8E6, '23': 9E6, '31': 10E6,
@@ -537,6 +541,9 @@ class Instrument:
elif isinstance(fplan, str):
logger.info("Using frequency-plan file '%s'", fplan)
self.fplan_file = fplan
# Refuse to use a fplan file if no orbit files are used
if self.orbit_file is None:
raise ValueError("cannot use frequency-plan for non orbit files")
# Without a standard lock config, there is no dataset
# in the frequency-plan file and therefore we cannot use it
if self.lock_config is None:
Loading