diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py
index 87ad81da8fa6089608c1d298fa90f364b4b46356..7defc971fe7b997b24444760e1e64e818e61349e 100644
--- a/lisainstrument/instrument.py
+++ b/lisainstrument/instrument.py
@@ -1064,34 +1064,6 @@ class Instrument:
/ (1 + self.clock_noise_offsets)**2
).transformed(self.timestamped)
- ## Total frequencies
-
- logger.info("Computing total beatnote frequencies")
-
- logger.debug("Computing total inter-spacecraft carrier beatnotes")
- self.the_isc_carriers = \
- self.the_isc_carrier_offsets + self.the_isc_carrier_fluctuations
-
- logger.debug("Computing total inter-spacecraft upper sideband beatnotes")
- self.the_isc_usbs = \
- self.the_isc_usb_offsets + self.the_isc_usb_fluctuations
-
- logger.debug("Computing total test-mass carrier beatnotes")
- self.the_tm_carriers = \
- self.the_tm_carrier_offsets + self.the_tm_carrier_fluctuations
-
- logger.debug("Computing total test-mass upper sideband beatnotes")
- self.the_tm_usbs = \
- self.the_tm_usb_offsets + self.the_tm_usb_fluctuations
-
- logger.debug("Computing total reference carrier beatnotes")
- self.the_ref_carriers = \
- self.the_ref_carrier_offsets + self.the_ref_carrier_fluctuations
-
- logger.debug("Computing total reference upper sideband beatnotes")
- self.the_ref_usbs = \
- self.the_ref_usb_offsets + self.the_ref_usb_fluctuations
-
## Antialiasing filtering
logger.info("Filtering beatnotes")
@@ -1099,10 +1071,8 @@ class Instrument:
logger.debug("Filtering inter-spacecraft beatnotes")
self.filtered_isc_carrier_offsets = self.the_isc_carrier_offsets.transformed(self.aafilter)
self.filtered_isc_carrier_fluctuations = self.the_isc_carrier_fluctuations.transformed(self.aafilter)
- self.filtered_isc_carriers = self.the_isc_carriers.transformed(self.aafilter)
self.filtered_isc_usb_offsets = self.the_isc_usb_offsets.transformed(self.aafilter)
self.filtered_isc_usb_fluctuations = self.the_isc_usb_fluctuations.transformed(self.aafilter)
- self.filtered_isc_usbs = self.the_isc_usbs.transformed(self.aafilter)
logger.debug("Filtering inter-spacecraft DWS measurements")
self.filtered_isc_dws_phis = self.the_isc_dws_phis.transformed(self.aafilter)
@@ -1114,18 +1084,14 @@ class Instrument:
logger.debug("Filtering test-mass beatnotes")
self.filtered_tm_carrier_offsets = self.the_tm_carrier_offsets.transformed(self.aafilter)
self.filtered_tm_carrier_fluctuations = self.the_tm_carrier_fluctuations.transformed(self.aafilter)
- self.filtered_tm_carriers = self.the_tm_carriers.transformed(self.aafilter)
self.filtered_tm_usb_offsets = self.the_tm_usb_offsets.transformed(self.aafilter)
self.filtered_tm_usb_fluctuations = self.the_tm_usb_fluctuations.transformed(self.aafilter)
- self.filtered_tm_usbs = self.the_tm_usbs.transformed(self.aafilter)
logger.debug("Filtering reference beatnotes")
self.filtered_ref_carrier_offsets = self.the_ref_carrier_offsets.transformed(self.aafilter)
self.filtered_ref_carrier_fluctuations = self.the_ref_carrier_fluctuations.transformed(self.aafilter)
- self.filtered_ref_carriers = self.the_ref_carriers.transformed(self.aafilter)
self.filtered_ref_usb_offsets = self.the_ref_usb_offsets.transformed(self.aafilter)
self.filtered_ref_usb_fluctuations = self.the_ref_usb_fluctuations.transformed(self.aafilter)
- self.filtered_ref_usbs = self.the_ref_usbs.transformed(self.aafilter)
## Downsampling filtering
@@ -1162,6 +1128,34 @@ class Instrument:
self.ref_usb_fluctuations = self.filtered_ref_usb_fluctuations.transformed(self.downsampled)
self.ref_usbs = self.filtered_ref_usbs.transformed(self.downsampled)
+ ## Total frequencies
+
+ logger.info("Computing total beatnote frequencies")
+
+ logger.debug("Computing total inter-spacecraft carrier beatnotes")
+ self.isc_carriers = \
+ self.isc_carrier_offsets + self.isc_carrier_fluctuations
+
+ logger.debug("Computing total inter-spacecraft upper sideband beatnotes")
+ self.isc_usbs = \
+ self.isc_usb_offsets + self.isc_usb_fluctuations
+
+ logger.debug("Computing total test-mass carrier beatnotes")
+ self.tm_carriers = \
+ self.tm_carrier_offsets + self.tm_carrier_fluctuations
+
+ logger.debug("Computing total test-mass upper sideband beatnotes")
+ self.tm_usbs = \
+ self.tm_usb_offsets + self.tm_usb_fluctuations
+
+ logger.debug("Computing total reference carrier beatnotes")
+ self.ref_carriers = \
+ self.ref_carrier_offsets + self.ref_carrier_fluctuations
+
+ logger.debug("Computing total reference upper sideband beatnotes")
+ self.ref_usbs = \
+ self.ref_usb_offsets + self.ref_usb_fluctuations
+
## Closing simulation
logger.info("Simulation complete")
@@ -1690,21 +1684,11 @@ class Instrument:
self.the_ref_usb_offsets.write(hdf5, 'the_ref_usb_offsets')
self.the_ref_usb_fluctuations.write(hdf5, 'the_ref_usb_fluctuations')
- logger.debug("Writing total beatnote frequencies to '%s'", output)
- self.the_isc_carriers.write(hdf5, 'the_isc_carriers')
- self.the_isc_usbs.write(hdf5, 'the_isc_usbs')
- self.the_tm_carriers.write(hdf5, 'the_tm_carriers')
- self.the_tm_usbs.write(hdf5, 'the_tm_usbs')
- self.the_ref_carriers.write(hdf5, 'the_ref_carriers')
- self.the_ref_usbs.write(hdf5, 'the_ref_usbs')
-
logger.debug("Writing filtered inter-spacecraft beatnotes to '%s'", output)
self.filtered_isc_carrier_offsets.write(hdf5, 'filtered_isc_carrier_offsets')
self.filtered_isc_carrier_fluctuations.write(hdf5, 'filtered_isc_carrier_fluctuations')
- self.filtered_isc_carriers.write(hdf5, 'filtered_isc_carriers')
self.filtered_isc_usb_offsets.write(hdf5, 'filtered_isc_usb_offsets')
self.filtered_isc_usb_fluctuations.write(hdf5, 'filtered_isc_usb_fluctuations')
- self.filtered_isc_usbs.write(hdf5, 'filtered_isc_usbs')
logger.debug("Writing filtered inter-spacecraft DWS measurements to '%s'", output)
self.filtered_isc_dws_phis.write(hdf5, 'filtered_isc_dws_phis')
@@ -1716,26 +1700,20 @@ class Instrument:
logger.debug("Writing filtered test-mass beatnotes to '%s'", output)
self.filtered_tm_carrier_offsets.write(hdf5, 'filtered_tm_carrier_offsets')
self.filtered_tm_carrier_fluctuations.write(hdf5, 'filtered_tm_carrier_fluctuations')
- self.filtered_tm_carriers.write(hdf5, 'filtered_tm_carriers')
self.filtered_tm_usb_offsets.write(hdf5, 'filtered_tm_usb_offsets')
self.filtered_tm_usb_fluctuations.write(hdf5, 'filtered_tm_usb_fluctuations')
- self.filtered_tm_usbs.write(hdf5, 'filtered_tm_usbs')
logger.debug("Writing filtered reference beatnotes to '%s'", output)
self.filtered_ref_carrier_offsets.write(hdf5, 'filtered_ref_carrier_offsets')
self.filtered_ref_carrier_fluctuations.write(hdf5, 'filtered_ref_carrier_fluctuations')
- self.filtered_ref_carriers.write(hdf5, 'filtered_ref_carriers')
self.filtered_ref_usb_offsets.write(hdf5, 'filtered_ref_usb_offsets')
self.filtered_ref_usb_fluctuations.write(hdf5, 'filtered_ref_usb_fluctuations')
- self.filtered_ref_usbs.write(hdf5, 'filtered_ref_usbs')
logger.debug("Writing downsampled inter-spacecraft beatnotes to '%s'", output)
self.isc_carrier_offsets.write(hdf5, 'isc_carrier_offsets')
self.isc_carrier_fluctuations.write(hdf5, 'isc_carrier_fluctuations')
- self.isc_carriers.write(hdf5, 'isc_carriers')
self.isc_usb_offsets.write(hdf5, 'isc_usb_offsets')
self.isc_usb_fluctuations.write(hdf5, 'isc_usb_fluctuations')
- self.isc_usbs.write(hdf5, 'isc_usbs')
logger.debug("Writing downsampled inter-spacecraft DWS measurements to '%s'", output)
self.isc_dws_phis.write(hdf5, 'isc_dws_phis')
@@ -1760,6 +1738,14 @@ class Instrument:
self.ref_usb_fluctuations.write(hdf5, 'ref_usb_fluctuations')
self.ref_usbs.write(hdf5, 'ref_usbs')
+ logger.debug("Writing total beatnote frequencies to '%s'", output)
+ self.isc_carriers.write(hdf5, 'isc_carriers')
+ self.isc_usbs.write(hdf5, 'isc_usbs')
+ self.tm_carriers.write(hdf5, 'tm_carriers')
+ self.tm_usbs.write(hdf5, 'tm_usbs')
+ self.ref_carriers.write(hdf5, 'ref_carriers')
+ self.ref_usbs.write(hdf5, 'ref_usbs')
+
logger.debug("Write timer deviations from TCB to '%s'", output)
self.tcb_timer_deviations.write(hdf5, 'tcb_timer_deviations')