diff --git a/daq_main_common.py b/daq_main_common.py index ecdd560c..dd459370 100755 --- a/daq_main_common.py +++ b/daq_main_common.py @@ -34,62 +34,7 @@ def setGovState(state): setGovRobot(gov_robot, state) -if daq_utils.beamline != "nyx": - functions = [anneal, - set_beamsize, - importSpreadsheet, - mvaDescriptor, - setTrans, - loop_center_xrec, - autoRasterLoop, - snakeRaster, - ispybLib.insertRasterResult, - backlightBrighter, - backlightDimmer, - changeImageCenterHighMag, - changeImageCenterLowMag, - center_on_click, - runDCQueue, - warmupGripper, - dryGripper, - enableDewarTscreen, - parkGripper, - stopDCQueue, - continue_data_collection, - mountSample, - unmountSample, - reprocessRaster, - fastDPNodes, - spotNodes, - unmountCold, - openPort, - set_beamcenter, - closePorts, - clearMountedSample, - recoverRobot, - rebootEMBL, - restartEMBL, - openGripper, - closeGripper, - homePins, - setSlit1X, - setSlit1Y, - testRobot, - setGovState, - move_omega, - lockGUI, - unlockGUI, - DewarAutoFillOff, - DewarAutoFillOn, - logMe, - unlatchGov, - backoffDetector, - enableMount, - robotOn, - set_energy - ] -else: - functions = [ +functions = [ set_beamsize, importSpreadsheet, mvaDescriptor, @@ -142,6 +87,9 @@ def setGovState(state): set_energy ] +if daq_utils.beamline != "nyx": + functions = functions + [anneal] + whitelisted_functions: "Dict[str, Callable]" = { func.__name__: func for func in functions }