diff --git a/daq_macros.py b/daq_macros.py index 7ca2ae35..9f2e3870 100644 --- a/daq_macros.py +++ b/daq_macros.py @@ -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""" @@ -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__) diff --git a/ispybLib.py b/ispybLib.py index fc93fcee..b6c35400 100644 --- a/ispybLib.py +++ b/ispybLib.py @@ -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