Skip to content

use target_value and current_value #7

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

Merged
seb5g merged 1 commit into from
May 12, 2025
Merged

use target_value and current_value #7

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 src/pymodaq_plugins_piezoconcept/daq_move_plugins/daq_move_PiezoConcept.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def get_actuator_value(self) -> DataActuator:
position = DataActuator(data=pos.pos,
units='nm' if pos.unit == 'n' else 'um')
position = self.get_position_with_scaling(position)
self.current_position = self.target_position #should be pos but not precise enough conpared to set position
return self.target_position
self.current_value = self.target_value #should be pos but not precise enough conpared to set position
return self.target_value

def move_abs(self, position: DataActuator):
"""
Expand All @@ -102,7 +102,7 @@ def move_abs(self, position: DataActuator):

"""
position = self.check_bound(position) #limits the position within the specified bounds (-100,100)
self.target_position = position
self.target_value = position
position = self.set_position_with_scaling(position)

#get positions in controller units
Expand All @@ -113,8 +113,8 @@ def move_abs(self, position: DataActuator):
def move_rel(self, position: DataActuator):
""" Make the hardware relative move of the Piezo instrument from the given position
"""
position = self.check_bound(self.current_position+position)-self.current_position
self.target_position = position+self.current_position
position = self.check_bound(self.current_value+position)-self.current_value
self.target_value = position+self.current_value

position = self.set_position_relative_with_scaling(position)

Expand Down