Skip to content

Commit

Permalink
Fixed syntax errors and broken tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
canismarko committed Dec 2, 2022
1 parent 55121f6 commit b8a8159
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions haven/plans/mono_gap_calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from ..instrument.instrument_registry import registry
from .set_energy import set_energy
from .auto_gain import auto_gain
from .beam_properties import knife_scan
from .._iconfig import load_config


Expand Down
2 changes: 1 addition & 1 deletion tests/test_beam_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def test_fit_step():
)
expected_center = 5960.94 # 5961.21
# Do the fitting
result = fit_step(x, y, plot=True, plot_derivative=True)
result = fit_step(x, y, plot=False, plot_derivative=False)
plt.show()
assert result.position == pytest.approx(expected_center)
assert result.fwhm == pytest.approx(1449.956)
Expand Down
4 changes: 1 addition & 3 deletions tests/test_monochromator.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ def test_mono_energy_signal(ioc_mono):
energy_prefix="mono_ioc",
name="monochromator")
time.sleep(0.1)
mono.wait_for_connection(timeout=20)
# Change mono energy
mono.energy.set(5000)
time.sleep(1.)
# Check new value on the IOC
assert epics.caget("mono_ioc:Energy") == 5000
assert epics.caget("mono_ioc:Energy", use_monitor=False) == 5000

0 comments on commit b8a8159

Please sign in to comment.