Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow floats for custom PID task arguments #548

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Allow floats for custom PID task arguments #548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions socs/agents/lakeshore372/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,9 @@ def get_input_setup(self, session, params):
@ocs_agent.param('setpoint', type=float)
@ocs_agent.param('heater', type=str)
@ocs_agent.param('channel', type=int)
@ocs_agent.param('P', type=int)
@ocs_agent.param('P', type=float)
@ocs_agent.param('I', type=float)
@ocs_agent.param('update_time', type=int)
@ocs_agent.param('update_time', type=float)
@ocs_agent.param('sample_heater_range', type=float, default=10e-3)
@ocs_agent.param('test_mode', type=bool, default=False)
def custom_pid(self, session, params):
Expand All @@ -946,9 +946,9 @@ def custom_pid(self, session, params):
setpoint (float): Setpoint in Kelvin
heater (str): 'still' or 'sample'
channel (int): LS372 Channel to PID off of
P (int): Proportional value in Watts/Kelvin
I (int): Integral Value in Hz
update_time (int): Time between PID updates in seconds
P (float): Proportional value in Watts/Kelvin
I (float): Integral Value in Hz
update_time (float): Time between PID updates in seconds
sample_heater_range (float): Range for sample heater in Amps.
Default is 10e-3.
test_mode (bool, optional): Run the Process loop only once.
Expand Down