Skip to content

Changes from JK #668

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

Open
Chsudeepta wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes from JK #668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1597ec
Changes from JK
Mar 30, 2026
ed67a15
Changes from JK
Mar 31, 2026
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
13 changes: 7 additions & 6 deletions common_tests/instron_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_
/ float(self.ca.get_pv_value("STRESS:AREA")),
float(self.ca.get_pv_value("STRAIN:SCALE"))
* 100000
* float(self.ca.get_pv_value("STRAIN:LENGTH")),
/ float(self.ca.get_pv_value("STRAIN:LENGTH")),
]

for i in range(len(conversion_factors)):
Expand All @@ -696,16 +696,17 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_
self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1)
self.ca.set_pv_value(self.wave_prefixed("AMP:SP"), input_values[device_channel])
self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel])
amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV")))
self.assertEqual(float(amplitude), input_values[device_channel])
self.ca.assert_that_pv_is(
self.wave_prefixed("AMP:SP:RBV"), input_values[device_channel]
)
self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel])

for device_channel in range(NUMBER_OF_CHANNELS):
self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1)
self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel])
self.ca.assert_that_pv_is(
self.wave_prefixed("AMP:SP:RBV"), input_values[device_channel]
)
amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV")))
self.assertEqual(float(amplitude), input_values[device_channel])


@skip_if_recsim("RECSIM does not capture dynamic behaviour")
def test_WHEN_the_quarter_counter_is_off_THEN_the_number_of_counts_is_and_remains_zero(self):
Expand Down
Loading