diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py index e48307ea2b94258e645b1e34d5f1c995d70e2bcc..3f6f02cf8346083bea3e3e430d6cb285ab06f731 100755 --- a/lisainstrument/instrument.py +++ b/lisainstrument/instrument.py @@ -900,7 +900,9 @@ class Instrument: self.simulate_noises() - logger.debug("Computing local THE with respect to TCB") + ## Timing quantities + + logger.debug("Integrating clock noise fluctuations") self.integrated_clock_noise_fluctuations_withinitial = \ ForEachSC(lambda sc: @@ -909,13 +911,12 @@ class Instrument: self.physics_size + self.initial_telemetry_physics_size), dx=self.physics_dt, initial=0) ) - - # Slice to only select physics period self.integrated_clock_noise_fluctuations = \ self.integrated_clock_noise_fluctuations_withinitial.transformed( lambda _, x: x if np.isscalar(x) else x[self.initial_telemetry_physics_size:] ) + logger.debug("Computing local THE with respect to TPS") t = self.physics_et self.the_wrt_tps_local = \ self.clock_offsets \ @@ -924,6 +925,7 @@ class Instrument: + self.clock_freqquaddrifts * t**3 / 3 \ + self.integrated_clock_noise_fluctuations + logger.debug("Computing THE with respect to TCB") t = self.physics_et_withinitial self.the_wrt_tcb_withinitial = \ self.tps_wrt_tcb \ @@ -936,6 +938,8 @@ class Instrument: + self.tps_wrt_tcb * self.clock_noise_fluctuations_withinitial \ + self.integrated_clock_noise_fluctuations_withinitial + ## MOC time correlations + logger.debug("Computing MOC time correlations") physics_to_telemetry = lambda _, x: x[::self.physics_upsampling * self.telemetry_downsampling] self.moc_time_correlations = self.moc_time_correlation_noises \ @@ -1865,6 +1869,9 @@ class Instrument: self.pprs.write(hdf5, 'pprs') self.d_pprs.write(hdf5, 'd_pprs') + logger.debug("Writing TPS with respect to TCB to '%s'", output) + self.tps_wrt_tcb.write(hdf5, 'tps_wrt_tcb') + logger.debug("Writing gravitational-wave responses to '%s'", output) self.gws.write(hdf5, 'gws') @@ -1881,7 +1888,8 @@ class Instrument: logger.debug("Writing clock noise to '%s'", output) self.clock_noise_offsets.write(hdf5, 'clock_noise_offsets') self.clock_noise_fluctuations.write(hdf5, 'clock_noise_fluctuations') - self.clock_noise_fluctuations_withinitial.write(hdf5, 'clock_noise_fluctuations_withinitial') + self.clock_noise_fluctuations_withinitial.write( + hdf5, 'clock_noise_fluctuations_withinitial') logger.debug("Writing modulation noise to '%s'", output) self.modulation_noises.write(hdf5, 'modulation_noises') @@ -1924,9 +1932,21 @@ class Instrument: self.local_usb_offsets.write(hdf5, 'local_usb_offsets') self.local_usb_fluctuations.write(hdf5, 'local_usb_fluctuations') + logger.debug("Writing integrated clock noise fluctuations to '%s'", output) + self.integrated_clock_noise_fluctuations_withinitial.write( + hdf5, 'integrated_clock_noise_fluctuations_withinitial') + self.integrated_clock_noise_fluctuations.write( + hdf5, 'integrated_clock_noise_fluctuations') + logger.debug("Writing local THE with respect to TPS to '%s'", output) + self.the_wrt_tps_local.write(hdf5, 'the_wrt_tps_local') + + logger.debug("Writing THE with respect to TCB to '%s'", output) self.the_wrt_tcb_withinitial.write(hdf5, 'the_wrt_tcb_withinitial') + logger.debug("Writing MOC time correlations to '%s'", output) + self.moc_time_correlations.write(hdf5, 'moc_time_correlations') + logger.debug("Writing tilt-to-length couplings to '%s'", output) self.local_ttls.write(hdf5, 'local_ttls') self.distant_ttls.write(hdf5, 'distant_ttls') @@ -2112,9 +2132,6 @@ class Instrument: self.rfi_carriers.write(hdf5, 'rfi_carriers') self.rfi_usbs.write(hdf5, 'rfi_usbs') - logger.debug("Write THE with respect to TPS from TCB to '%s'", output) - self.moc_time_correlations.write(hdf5, 'moc_time_correlations') - logger.info("Closing measurement file '%s'", output) def plot_fluctuations(self, output=None, skip=0):