Skip to content

Commit

Permalink
Environment fix + some log changes
Browse files Browse the repository at this point in the history
  • Loading branch information
isotuela committed Jul 10, 2023
1 parent 125bdee commit a3e7e31
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ async def configure_atmonochromator(self):
params = await self.get_monochromator_parameters()

self.log.info(
f"ATMonochromator grating is {params[0].gratingType}, \n"
f"wavelength is {params[1].wavelength} \n"
f"with entry slit width {params[2].width:0.1f} \n"
f"and exit slit width {params[3].width:0.1f}"
f"ATMonochromator grating is {params[0]}, \n"
f"wavelength is {params[1]}, \n"
f"with entry slit width {params[2]}, \n"
f"and exit slit width {params[3]}"
)

async def get_monochromator_parameters(self):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_auxtel_power_on_atcalsys.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ async def configure_mocks(self):
side_effect=self.mock_chiller_temp
)

# Chiller
# White lamp
async def mock_get_whitelightsource_summary_state(self, **kwargs):
return types.SimpleNamespace(summaryState=salobj.State.ENABLED)

# Chiller
async def mock_start_chiller_temp(self, **kwargs):
self.start_chiller_temperature = 30

Expand Down Expand Up @@ -230,12 +231,11 @@ async def test_run_without_without_failures(self):
self.script.white_light_source.evt_summaryState.aget.assert_awaited_once_with()
self.script.monochromator.evt_summaryState.aget.assert_awaited_once_with()

# Q? Remove cause it's redundant?
# Assert states are OK
assert self.chiller_status.chillerState == "READY"
assert self.lamp_state.basicState == ATWhiteLight.LampBasicState.ON
assert self.shutter_status.shutterState == ATWhiteLight.ShutterState.OPEN
assert self.grating_status.gratingState == ATMonochromator.Grating.MIRROR
# Q? Assert wavelength and slitWidth?

async def test_executable(self):
scripts_dir = standardscripts.get_scripts_dir()
Expand Down

0 comments on commit a3e7e31

Please sign in to comment.