Skip to content
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

added dozor node naming configurability #384

Open
wants to merge 1 commit into
base: 2024-2-nyx
Choose a base branch
from
+6 −3
Open

added dozor node naming configurability #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions config_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions daq_macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down