diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py index 745d37ef7c7a92633cf8c1009718b0caa74ad95b..6e35b411f710646660b0460fccb211bc95257968 100755 --- a/lisainstrument/instrument.py +++ b/lisainstrument/instrument.py @@ -974,7 +974,7 @@ class Instrument: ## TDIR modulations logger.debug("Forming TDIR assistance modulations") - self.tdir_modulations = ForEachMOSA(lambda mosa: + self.tdir_modulations_tseries = ForEachMOSA(lambda mosa: self.tdir_modulations[mosa](self.physics_et + self.the_wrt_tps_local[mosa[0]]) ) @@ -1722,7 +1722,7 @@ class Instrument: logger.debug("Computing carrier fluctuations for primary local beam %s", mosa) self.local_carrier_fluctuations[mosa] = \ - self.laser_noises[mosa] + self.glitch_lasers[mosa] + self.tdir_modulations[mosa] + self.laser_noises[mosa] + self.glitch_lasers[mosa] + self.tdir_modulations_tseries[mosa] def lock_on_adjacent(self, mosa): @@ -1747,7 +1747,7 @@ class Instrument: self.local_carrier_fluctuations[mosa] = adjacent_carrier_fluctuations \ - self.fplan[mosa] * self.clock_noise_fluctuations[sc(mosa)] \ + self.central_freq * self.oms_rfi_carrier_noises[mosa] \ - + self.tdir_modulations[mosa] + + self.tdir_modulations_tseries[mosa] def lock_on_distant(self, mosa): @@ -1781,7 +1781,7 @@ class Instrument: self.local_carrier_fluctuations[mosa] = distant_carrier_fluctuations \ - self.fplan[mosa] * self.clock_noise_fluctuations[sc(mosa)] \ + self.central_freq * self.oms_isi_carrier_noises[mosa] \ - + self.tdir_modulations[mosa] + + self.tdir_modulations_tseries[mosa] def simulate_locking(self): @@ -1972,7 +1972,7 @@ class Instrument: self.glitch_lasers.write(hdf5, 'glitch_lasers') logger.debug("Writing TDIR assistance modulations to %s", output) - self.tdir_modulations.write(hdf5, 'tdir_modulations') + self.tdir_modulations_tseries.write(hdf5, 'tdir_modulations_tseries') logger.debug("Writing laser noise to '%s'", output) self.laser_noises.write(hdf5, 'laser_noises')