diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py index 1d5725ab12486a557b44bda50631e2c90a79b42a..26547e369fca63ad2677a530c92f21aae3ef2d7c 100755 --- a/lisainstrument/instrument.py +++ b/lisainstrument/instrument.py @@ -91,7 +91,7 @@ class Instrument: sync_asds=2.2E-3, # Tilt-to-length (TTL) ttl_coeffs='default', - sc_jitter_asds=(1E-8, 1E-8, 1E-8), mosa_jitter_asds=1E-8, mosa_angles='default', + sc_jitter_asds=(5E-9, 5E-9, 5E-9), mosa_jitter_asds=(2E-9, 1e-9), mosa_angles='default', dws_asds=7E-8/335, # Pseudo-ranging ranging_biases=0, ranging_asds=3E-9, prn_ambiguity=None, @@ -159,7 +159,8 @@ class Instrument: distribution [-1.6, 1.6] µm/rad (for local) and [-1.65, 1.65] µm/rad (for distant) sc_jitter_asds: tuple of dictionaries of angular jitter amplitude spectral densities for spacecraft, ordered as (yaw, pitch, roll) [rad/sqrt(Hz)] - mosa_jitter_asds: dictionary of MOSA yaw jitter amplitude spectral densities [rad/sqrt(Hz)] + mosa_jitter_asds: tuple of dictionaries of angular jitter amplitude spectral densities + for MOSA, ordered as (yaw, pitch) [rad/sqrt(Hz)] mosa_angles: dictionary of oriented MOSA opening angles [deg], or 'default' dws_asds: dictionary of amplitude spectral densities for DWS measurement noise [rad/s/sqrt(Hz)] ranging_biases: dictionary of ranging noise bias [s] @@ -360,7 +361,8 @@ class Instrument: self.sc_jitter_phi_asds = ForEachSC(sc_jitter_asds[0]) self.sc_jitter_eta_asds = ForEachSC(sc_jitter_asds[1]) self.sc_jitter_theta_asds = ForEachSC(sc_jitter_asds[2]) - self.mosa_jitter_phi_asds = ForEachMOSA(mosa_jitter_asds) + self.mosa_jitter_phi_asds = ForEachMOSA(mosa_jitter_asds[0]) + self.mosa_jitter_eta_asds = ForEachMOSA(mosa_jitter_asds[1]) self.dws_asds = ForEachMOSA(dws_asds) # MOSA opening angles @@ -1461,6 +1463,9 @@ class Instrument: self.mosa_jitter_phis = ForEachMOSA(lambda mosa: noises.jitter(self.physics_fs, self.physics_size, self.mosa_jitter_phi_asds[mosa]) ) + self.mosa_jitter_etas = ForEachMOSA(lambda mosa: + noises.jitter(self.physics_fs, self.physics_size, self.mosa_jitter_eta_asds[mosa]) + ) logger.info("Computing MOSA total angular jitters") @@ -1469,7 +1474,8 @@ class Instrument: sin_mosa_angles = (self.mosa_angles * np.pi / 180).transformed(lambda _, x: np.sin(x)) self.mosa_total_jitter_etas = \ cos_mosa_angles * self.sc_jitter_etas.for_each_mosa() \ - + sin_mosa_angles * self.sc_jitter_thetas.for_each_mosa() + + sin_mosa_angles * self.sc_jitter_thetas.for_each_mosa() \ + + self.mosa_jitter_etas ## Tilt-to-length coupling ## TTL couplings are defined as velocities [m/s]