SIQM-HM-and-precession.md

@@ -35,9 +35,16 @@ This is a dedicated page to perform various analyses to see the measurability of
 * Contact: divyajyoti.nln
 * Recovery prior on kappa: \[-500,500\]
 * All injections are zero-noise, test runs have nlive=500, nact=5
+<<<<<<< HEAD
 | Run | injection waveform | recovery waveform | config | Status | results | rundir | Comments |
 |-----|--------------------|-------------------|--------|--------|---------|--------|----------|
 | Test run BBH - run_01 | XPHM | XPHM | config, HM - precessing injection, HM - precessing recovery | TO BE LAUNCHED |  | CIT: /home/divyajyoti.nln/SIQM_HM/test_run_bilby_m1_30_m2_20_nvk_siqm_xp_env/test_bh_xphm/run01 | Network SNR\~57, this is a sanity check for the new bug fix in XP waveform |
+=======
+
+| Run | injection waveform | recovery waveform | config | Status | results | rundir |Comments |
+|-----|--------------------|-------------------|--------|--------|---------|--------|---------|
+| Test run BBH - run_01    | XPHM | XPHM | config, HM - precessing injection, HM - precessing recovery | TO BE LAUNCHED |  | CIT: `/home/divyajyoti.nln/SIQM_HM/run_bilby_m1_60_m2_40/run_04/test_bh_xp` | Network SNR~57, this is a sanity check for the new bug fix in XP waveform                                                                                           |
+>>>>>>> parent of 6e0ba13 (Update SIQM HM and precession)
 
 ## Table 7: m1=60, m2=40 (test runs for bug fix in XP and XPHM, old)