From e23708277306445266d460f221f54fbb96da4d04 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bayle <j2b.bayle@gmail.com>
Date: Wed, 4 Jan 2023 11:45:20 +0100
Subject: [PATCH] Fix report job
---
lisainstrument/instrument.py | 9 +++++----
report.py | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py
index 737d713..cde4fff 100755
--- a/lisainstrument/instrument.py
+++ b/lisainstrument/instrument.py
@@ -817,11 +817,12 @@ class Instrument:
Args:
but: optional category of noises to keep on ['laser', 'modulation',
- 'clock', 'pathlength', 'ranging', 'jitters', 'dws', 'sync']
+ 'clock', 'pathlength', 'ranging', 'jitters', 'dws',
+ 'moc-time-correlation']
"""
valid_noises = [
'laser', 'modulation', 'clock', 'pathlength',
- 'ranging', 'jitters', 'dws', 'sync']
+ 'ranging', 'jitters', 'dws', 'moc-time-correlation']
if but is not None and but not in valid_noises:
raise ValueError(f"unknown noise '{but}'")
@@ -839,8 +840,8 @@ class Instrument:
self.disable_jitters()
if but != 'dws':
self.dws_asds = ForEachMOSA(0)
- if but != 'sync':
- self.sync_asds = ForEachSC(0)
+ if but != 'moc-time-correlation':
+ self.moc_time_correlation_asds = ForEachSC(0)
def disable_clock_noises(self):
"""Turn off all imperfections on clocks."""
diff --git a/report.py b/report.py
index 7da1e5e..3cb5dc2 100644
--- a/report.py
+++ b/report.py
@@ -51,7 +51,7 @@ def main():
modulation,
jitter,
dws,
- sync,
+ moc_time_correlation,
]
]
@@ -533,41 +533,41 @@ def dws():
write_metadata('dws-noise', instru.orbit_file, pdf)
-def sync():
- """TCB synchronization-noise simulation."""
+def moc_time_correlation():
+ """MOC time correlation-noise simulation."""
- logging.info("Running TCB synchronization-noise simulation")
+ logging.info("Running MOC time correlation-noise simulation")
instru = Instrument(
size=SIZE,
orbits='tests/esa-trailing-orbits-2-0.h5',
concurrent=True,
)
- instru.disable_all_noises(but='sync')
- instru.write('sync-noise.h5', mode='w')
+ instru.disable_all_noises(but='moc-time-correlation')
+ instru.write('moc-time-correlation-noise.h5', mode='w')
- with PdfPages('sync-noise.pdf') as pdf:
+ with PdfPages('moc-time-correlation-noise.pdf') as pdf:
plt.figure(figsize=(16, 8))
for sc in instru.SCS:
- plot_tseries(instru.physics_t, instru.tcb_sync_noises[sc], label=sc)
+ plot_tseries(instru.physics_t, instru.moc_time_correlations[sc], label=sc)
plt.ylabel('Time [s]')
- plt.title('TCB synchronization noise')
+ plt.title('MOC time correlation noise')
plt.legend()
pdf.savefig()
plt.close()
plt.figure(figsize=(16, 8))
for sc in instru.SCS:
- plot_asd(instru.physics_t, instru.tcb_sync_noises[sc], label=sc)
+ plot_asd(instru.physics_t, instru.moc_time_correlations[sc], label=sc)
plt.ylabel('ASD [s/sqrt(Hz)]')
- plt.title('TCB synchronization noise')
+ plt.title('MOC time correlation noise')
plt.legend()
pdf.savefig()
plt.close()
plot_measurements(instru, pdf)
- write_metadata('sync-noise', instru.orbit_file, pdf)
+ write_metadata('moc-time-correlation-noise', instru.orbit_file, pdf)
def plot_measurements(instru, pdf):
--
GitLab