def runDCQueue(): #maybe don't run rasters from here???
global abort_flag
autoMounted = 0 #this means the mount was performed from a runQueue, as opposed to a manual mount button push
logger.info("running queue in daq server")
while (1):
if (getBlConfig("queueCollect") == 1
and getBlConfig("beamCheck") == 1):
waitBeam()
if (abort_flag):
abort_flag = 0 #careful about when to reset this
return
currentRequest = db_lib.popNextRequest(daq_utils.beamline)
if (currentRequest == {}):
break
logger.info("processing request " + str(time.time()))
reqObj = currentRequest["request_obj"]
setPvDesc("govRobotDetDist", reqObj["detDist"])
setPvDesc("govHumanDetDist", reqObj["detDist"])
if (reqObj["detDist"] >= ROBOT_MIN_DISTANCE
and getBlConfig("HePath") == 0):
setPvDesc("govRobotDetDistOut", reqObj["detDist"])
setPvDesc("govHumanDetDistOut", reqObj["detDist"])
sampleID = currentRequest["sample"]
mountedSampleDict = db_lib.beamlineInfo(daq_utils.beamline,
'mountedSample')
currentMountedSampleID = mountedSampleDict["sampleID"]
if (currentMountedSampleID != sampleID):
if (getBlConfig("queueCollect") == 0):
gui_message(
"You can only run requests on the currently mounted sample. Remove offending request and continue."
)
return
mountStat = mountSample(sampleID)
logger.info("automounting mp= " + currentMountedSampleID +
" samp= " + str(sampleID))
if (mountStat == 1):
autoMounted = 1
elif (mountStat == 2):
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
continue
else:
return 0
db_lib.updatePriority(currentRequest["uid"], 99999)
currentRequest[
'priority'] = 99999 #TODO have updatePriority return an updated request?
refreshGuiTree(
) #just tells the GUI to repopulate the tree from the DB
logger.info("calling collect data " + str(time.time()))
colStatus = collectData(currentRequest)
logger.info("done collecting data")
if (autoMounted and db_lib.queueDone(daq_utils.beamline)):
unmountSample()
def runDCQueue(): #maybe don't run rasters from here???
global abort_flag
print "running queue in daq server"
while (1):
if (abort_flag):
abort_flag = 0 #careful about when to reset this
return
currentRequest = db_lib.popNextRequest()
if (currentRequest == {}):
break
sampleID = currentRequest["sample_id"]
if (get_field("mounted_pin") != sampleID):
mountSample(sampleID)
db_lib.updatePriority(currentRequest["request_id"],99999)
refreshGuiTree() #just tells the GUI to repopulate the tree from the DB
colStatus = collectData(currentRequest)
def runDCQueue(): #maybe don't run rasters from here???
global abort_flag
autoMounted = 0 #this means the mount was performed from a runQueue, as opposed to a manual mount button push
print("running queue in daq server")
while (1):
if (abort_flag):
abort_flag = 0 #careful about when to reset this
return
currentRequest = db_lib.popNextRequest(daq_utils.beamline)
if (currentRequest == {}):
break
if (1):
reqObj = currentRequest["request_obj"]
beamline_support.setPvValFromDescriptor("govRobotDetDist",reqObj["detDist"])
beamline_support.setPvValFromDescriptor("govHumanDetDist",reqObj["detDist"])
if (reqObj["detDist"] > 200.0):
beamline_support.setPvValFromDescriptor("govRobotDetDistOut",reqObj["detDist"])
beamline_support.setPvValFromDescriptor("govHumanDetDistOut",reqObj["detDist"])
sampleID = currentRequest["sample"]
if (get_field("mounted_pin") != sampleID):
mountStat = mountSample(sampleID)
if (mountStat == 1):
autoMounted = 1
elif(mountStat == 2):
db_lib.updatePriority(currentRequest["uid"],-1)
refreshGuiTree()
continue
else:
## do this??? db_lib.updatePriority(currentRequest["uid"],99999)
return 0
db_lib.updatePriority(currentRequest["uid"],99999)
refreshGuiTree() #just tells the GUI to repopulate the tree from the DB
colStatus = collectData(currentRequest)
if (autoMounted and db_lib.queueDone(daq_utils.beamline)):
unmountSample()
def collectData(currentRequest):
global data_directory_name, currentIspybDCID, fastDPNodeCount, fastDPNodeCounter
if (daq_utils.beamline == "fmx"):
if (getPvDesc("detCoverRBV") == 0):
logger.info("opening det cover")
setPvDesc("detCoverOpen", 1)
logMe = 1
reqObj = currentRequest["request_obj"]
data_directory_name = str(reqObj["directory"])
exposure_period = reqObj["exposure_time"]
wavelength = reqObj["wavelength"]
resolution = reqObj["resolution"]
slit_height = reqObj["slit_height"]
slit_width = reqObj["slit_width"]
attenuation = reqObj["attenuation"]
img_width = reqObj["img_width"]
file_prefix = str(reqObj["file_prefix"])
logger.info(reqObj["protocol"])
prot = str(reqObj["protocol"])
sweep_start = reqObj["sweep_start"]
sweep_end = reqObj["sweep_end"]
range_degrees = abs(sweep_end - sweep_start)
sweep_start = reqObj["sweep_start"] % 360.0
file_number_start = reqObj["file_number_start"]
basePath = reqObj["basePath"]
visitName = daq_utils.getVisitName()
jpegDirectory = visitName + "/jpegs/" + data_directory_name[
data_directory_name.find(visitName) +
len(visitName):len(data_directory_name)]
colDist = reqObj["detDist"]
status = 1
if not (os.path.isdir(data_directory_name)):
logger.debug(f'creating {data_directory_name}')
comm_s = "mkdir -p " + data_directory_name
os.system(comm_s)
comm_s = "chmod 777 " + data_directory_name
os.system(comm_s)
comm_s = "mkdir -p " + jpegDirectory
os.system(comm_s)
comm_s = "chmod 777 " + jpegDirectory
os.system(comm_s)
logger.debug(
'starting initial motions - transmission and detector distance')
daq_macros.setTrans(attenuation)
if prot not in ["rasterScreen", "eScan"]:
beamline_lib.mvaDescriptor("detectorDist", colDist)
logger.debug(
'transmission and detector distance (if not fluorescence-related) done'
)
# now that the detector is in the correct position, get the beam center
currentRequest['request_obj']['xbeam'] = getPvDesc('beamCenterX')
currentRequest['request_obj']['ybeam'] = getPvDesc('beamCenterY')
db_lib.updateRequest(currentRequest)
if (prot == "raster"):
logger.info('entering raster')
status = daq_macros.snakeRaster(currentRequest["uid"])
logger.info('exiting raster')
elif (prot == "stepRaster"):
status = daq_macros.snakeStepRaster(currentRequest["uid"])
elif (prot == "specRaster"):
status = daq_macros.snakeStepRasterSpec(currentRequest["uid"])
elif (prot == "vector" or prot == "stepVector"):
imagesAttempted = collect_detector_seq_hw(sweep_start, range_degrees,
img_width, exposure_period,
file_prefix,
data_directory_name,
file_number_start,
currentRequest)
elif (prot == "multiCol"):
daq_macros.snakeRaster(currentRequest["uid"])
elif (prot == "rasterScreen"):
daq_macros.rasterScreen(currentRequest)
elif (prot == "multiColQ"):
daq_macros.multiCol(currentRequest)
elif (prot == "eScan"):
daq_macros.eScan(currentRequest)
else: #standard, screening, or edna - these may require autoalign, checking first
if (reqObj["pos_x"] != -999):
beamline_lib.mvaDescriptor("sampleX", reqObj["pos_x"])
beamline_lib.mvaDescriptor("sampleY", reqObj["pos_y"])
beamline_lib.mvaDescriptor("sampleZ", reqObj["pos_z"])
elif (reqObj["centeringOption"] == "Interactive"
): #robotic, pause and let user center
pause_data_collection()
check_pause()
else:
logger.info("autoRaster")
if not (daq_macros.autoRasterLoop(currentRequest)):
logger.info("could not center sample")
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
return 0
else:
if (reqObj["centeringOption"] == "AutoLoop"):
reqObj[
"sweep_start"] = beamline_lib.motorPosFromDescriptor(
"omega") #%360.0?
sweep_start = reqObj["sweep_start"]
if (reqObj["centeringOption"] == "AutoRaster"):
reqObj[
"sweep_start"] = beamline_lib.motorPosFromDescriptor(
"omega") - 90.0 #%360.0?
sweep_start = reqObj["sweep_start"]
daq_macros.setTrans(attenuation)
if (reqObj["protocol"] == "screen"):
screenImages = 2
screenRange = 90
range_degrees = img_width
for i in range(0, screenImages):
sweep_start = reqObj["sweep_start"] + (i * screenRange)
sweep_end = sweep_start + screenRange
file_prefix = str(reqObj["file_prefix"] + "_" +
str(i * screenRange))
data_directory_name = str(reqObj["directory"]) # for now
file_number_start = reqObj["file_number_start"]
beamline_lib.mvaDescriptor("omega", sweep_start)
if (i == 0):
imagesAttempted = collect_detector_seq_hw(
sweep_start,
range_degrees,
img_width,
exposure_period,
file_prefix,
data_directory_name,
file_number_start,
currentRequest,
changeState=False)
else:
imagesAttempted = collect_detector_seq_hw(
sweep_start, range_degrees, img_width, exposure_period,
file_prefix, data_directory_name, file_number_start,
currentRequest)
seqNum = int(detector_get_seqnum())
node = getBlConfig("spotNode1")
comm_s = f'ssh -q {node} \"{os.environ["MXPROCESSINGSCRIPTSDIR"]}eiger2cbf.sh {currentRequest["uid"]} 1 1 sweep_start {seqNum}\"'
logger.info(comm_s)
os.system(comm_s)
elif (reqObj["protocol"] == "characterize"
or reqObj["protocol"] == "ednaCol"):
characterizationParams = reqObj["characterizationParams"]
index_success = daq_macros.dna_execute_collection3(
0.0, img_width, 2, exposure_period, data_directory_name + "/",
file_prefix, 1, -89.0, 1, currentRequest)
if (index_success):
resultsList = db_lib.getResultsforRequest(
currentRequest["uid"]
) # because for testing I keep running the same request. Probably not in usual use.
results = None
for i in range(0, len(resultsList)):
if (resultsList[i]['result_type'] ==
'characterizationStrategy'):
results = resultsList[i]
break
if (results != None):
strategyResults = results["result_obj"]["strategy"]
stratStart = strategyResults["start"]
stratEnd = strategyResults["end"]
stratWidth = strategyResults["width"]
stratExptime = strategyResults["exptime"]
stratTrans = strategyResults["transmission"]
stratDetDist = strategyResults["detDist"]
sampleID = currentRequest["sample"]
tempnewStratRequest = daq_utils.createDefaultRequest(
sampleID)
newReqObj = tempnewStratRequest["request_obj"]
newReqObj["sweep_start"] = stratStart
newReqObj["sweep_end"] = stratEnd
newReqObj["img_width"] = stratWidth
newReqObj["exposure_time"] = stratExptime
newReqObj["attenuation"] = stratTrans
newReqObj["detDist"] = stratDetDist
newReqObj["directory"] = data_directory_name
newReqObj["pos_x"] = beamline_lib.motorPosFromDescriptor(
"sampleX")
newReqObj["pos_y"] = beamline_lib.motorPosFromDescriptor(
"sampleY")
newReqObj["pos_z"] = beamline_lib.motorPosFromDescriptor(
"sampleZ")
newReqObj[
"fastDP"] = True # this is where you might want a "new from old" request to carry over stuff like this.
newReqObj["fastEP"] = reqObj["fastEP"]
newReqObj["dimple"] = reqObj["dimple"]
newReqObj["xia2"] = reqObj["xia2"]
runNum = db_lib.incrementSampleRequestCount(sampleID)
newReqObj["runNum"] = runNum
newStratRequest = db_lib.addRequesttoSample(
sampleID,
newReqObj["protocol"],
daq_utils.owner,
newReqObj,
priority=0,
proposalID=daq_utils.getProposalID())
if (reqObj["protocol"] == "ednaCol"):
logger.info("new strat req = ")
logger.info(newStratRequest)
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
collectData(db_lib.getRequestByID(newStratRequest))
return 1
else: #standard
logger.info("moving omega to start " + str(time.time()))
beamline_lib.mvaDescriptor("omega", sweep_start)
imagesAttempted = collect_detector_seq_hw(
sweep_start, range_degrees, img_width, exposure_period,
file_prefix, data_directory_name, file_number_start,
currentRequest)
try:
if (logMe) and prot == 'raster':
logMxRequestParams(currentRequest, wait=False)
elif (logMe):
logMxRequestParams(currentRequest)
except TypeError:
logger.error("caught type error in logging")
except IndexError:
logger.error("caught index error in logging")
except KeyError as e:
logger.error('caught key error in logging: %s' % e)
# collection finished, start processing
if reqObj["protocol"] in ("standard", "vector", "raster"):
send_kafka_message(topic=f'{daq_utils.beamline}.lsdc.documents',
event='stop',
uuid=currentRequest['uid'],
protocol=reqObj["protocol"])
if (prot == "vector" or prot == "standard" or prot == "stepVector"):
seqNum = int(detector_get_seqnum())
comm_s = os.environ[
"LSDCHOME"] + "/runSpotFinder4syncW.py " + data_directory_name + " " + file_prefix + " " + str(
currentRequest["uid"]) + " " + str(seqNum) + " " + str(
currentIspybDCID) + "&"
logger.info(comm_s)
os.system(comm_s)
if img_width > 0: #no dataset processing in stills mode
if (reqObj["fastDP"]):
if (reqObj["fastEP"]):
fastEPFlag = 1
else:
fastEPFlag = 0
if (reqObj["dimple"]):
dimpleFlag = 1
else:
dimpleFlag = 0
nodeName = "fastDPNode" + str(
(fastDPNodeCounter % fastDPNodeCount) + 1)
fastDPNodeCounter += 1
node = getBlConfig(nodeName)
dimpleNode = getBlConfig("dimpleNode")
if (daq_utils.detector_id == "EIGER-16"):
seqNum = int(detector_get_seqnum())
comm_s = os.environ[
"LSDCHOME"] + "/runFastDPH5.py " + data_directory_name + " " + str(
seqNum) + " " + str(
currentRequest["uid"]
) + " " + str(fastEPFlag) + " " + node + " " + str(
dimpleFlag) + " " + dimpleNode + " " + str(
currentIspybDCID) + "&"
else:
comm_s = os.environ[
"LSDCHOME"] + "/runFastDP.py " + data_directory_name + " " + file_prefix + " " + str(
file_number_start) + " " + str(
int(round(range_degrees / img_width))
) + " " + str(currentRequest["uid"]) + " " + str(
fastEPFlag) + " " + node + " " + str(
dimpleFlag) + " " + dimpleNode + "&"
logger.info(f'Running fastdp command: {comm_s}')
visitName = daq_utils.getVisitName()
if (
not os.path.exists(visitName + "/fast_dp_dir")
) or subprocess.run(
['pgrep', '-f', 'loop-fdp-dple-populate'],
stdout=subprocess.PIPE
).returncode == 1: # for pgrep, return of 1 means string not found
os.system("killall -KILL loop-fdp-dple-populate.sh")
logger.info('starting fast dp result gathering script')
os.system("cd " + visitName +
";${LSDCHOME}/bin/loop-fdp-dple-populate.sh&")
os.system(comm_s)
if (reqObj["xia2"]):
comm_s = f"ssh -q xf17id2-srv1 \"{os.environ['MXPROCESSINGSCRIPTSDIR']}xia2.sh {currentRequest['uid']} \"&"
os.system(comm_s)
logger.info('processing should be triggered')
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
logger.info('after refresh GUI tree')
return status
def collectData(currentRequest):
global data_directory_name
logMxRequestParams(currentRequest)
reqObj = currentRequest["request_obj"]
data_directory_name = str(reqObj["directory"])
if not (os.path.isdir(data_directory_name)):
comm_s = "mkdir -p " + data_directory_name
os.system(comm_s)
print reqObj["protocol"]
prot = str(reqObj["protocol"])
if (prot == "raster"):
daq_macros.snakeRaster(currentRequest["request_id"])
# return
elif (prot == "vector"):
daq_macros.vectorScan(currentRequest)
# return
else: #standard, screening, or edna - these may require autoalign, checking first
if (reqObj["pos_x"] != 0):
beamline_lib.mva("X",reqObj["pos_x"])
beamline_lib.mva("Y",reqObj["pos_y"])
beamline_lib.mva("Z",reqObj["pos_z"])
else:
print "autoRaster"
daq_macros.autoRasterLoop(currentRequest["sample_id"])
exposure_period = reqObj["exposure_time"]
wavelength = reqObj["wavelength"]
resolution = reqObj["resolution"]
slit_height = reqObj["slit_height"]
slit_width = reqObj["slit_width"]
attenuation = reqObj["attenuation"]
img_width = reqObj["img_width"]
file_prefix = str(reqObj["file_prefix"])
if (reqObj["protocol"] == "screen"):
screenImages = 2
screenRange = 90
range_degrees = img_width
for i in range (0,screenImages):
sweep_start = reqObj["sweep_start"]+(i*screenRange)
sweep_end = reqObj["sweep_end"]+(i*screenRange)
file_prefix = str(reqObj["file_prefix"]+"_"+str(i*screenRange))
data_directory_name = str(reqObj["directory"]) # for now
file_number_start = reqObj["file_number_start"]
beamline_lib.mva("Omega",sweep_start)
imagesAttempted = collect_detector_seq(range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start)
elif (reqObj["protocol"] == "characterize"):
characterizationParams = reqObj["characterizationParams"]
index_success = daq_macros.dna_execute_collection3(0.0,img_width,2,exposure_period,data_directory_name+"/",file_prefix,1,-89.0,1,currentRequest)
if (index_success):
resultsList = db_lib.getResultsforRequest(currentRequest["request_id"]) # because for testing I keep running the same request. Probably not in usual use.
results = resultsList[len(resultsList)-1]
strategyResults = results["result_obj"]["strategy"]
stratStart = strategyResults["start"]
stratEnd = strategyResults["end"]
stratWidth = strategyResults["width"]
stratExptime = strategyResults["exptime"]
stratDetDist = strategyResults["detDist"]
sampleID = currentRequest["sample_id"]
tempnewStratRequest = daq_utils.createDefaultRequest(sampleID)
newReqObj = tempnewStratRequest["request_obj"]
newReqObj["sweep_start"] = stratStart
newReqObj["sweep_end"] = stratEnd
newReqObj["img_width"] = stratWidth
newReqObj["exposure_time"] = stratExptime
newReqObj["detDist"] = stratDetDist
newReqObj["directory"] = data_directory_name
runNum = db_lib.incrementSampleRequestCount(sampleID)
reqObj["runNum"] = runNum
newStratRequest = db_lib.addRequesttoSample(sampleID,newReqObj["protocol"],newReqObj,priority=0)
else: #standard
sweep_start = reqObj["sweep_start"]
sweep_end = reqObj["sweep_end"]
file_prefix = str(reqObj["file_prefix"])
file_number_start = reqObj["file_number_start"]
range_degrees = abs(sweep_end-sweep_start)
beamline_lib.mva("Omega",sweep_start)
imagesAttempted = collect_detector_seq(range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start)
if (reqObj["fastDP"]):
if (reqObj["fastEP"]):
fastEPFlag = 1
else:
fastEPFlag = 0
comm_s = os.environ["CBHOME"] + "/runFastDP.py " + data_directory_name + " " + file_prefix + " " + str(file_number_start) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["request_id"]) + " " + str(fastEPFlag) + "&"
print comm_s
os.system(comm_s)
if (reqObj["xia2"]):
comm_s = os.environ["CBHOME"] + "/runXia2.py " + data_directory_name + " " + file_prefix + " " + str(file_number_start) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["request_id"]) + "&"
os.system(comm_s)
db_lib.updatePriority(currentRequest["request_id"],-1)
refreshGuiTree()
def collectData(currentRequest):
global data_directory_name, currentIspybDCID, fastDPNodeCount, fastDPNodeCounter
if (daq_utils.beamline == "fmx"):
if (getPvDesc("detCoverRBV") == 0):
logger.info("opening det cover")
setPvDesc("detCoverOpen", 1)
logMe = 1
reqObj = currentRequest["request_obj"]
data_directory_name = str(reqObj["directory"])
exposure_period = reqObj["exposure_time"]
wavelength = reqObj["wavelength"]
resolution = reqObj["resolution"]
slit_height = reqObj["slit_height"]
slit_width = reqObj["slit_width"]
attenuation = reqObj["attenuation"]
img_width = reqObj["img_width"]
file_prefix = str(reqObj["file_prefix"])
logger.info(reqObj["protocol"])
prot = str(reqObj["protocol"])
sweep_start = reqObj["sweep_start"]
sweep_end = reqObj["sweep_end"]
range_degrees = abs(sweep_end - sweep_start)
sweep_start = reqObj["sweep_start"] % 360.0
file_number_start = reqObj["file_number_start"]
basePath = reqObj["basePath"]
visitName = daq_utils.getVisitName()
jpegDirectory = visitName + "/jpegs/" + data_directory_name[
data_directory_name.find(visitName) +
len(visitName):len(data_directory_name)]
colDist = reqObj["detDist"]
status = 1
if not (os.path.isdir(data_directory_name)):
comm_s = "mkdir -p " + data_directory_name
os.system(comm_s)
comm_s = "chmod 777 " + data_directory_name
os.system(comm_s)
comm_s = "mkdir -p " + jpegDirectory
os.system(comm_s)
comm_s = "chmod 777 " + jpegDirectory
os.system(comm_s)
daq_macros.setTrans(attenuation)
beamline_lib.mvaDescriptor("detectorDist", colDist)
# now that the detector is in the correct position, get the beam center
currentRequest['request_obj']['xbeam'] = getPvDesc('beamCenterX')
currentRequest['request_obj']['ybeam'] = getPvDesc('beamCenterY')
db_lib.updateRequest(currentRequest)
if (prot == "raster"):
logger.info('entering raster')
status = daq_macros.snakeRaster(currentRequest["uid"])
logger.info('exiting raster')
elif (prot == "stepRaster"):
status = daq_macros.snakeStepRaster(currentRequest["uid"])
elif (prot == "specRaster"):
status = daq_macros.snakeStepRasterSpec(currentRequest["uid"])
elif (prot == "vector" or prot == "stepVector"):
imagesAttempted = collect_detector_seq_hw(sweep_start, range_degrees,
img_width, exposure_period,
file_prefix,
data_directory_name,
file_number_start,
currentRequest)
elif (prot == "multiCol"):
daq_macros.snakeRaster(currentRequest["uid"])
elif (prot == "rasterScreen"):
daq_macros.rasterScreen(currentRequest)
elif (prot == "multiColQ"):
daq_macros.multiCol(currentRequest)
elif (prot == "eScan"):
daq_macros.eScan(currentRequest)
else: #standard, screening, or edna - these may require autoalign, checking first
if (reqObj["pos_x"] != -999):
beamline_lib.mvaDescriptor("sampleX", reqObj["pos_x"])
beamline_lib.mvaDescriptor("sampleY", reqObj["pos_y"])
beamline_lib.mvaDescriptor("sampleZ", reqObj["pos_z"])
elif (reqObj["centeringOption"] == "Interactive"
): #robotic, pause and let user center
pause_data_collection()
check_pause()
else:
logger.info("autoRaster")
if not (daq_macros.autoRasterLoop(currentRequest)):
logger.info("could not center sample")
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
return 0
else:
if (reqObj["centeringOption"] == "AutoLoop"):
reqObj[
"sweep_start"] = beamline_lib.motorPosFromDescriptor(
"omega") #%360.0?
sweep_start = reqObj["sweep_start"]
if (reqObj["centeringOption"] == "AutoRaster"):
reqObj[
"sweep_start"] = beamline_lib.motorPosFromDescriptor(
"omega") - 90.0 #%360.0?
sweep_start = reqObj["sweep_start"]
daq_macros.setTrans(attenuation)
if (reqObj["protocol"] == "screen"):
screenImages = 2
screenRange = 90
range_degrees = img_width
for i in range(0, screenImages):
sweep_start = reqObj["sweep_start"] + (i * screenRange)
sweep_end = sweep_start + screenRange
file_prefix = str(reqObj["file_prefix"] + "_" +
str(i * screenRange))
data_directory_name = str(reqObj["directory"]) # for now
file_number_start = reqObj["file_number_start"]
beamline_lib.mvaDescriptor("omega", sweep_start)
if (i == 0):
imagesAttempted = collect_detector_seq_hw(
sweep_start,
range_degrees,
img_width,
exposure_period,
file_prefix,
data_directory_name,
file_number_start,
currentRequest,
changeState=False)
else:
imagesAttempted = collect_detector_seq_hw(
sweep_start, range_degrees, img_width, exposure_period,
file_prefix, data_directory_name, file_number_start,
currentRequest)
seqNum = int(detector_get_seqnum())
cbfComm = getBlConfig("cbfComm")
cbfDir = data_directory_name + "/cbf"
comm_s = "mkdir -p " + cbfDir
os.system(comm_s)
hdfSampleDataPattern = data_directory_name + "/" + file_prefix + "_"
hdfRowFilepattern = hdfSampleDataPattern + str(
int(float(seqNum))) + "_master.h5"
CBF_conversion_pattern = cbfDir + "/" + file_prefix + "_" + str(
int(sweep_start)) + ".cbf"
comm_s = "eiger2cbf-linux " + hdfRowFilepattern
startIndex = 1
endIndex = 1
node = getBlConfig("spotNode1")
comm_s = "ssh -q " + node + " \"sleep 6;" + cbfComm + " " + hdfRowFilepattern + " " + str(
startIndex) + ":" + str(
endIndex) + " " + CBF_conversion_pattern + "\"&"
logger.info(comm_s)
os.system(comm_s)
elif (reqObj["protocol"] == "characterize"
or reqObj["protocol"] == "ednaCol"):
characterizationParams = reqObj["characterizationParams"]
index_success = daq_macros.dna_execute_collection3(
0.0, img_width, 2, exposure_period, data_directory_name + "/",
file_prefix, 1, -89.0, 1, currentRequest)
if (index_success):
resultsList = db_lib.getResultsforRequest(
currentRequest["uid"]
) # because for testing I keep running the same request. Probably not in usual use.
results = None
for i in range(0, len(resultsList)):
if (resultsList[i]['result_type'] ==
'characterizationStrategy'):
results = resultsList[i]
break
if (results != None):
strategyResults = results["result_obj"]["strategy"]
stratStart = strategyResults["start"]
stratEnd = strategyResults["end"]
stratWidth = strategyResults["width"]
stratExptime = strategyResults["exptime"]
stratTrans = strategyResults["transmission"]
stratDetDist = strategyResults["detDist"]
sampleID = currentRequest["sample"]
tempnewStratRequest = daq_utils.createDefaultRequest(
sampleID)
newReqObj = tempnewStratRequest["request_obj"]
newReqObj["sweep_start"] = stratStart
newReqObj["sweep_end"] = stratEnd
newReqObj["img_width"] = stratWidth
newReqObj["exposure_time"] = stratExptime
newReqObj["attenuation"] = stratTrans
newReqObj["detDist"] = stratDetDist
newReqObj["directory"] = data_directory_name
newReqObj["pos_x"] = beamline_lib.motorPosFromDescriptor(
"sampleX")
newReqObj["pos_y"] = beamline_lib.motorPosFromDescriptor(
"sampleY")
newReqObj["pos_z"] = beamline_lib.motorPosFromDescriptor(
"sampleZ")
newReqObj[
"fastDP"] = True # this is where you might want a "new from old" request to carry over stuff like this.
newReqObj["fastEP"] = reqObj["fastEP"]
newReqObj["dimple"] = reqObj["dimple"]
newReqObj["xia2"] = reqObj["xia2"]
runNum = db_lib.incrementSampleRequestCount(sampleID)
newReqObj["runNum"] = runNum
newStratRequest = db_lib.addRequesttoSample(
sampleID,
newReqObj["protocol"],
daq_utils.owner,
newReqObj,
priority=0,
proposalID=daq_utils.getProposalID())
if (reqObj["protocol"] == "ednaCol"):
logger.info("new strat req = ")
logger.info(newStratRequest)
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
collectData(db_lib.getRequestByID(newStratRequest))
return 1
else: #standard
logger.info("moving omega to start " + str(time.time()))
beamline_lib.mvaDescriptor("omega", sweep_start)
imagesAttempted = collect_detector_seq_hw(
sweep_start, range_degrees, img_width, exposure_period,
file_prefix, data_directory_name, file_number_start,
currentRequest)
try:
if (logMe):
logMxRequestParams(currentRequest)
except TypeError:
logger.error("caught type error in logging")
except IndexError:
logger.error("caught index error in logging")
except KeyError as e:
logger.error('caught key error in logging: %s' % e)
if (prot == "vector" or prot == "standard" or prot == "stepVector"):
seqNum = int(detector_get_seqnum())
comm_s = os.environ[
"LSDCHOME"] + "/runSpotFinder4syncW.py " + data_directory_name + " " + file_prefix + " " + str(
currentRequest["uid"]) + " " + str(seqNum) + " " + str(
currentIspybDCID) + "&"
logger.info(comm_s)
os.system(comm_s)
if img_width > 0: #no dataset processing in stills mode
if (reqObj["fastDP"]):
if (reqObj["fastEP"]):
fastEPFlag = 1
else:
fastEPFlag = 0
if (reqObj["dimple"]):
dimpleFlag = 1
else:
dimpleFlag = 0
nodeName = "fastDPNode" + str(
(fastDPNodeCounter % fastDPNodeCount) + 1)
fastDPNodeCounter += 1
node = getBlConfig(nodeName)
dimpleNode = getBlConfig("dimpleNode")
if (daq_utils.detector_id == "EIGER-16"):
seqNum = int(detector_get_seqnum())
comm_s = os.environ[
"LSDCHOME"] + "/runFastDPH5.py " + data_directory_name + " " + file_prefix + " " + str(
seqNum) + " " + str(
int(round(range_degrees / img_width))
) + " " + str(currentRequest["uid"]) + " " + str(
fastEPFlag) + " " + node + " " + str(
dimpleFlag) + " " + dimpleNode + " " + str(
currentIspybDCID) + "&"
else:
comm_s = os.environ[
"LSDCHOME"] + "/runFastDP.py " + data_directory_name + " " + file_prefix + " " + str(
file_number_start) + " " + str(
int(round(range_degrees / img_width))
) + " " + str(currentRequest["uid"]) + " " + str(
fastEPFlag) + " " + node + " " + str(
dimpleFlag) + " " + dimpleNode + "&"
logger.info(comm_s)
if (daq_utils.beamline == "amx"):
visitName = daq_utils.getVisitName()
if (not os.path.exists(visitName + "/fast_dp_dir")):
os.system("killall -KILL loop-fdp-dple-populate")
os.system(
"cd " + visitName +
";/GPFS/CENTRAL/xf17id2/jjakoncic/Scripts/loop-fdp-dple-populate.sh&"
)
os.system(comm_s)
if (reqObj["xia2"]):
comm_s = "ssh -q xf17id1-srv1 \"" + os.environ[
"LSDCHOME"] + "/runXia2.py " + data_directory_name + " " + file_prefix + " " + str(
file_number_start) + " " + str(
int(round(range_degrees / img_width))) + " " + str(
currentRequest["uid"]) + "\"&"
os.system(comm_s)
logger.info('processing should be triggered')
db_lib.updatePriority(currentRequest["uid"], -1)
refreshGuiTree()
logger.info('after refresh GUI tree')
return status
def collectData(currentRequest):
global data_directory_name,currentIspybDCID,fastDPNodeCount,fastDPNodeCounter
# print(currentRequest)
# print("pretending to collect")
# time.sleep(5)
# db_lib.updatePriority(currentRequest["uid"],-1)
# refreshGuiTree()
# return 1 #SHORT CIRCUIT
logMe = 1
reqObj = currentRequest["request_obj"]
data_directory_name = str(reqObj["directory"])
exposure_period = reqObj["exposure_time"]
wavelength = reqObj["wavelength"]
resolution = reqObj["resolution"]
slit_height = reqObj["slit_height"]
slit_width = reqObj["slit_width"]
attenuation = reqObj["attenuation"]
img_width = reqObj["img_width"]
file_prefix = str(reqObj["file_prefix"])
print(reqObj["protocol"])
prot = str(reqObj["protocol"])
sweep_start = reqObj["sweep_start"]
sweep_end = reqObj["sweep_end"]
range_degrees = abs(sweep_end-sweep_start)
sweep_start = reqObj["sweep_start"]%360.0
file_number_start = reqObj["file_number_start"]
basePath = reqObj["basePath"]
# jpegDirectory = "jpegs" + data_directory_name[data_directory_name.find(basePath)+len(basePath):len(data_directory_name)]
visitName = daq_utils.getVisitName()
jpegDirectory = visitName + "/jpegs/" + data_directory_name[data_directory_name.find(visitName)+len(visitName):len(data_directory_name)]
status = 1
if not (os.path.isdir(data_directory_name)):
comm_s = "mkdir -p " + data_directory_name
os.system(comm_s)
comm_s = "chmod 777 " + data_directory_name
os.system(comm_s)
comm_s = "mkdir -p " + jpegDirectory
os.system(comm_s)
comm_s = "chmod 777 " + jpegDirectory
os.system(comm_s)
if (prot == "raster"):
status = daq_macros.snakeRaster(currentRequest["uid"])
elif (prot == "stepRaster"):
status = daq_macros.snakeStepRaster(currentRequest["uid"])
elif (prot == "vector" or prot == "stepVector"):
if (reqObj["centeringOption"] != "Interactive"):
logMe = 0
daq_macros.autoVector(currentRequest)
else:
imagesAttempted = collect_detector_seq_hw(sweep_start,range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start,currentRequest)
elif (prot == "multiCol"):
# daq_macros.multiCol(currentRequest)
daq_macros.snakeRaster(currentRequest["uid"])
elif (prot == "multiColQ"):
daq_macros.multiCol(currentRequest)
# daq_macros.snakeRaster(currentRequest["uid"])
elif (prot == "eScan"):
daq_macros.eScan(currentRequest)
else: #standard, screening, or edna - these may require autoalign, checking first
if (reqObj["pos_x"] != -999):
beamline_lib.mvaDescriptor("sampleX",reqObj["pos_x"])
beamline_lib.mvaDescriptor("sampleY",reqObj["pos_y"])
beamline_lib.mvaDescriptor("sampleZ",reqObj["pos_z"])
elif (reqObj["centeringOption"] == "Interactive"): #robotic, pause and let user center
pause_data_collection()
check_pause()
else:
print("autoRaster")
if not (daq_macros.autoRasterLoop(currentRequest)):
print("could not center sample")
db_lib.updatePriority(currentRequest["uid"],-1)
refreshGuiTree()
return 0
# if (not stateModule.gotoState("DataCollection")):
# print("State violation")
# db_lib.updatePriority(currentRequest["uid"],-1)
# refreshGuiTree()
# return 0
if (reqObj["protocol"] == "screen"):
screenImages = 2
screenRange = 90
range_degrees = img_width
for i in range (0,screenImages):
sweep_start = reqObj["sweep_start"]+(i*screenRange)
sweep_end = sweep_start+screenRange
# sweep_end = reqObj["sweep_end"]+(i*screenRange)
file_prefix = str(reqObj["file_prefix"]+"_"+str(i*screenRange))
data_directory_name = str(reqObj["directory"]) # for now
file_number_start = reqObj["file_number_start"]
beamline_lib.mvaDescriptor("omega",sweep_start)
if (1):
# if (beamline_support.getPvValFromDescriptor("gonDaqHwTrig")):
imagesAttempted = collect_detector_seq_hw(sweep_start,range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start,currentRequest)
else:
imagesAttempted = collect_detector_seq(sweep_start,range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start,currentRequest)
seqNum = int(detector_get_seqnum())
cbfComm = db_lib.getBeamlineConfigParam(daq_utils.beamline,"cbfComm")
cbfDir = data_directory_name+"/cbf"
comm_s = "mkdir -p " + cbfDir
os.system(comm_s)
hdfSampleDataPattern = data_directory_name+"/"+file_prefix+"_"
hdfRowFilepattern = hdfSampleDataPattern + str(int(float(seqNum))) + "_master.h5"
CBF_conversion_pattern = cbfDir + "/" + file_prefix+"_" + str(int(sweep_start))+".cbf"
comm_s = "eiger2cbf-linux " + hdfRowFilepattern
startIndex=1
endIndex = 1
node = db_lib.getBeamlineConfigParam(daq_utils.beamline,"spotNode1")
comm_s = "ssh -q " + node + " \"sleep 6;" + cbfComm + " " + hdfRowFilepattern + " " + str(startIndex) + ":" + str(endIndex) + " " + CBF_conversion_pattern + "\"&"
print(comm_s)
os.system(comm_s)
elif (reqObj["protocol"] == "characterize" or reqObj["protocol"] == "ednaCol"):
characterizationParams = reqObj["characterizationParams"]
index_success = daq_macros.dna_execute_collection3(0.0,img_width,2,exposure_period,data_directory_name+"/",file_prefix,1,-89.0,1,currentRequest)
# if (0):
if (index_success):
resultsList = db_lib.getResultsforRequest(currentRequest["uid"]) # because for testing I keep running the same request. Probably not in usual use.
results = resultsList[-2]
strategyResults = results["result_obj"]["strategy"]
stratStart = strategyResults["start"]
stratEnd = strategyResults["end"]
stratWidth = strategyResults["width"]
stratExptime = strategyResults["exptime"]
stratDetDist = strategyResults["detDist"]
sampleID = currentRequest["sample"]
tempnewStratRequest = daq_utils.createDefaultRequest(sampleID)
newReqObj = tempnewStratRequest["request_obj"]
newReqObj["sweep_start"] = stratStart
newReqObj["sweep_end"] = stratEnd
newReqObj["img_width"] = stratWidth
newReqObj["exposure_time"] = stratExptime
newReqObj["detDist"] = stratDetDist
newReqObj["directory"] = data_directory_name
newReqObj["pos_x"] = beamline_lib.motorPosFromDescriptor("sampleX")
newReqObj["pos_y"] = beamline_lib.motorPosFromDescriptor("sampleY")
newReqObj["pos_z"] = beamline_lib.motorPosFromDescriptor("sampleZ")
newReqObj["fastDP"] = reqObj["fastDP"] # this is where you might want a "new from old" request to carry over stuff like this.
newReqObj["fastEP"] = reqObj["fastEP"]
newReqObj["dimple"] = reqObj["dimple"]
newReqObj["xia2"] = reqObj["xia2"]
runNum = db_lib.incrementSampleRequestCount(sampleID)
reqObj["runNum"] = runNum
newStratRequest = db_lib.addRequesttoSample(sampleID,newReqObj["protocol"],daq_utils.owner,newReqObj,priority=0,proposalID=daq_utils.getProposalID())
if (reqObj["protocol"] == "ednaCol"):
db_lib.updatePriority(currentRequest["uid"],-1)
refreshGuiTree()
collectData(newStratRequest)
return 1
else: #standard
beamline_lib.mvaDescriptor("omega",sweep_start)
if (1):
# if (beamline_support.getPvValFromDescriptor("gonDaqHwTrig")):
imagesAttempted = collect_detector_seq_hw(sweep_start,range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start,currentRequest)
else:
imagesAttempted = collect_detector_seq(sweep_start,range_degrees,img_width,exposure_period,file_prefix,data_directory_name,file_number_start,currentRequest)
try:
if (logMe):
logMxRequestParams(currentRequest)
except TypeError:
print("caught type error in logging")
if (prot == "vector" or prot == "standard"):
seqNum = int(detector_get_seqnum())
comm_s = os.environ["LSDCHOME"] + "/runSpotFinder4syncW.py " + data_directory_name + " " + file_prefix + " " + str(currentRequest["uid"]) + " " + str(seqNum) + " " + str(currentIspybDCID)+ "&"
print(comm_s)
os.system(comm_s)
if (reqObj["fastDP"]):
if (reqObj["fastEP"]):
fastEPFlag = 1
else:
fastEPFlag = 0
if (reqObj["dimple"]):
dimpleFlag = 1
else:
dimpleFlag = 0
# node = db_lib.getBeamlineConfigParam(daq_utils.beamline,"fastDPNode")
nodeName = "fastDPNode" + str((fastDPNodeCounter%fastDPNodeCount)+1)
fastDPNodeCounter+=1
node = db_lib.getBeamlineConfigParam(daq_utils.beamline,nodeName)
dimpleNode = db_lib.getBeamlineConfigParam(daq_utils.beamline,"dimpleNode")
if (daq_utils.detector_id == "EIGER-16"):
seqNum = int(detector_get_seqnum())
# seqNum = beamline_support.get_any_epics_pv("XF:17IDC-ES:FMX{Det:Eig16M}cam1:SequenceId","VAL")
comm_s = os.environ["LSDCHOME"] + "/runFastDPH5.py " + data_directory_name + " " + file_prefix + " " + str(seqNum) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["uid"]) + " " + str(fastEPFlag) + " " + node + " " + str(dimpleFlag) + " " + dimpleNode + " " + str(currentIspybDCID)+ "&"
else:
comm_s = os.environ["LSDCHOME"] + "/runFastDP.py " + data_directory_name + " " + file_prefix + " " + str(file_number_start) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["uid"]) + " " + str(fastEPFlag) + " " + node + " " + str(dimpleFlag) + " " + dimpleNode + "&"
print(comm_s)
os.system(comm_s)
if (reqObj["xia2"]):
comm_s = "ssh -q xf17id1-srv1 \"" + os.environ["LSDCHOME"] + "/runXia2.py " + data_directory_name + " " + file_prefix + " " + str(file_number_start) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["uid"]) + "\"&"
# comm_s = os.environ["CBHOME"] + "/runXia2.py " + data_directory_name + " " + file_prefix + " " + str(file_number_start) + " " + str(int(round(range_degrees/img_width))) + " " + str(currentRequest["request_id"]) + "&"
os.system(comm_s)
db_lib.updatePriority(currentRequest["uid"],-1)
refreshGuiTree()
return status
def snakeRaster(rasterReqID,grain=""):
global dialsResultDict,rasterRowResultsList,processedRasterRowCount
rasterRequest = db_lib.getRequest(rasterReqID)
reqObj = rasterRequest["request_obj"]
parentReqID = reqObj["parentReqID"]
parentReqProtocol = ""
detDist = 100 # for now, no motor yet
if (parentReqID != -1):
parentRequest = db_lib.getRequest(parentReqID)
parentReqObj = parentRequest["request_obj"]
parentReqProtocol = parentReqObj["protocol"]
detDist = parentReqObj["detDist"]
# 2/17/16 - a few things for integrating dials/spotfinding into this routine
# filePrefix = reqObj["directory"]+"/"+reqObj["file_prefix"]
data_directory_name = str(reqObj["directory"])
os.system("mkdir -p " + data_directory_name)
os.system("chmod -R 777 " + data_directory_name)
filePrefix = str(reqObj["file_prefix"])
dataFilePrefix = reqObj["directory"]+"/"+reqObj["file_prefix"]
exptimePerCell = reqObj["exposure_time"]
img_width_per_cell = reqObj["img_width"]
#really should read these two from hardware
wave = reqObj["wavelength"]
xbeam = daq_utils.xbeam
ybeam = daq_utils.ybeam
rasterDef = reqObj["rasterDef"]
stepsize = float(rasterDef["stepsize"])
omega = float(rasterDef["omega"])
rasterStartX = float(rasterDef["x"]) #these are real sample motor positions
rasterStartY = float(rasterDef["y"])
rasterStartZ = float(rasterDef["z"])
omegaRad = math.radians(omega)
# current_omega_mod = beamline_lib.get_epics_motor_pos(beamline_support.pvNameSuffix_from_descriptor("omega"))%360.0
# 2/17/16 - a few things for integrating dials/spotfinding into this routine, this is just to fake the data
testImgFileList = glob.glob("/GPFS/CENTRAL/XF17ID1/skinner/eiger16M/cbf/*.cbf")
testImgCount = 0
## for i in range(0,len(rasterDef["rowDefs"])):
## numsteps = int(rasterDef["rowDefs"][i]["numsteps"])
rowCount = len(rasterDef["rowDefs"])
rasterRowResultsList = [{} for i in range(0,rowCount)]
processedRasterRowCount = 0
for i in range(len(rasterDef["rowDefs"])):
numsteps = int(rasterDef["rowDefs"][i]["numsteps"])
#6/16 a few things for integrating dials/spotfinding into this routine, this is just to fake the data
## for j in range(0,numsteps):
## rasterFilePrefix = dataFilePrefix + "_Raster_"
##n dataFileName = daq_utils.create_filename(rasterFilePrefix+str(i),j+1)
## os.system("mkdir -p " + reqObj["directory"])
## comm_s = "ln -sf " + testImgFileList[testImgCount] + " " + dataFileName
## os.system(comm_s)
## testImgCount+=1
# startX = rasterDef["rowDefs"][i]["start"]["x"]+(stepsize/2.0)
# endX = rasterDef["rowDefs"][i]["end"]["x"]-(stepsize/2.0)
startX = rasterDef["rowDefs"][i]["start"]["x"]
endX = rasterDef["rowDefs"][i]["end"]["x"]
startY = rasterDef["rowDefs"][i]["start"]["y"]
endY = rasterDef["rowDefs"][i]["end"]["y"]
deltaX = abs(endX-startX)
deltaY = abs(endY-startY)
if (deltaX>deltaY): #horizontal raster
startX = startX + (stepsize/2.0)
endX = endX - (stepsize/2.0)
startY = startY + (stepsize/2.0)
endY = startY
else: #vertical raster
startY = startY + (stepsize/2.0)
endY = endY - (stepsize/2.0)
startX = startX + (stepsize/2.0)
endX = startX
xRelativeMove = startX
yzRelativeMove = startY*sin(omegaRad)
yyRelativeMove = startY*cos(omegaRad)
xMotAbsoluteMove = rasterStartX+xRelativeMove #note we convert relative to absolute moves, using the raster center that was saved in x,y,z
yMotAbsoluteMove = rasterStartY-yyRelativeMove
zMotAbsoluteMove = rasterStartZ-yzRelativeMove
## time.sleep(1)#cosmetic
# yRelativeMove = -((numsteps-1)*stepsize)
xRelativeMove = endX-startX
yRelativeMove = endY-startY
## yRelativeMove = -(endY-startY)
yyRelativeMove = yRelativeMove*cos(omegaRad)
yzRelativeMove = yRelativeMove*sin(omegaRad)
xEnd = xMotAbsoluteMove + xRelativeMove
yEnd = yMotAbsoluteMove - yyRelativeMove
zEnd = zMotAbsoluteMove - yzRelativeMove
if (i%2 != 0): #this is to scan opposite direction for snaking
xEndSave = xEnd
yEndSave = yEnd
zEndSave = zEnd
xEnd = xMotAbsoluteMove
yEnd = yMotAbsoluteMove
zEnd = zMotAbsoluteMove
xMotAbsoluteMove = xEndSave
yMotAbsoluteMove = yEndSave
zMotAbsoluteMove = zEndSave
beamline_support.setPvValFromDescriptor("vectorStartOmega",omega)
beamline_support.setPvValFromDescriptor("vectorStepOmega",img_width_per_cell)
beamline_support.setPvValFromDescriptor("vectorStartX",xMotAbsoluteMove)
beamline_support.setPvValFromDescriptor("vectorStartY",yMotAbsoluteMove)
beamline_support.setPvValFromDescriptor("vectorStartZ",zMotAbsoluteMove)
beamline_support.setPvValFromDescriptor("vectorEndX",xEnd)
beamline_support.setPvValFromDescriptor("vectorEndY",yEnd)
beamline_support.setPvValFromDescriptor("vectorEndZ",zEnd)
beamline_support.setPvValFromDescriptor("vectorframeExptime",exptimePerCell)
beamline_support.setPvValFromDescriptor("vectorNumFrames",numsteps-1)
rasterFilePrefix = dataFilePrefix + "_Raster_" + str(i)
if (daq_utils.detector_id == "EIGER-16" and 0):
detectorArmEiger(numsteps,exptimePerCell,rasterFilePrefix,data_directory_name,wave,xbeam,ybeam,detDist)
beamline_support.setPvValFromDescriptor("vectorGo",1)
vectorWait()
## detector_wait()
# add the threading dials stuff here, and the thread routine elsewhere.
_thread.start_new_thread(runDialsThread,(rasterFilePrefix,i,numsteps,))
while (1):
time.sleep(1)
print(processedRasterRowCount)
if (processedRasterRowCount == rowCount):
break
rasterResult = generateGridMap(rasterRequest) #I think rasterRequest is entire request, of raster type
rasterRequest["request_obj"]["rasterDef"]["status"] = 2
print("parent protocol = " + parentReqProtocol)
if (parentReqProtocol == "multiCol"):
multiColThreshold = parentReqObj["diffCutoff"]
gotoMaxRaster(rasterResult,multiColThreshold=multiColThreshold)
else:
if (deltaX>deltaY): #horizontal raster, dont bother vert for now, did not do pos calcs, wait for zebra
gotoMaxRaster(rasterResult)
db_lib.updateRequest(rasterRequest)
db_lib.updatePriority(rasterRequest["request_id"],-1)
set_field("xrecRasterFlag",rasterRequest["request_id"])
