ssro_fast_pi
BASH
MB
MB
Adwin scripts, related to adaptive magnetometry, THT
Some magnetometry and magnet alignment changes, THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/ssro/ssro_fast_with_pi.py
bell and pq measurement changes!

BASH
from LT3,Anais
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/params_lt3.py
	scripts/bell/params_lt4.py
JC THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/measurement2/adwin_ssro/pulsar_msmt.py
tht
added warning to pq_measurement, calibrations - lt3
Merge branch 'master' of https://github.com/teamdiamond/measurement
in bell script: hist for bs but not for lt3 and lt4,
3/4 pi calibration  , lt4
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/bell.py
	scripts/bell/calibrate_Bell.py
	scripts/bell/joint_params.py
	scripts/bell/params_lt3.py
plu window from lt3
AWG triggering
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/check_awg_triggering.py
QEC updates, THT JC