diff --git a/Mag_Field_Sweep_2024_10_21.py b/Mag_Field_Sweep_2024_10_21.py index f492987..61b7f00 100644 --- a/Mag_Field_Sweep_2024_10_21.py +++ b/Mag_Field_Sweep_2024_10_21.py @@ -966,6 +966,14 @@ def b_field_rotation(instr1:pyvisa.resources.Resource, instr2:pyvisa.resources.R # call the helper function to carry out the rotation/measurement of spectrum monitor_devices(device_target_values, angles, intensity_data) + +# TODO: implement b_sweep at an arbitrary angle in the Bx-By plane +# copy the functionality of loading the powerboxsupplies from b_rotation and the other sweep functionalities of +# b_sweep_val and implement it in this function +def sweep_b_angle(instr1:pyvisa.resources.Resource, instr2:pyvisa.resources.Resource, + min_bval:float, max_bval:float, res:float, + Settings:str, clockwise=True, base_file_name='', zerowhenfin_bool=False): + pass ################################################################# END OF FUNCTION DEFS ########################################################################################### diff --git a/ThreadTest.py b/ThreadTest.py index 8d7ff7e..3f0f854 100644 --- a/ThreadTest.py +++ b/ThreadTest.py @@ -37,8 +37,9 @@ def device_thread(device_id): print(f"Device {device_id} => {my_val} | Device {other_id} => {other_val}") if not is_within_tolerance(my_val, other_val): - print(f"Device {device_id} is out of tolerance! Pausing...") - device_events[device_id].clear() + # print(f"Device {device_id} is out of tolerance! Pausing...") + # device_events[device_id].clear() + print("Not within tolerance!") time.sleep(0.1) # Faster check interval