diff --git a/config_params.py b/config_params.py index b079d167..35543bb0 100644 --- a/config_params.py +++ b/config_params.py @@ -10,6 +10,9 @@ RASTER_TUNE_ICE_RING_WIDTH = 'rasterTuneIceRingWidth' RASTER_DOZOR_SPOT_LEVEL = 'rasterDozorSpotLevel' RASTER_NUM_CELLS_DELAY_THRESHOLD = 'rasterNumCellsThresholdDelay' +RASTER_DOZOR_PREFIX = 'titania-cpu' +RASTER_DOZOR_NODE_COUNT = 2 +RASTER_DOZOR_FILE_DELAY = 0.1 # timing delays ISPYB_RESULT_ENTRY_DELAY = 'ispybResultEntryDelay' diff --git a/daq_macros.py b/daq_macros.py index d787be54..a111d9a4 100644 --- a/daq_macros.py +++ b/daq_macros.py @@ -821,10 +821,10 @@ def runDozorThread(directory, """ global rasterRowResultsList,processedRasterRowCount - time.sleep(10.0) #allow for file writing + time.sleep(RASTER_DOZOR_FILE_DELAY) #allow for file writing #node = getNodeName("spot", rowIndex, 8) - node = "titania-cpu00"+str((rowIndex%4)+1) + node = RASTER_DOZOR_PREFIX + str((rowIndex%RASTER_DOZOR_NODE_COUNT)+1).zfill(3) logger.info(f"distributing row {rowIndex} to {node}") if (seqNum>-1): #eiger @@ -3688,7 +3688,7 @@ def armed_callback(value, old_value, **kwargs): rasterFilePrefix = rasterFilePrefix.split("/")[-1] logger.info(f"raster prefix {rasterFilePrefix}") for i in range(0, number_of_lines): - time.sleep(1.0) + time.sleep(RASTER_DOZOR_FILE_DELAY) row_index = i logger.info(f'spot finding for row {i}') seqNum = raster_flyer.detector.cam.sequence_id.get()