Compare commits

..

No commits in common. "082f99aa0d25d3b3e17d50be61839e2b9212f8a3" and "a566dda4b031af42c9e3f396950c2df49f0917bb" have entirely different histories.

View File

@ -7,8 +7,8 @@ Lightfield + Positioner
############################################ ############################################
# Packages from Ryan # Packages from Ryan
import re import re
from threading import Thread
import pyvisa import pyvisa
import threading
# from pyvisa import ResourceManager, constants # from pyvisa import ResourceManager, constants
# B Field Limits (in T) # B Field Limits (in T)
@ -572,11 +572,8 @@ def sweep_b_val(instr:pyvisa.resources.Resource, min_bval:float, max_bval:float,
wl = np.array(loaded_files.wavelength) wl = np.array(loaded_files.wavelength)
np.savetxt("Wavelength.txt", wl) np.savetxt("Wavelength.txt", wl)
# TODO: write a function that simultaneously controls the two power supplies and perform the rotation of the B-field. => Threading # TODO: write a function that simultaneously controls the two power supplies. => Threading
# in function head should be func(instr1, instr2, args1, kwargs1, args2, kwargs2) # in function head should be func(instr1, instr2, args1, kwargs1, args2, kwargs2)
def b_field_rotation(instr1:pyvisa.resources.Resource, instr2:pyvisa.resources.Resource,
Babs:float, startangle:float, endangle:float, angle_stepsize:float, clockwise=True, sweepdown=False)->None:
pass
################################################################# END OF FUNCTION DEFS ########################################################################################### ################################################################# END OF FUNCTION DEFS ###########################################################################################