Skip to content

Commit

Permalink
remove newVisit() and references in log messages
Browse files Browse the repository at this point in the history
 * proposal and visit number will be determined external to
   LSDC, using NSLS2 API information
  • Loading branch information
JunAishima committed Dec 6, 2023
1 parent d8008eb commit b0ef8ee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 0 additions & 5 deletions daq_macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -3843,10 +3843,6 @@ def vertRasterOff():
"""vertRasterOff() : only raster vertically for single-column (line) rasters"""
setBlConfig("vertRasterOn",0)

def newVisit():
"""newVisit() : Trick LSDC into creating a new visit on the next request creation"""
setBlConfig("proposal",987654) #a kludge to cause the next collection to generate a new visit


def logMe():
"""logMe() : Edwin asked for this"""
Expand Down Expand Up @@ -3946,7 +3942,6 @@ def lsdcHelp():
print(enableMount.__doc__)
print(vertRasterOn.__doc__)
print(vertRasterOff.__doc__)
print(newVisit.__doc__)
print(emptyQueue.__doc__)
print(logMe.__doc__)
print(setAttenBCU.__doc__)
Expand Down
5 changes: 3 additions & 2 deletions ispybLib.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,9 @@ def insertRasterResult(request,visitName):
try:
sessionid = core.retrieve_visit_id(visitName)
except ISPyBNoResultException as e:
logger.error("insertRasterResult - caught ISPyBNoResultException: '%s'. make sure visit name is in the format mx999999-1234. NOT HAVING MX IN FRONT IS A SIGN OF PROBLEMS - try newVisit() in that case." % e)
return
message = f"insertRasterResult - caught ISPyBNoResultException: '{e}'."
logger.error(message)
raise e
request = db_lib.getRequestByID(request_id)
sample = request['sample'] # this needs to be created and linked to a DC group
#result_obj = result['result_obj'] this doesn't appear to be used -DK
Expand Down

0 comments on commit b0ef8ee

Please sign in to comment.