From 56493f1cde54f4cdeb696d248b32ef25ecb5bb33 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Thu, 7 Mar 2019 15:02:48 +0100 Subject: [PATCH] Script execution --- script/device/Auto.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/script/device/Auto.py b/script/device/Auto.py index d86353c..2f21208 100644 --- a/script/device/Auto.py +++ b/script/device/Auto.py @@ -108,7 +108,7 @@ def auto_set_exposure(short_exp, long_exp): if (AUTO_EXP_LO >= AUTO_EXP_HI): AUTO_EXP_LO = 1 AUTO_EXP_HI = 10 - print ">> Invalid auto_set_exposure values - set to default values <<" + print "Invalid auto_set_exposure values - set to default values <<" auto_show_exposure() # set AUTO_TRESH2 1.5 times higher than ratio of counting times to avoid oscillations AUTO_THRESH2 = AUTO_THRESH1 * (AUTO_EXP_HI/AUTO_EXP_LO) * 1.5 @@ -121,26 +121,26 @@ def auto_show(): """ global AUTO_LEVEL if (AUTO_LEVEL == 0): - print("auto-level has been set to %d.\n" % AUTO_LEVEL) + print("Auto-level has been set to %d.\n" % AUTO_LEVEL) print("Automatic filter setting is OFF.\n") print("Automatic exposure setting is OFF.\n") elif (AUTO_LEVEL == 1): - print("auto-level has been set to %d.\n" % AUTO_LEVEL) + print("Auto-level has been set to %d.\n" % AUTO_LEVEL) print("Automatic filter setting is ON.\n") print("Automatic exposure setting is OFF.\n") elif (AUTO_LEVEL == 2): - print("auto-level has been set to %d.\n" % AUTO_LEVEL) + print("Auto-level has been set to %d.\n" % AUTO_LEVEL) print("Automatic filter setting is ON.\n") print("Automatic exposure setting is ON.\n") else: AUTO_LEVEL = 0 - print(">> Unknown auto-level - resetting to %d <<"% AUTO_LEVEL) + print("Unknown auto-level - resetting to %d <<"% AUTO_LEVEL) print("Automatic filter setting is OFF.\n") print("Automatic exposure setting is OFF.\n") if(AUTO_LEVEL>1): - print("detector exposure times: short = %d s, long = %d s\n" % (AUTO_EXP_LO,AUTO_EXP_HI)) + print("Detector exposure times: short = %d s, long = %d s\n" % (AUTO_EXP_LO,AUTO_EXP_HI)) #TODO: if Image being sampled, show it #if(((whatis("IMAGE_IS_ON") & 0x08000000) != 0) && (IMAGE_IS_ON == 1)){ @@ -151,7 +151,7 @@ def auto_show_exposure(): show the auto-level exposure settings. """ global AUTO_EXP_LO, AUTO_EXP_HI - print("detector exposure times: short = %d s, long = %d s\n" % (AUTO_EXP_LO,AUTO_EXP_HI)) + print("Detector exposure times: short = %d s, long = %d s\n" % (AUTO_EXP_LO,AUTO_EXP_HI)) @@ -302,7 +302,7 @@ def auto_adjust_redo(): if (retryCount < AUTO_RETRY_MAX): redo = 1 else: - print " >> Couldn\'t optimize filter and exposure settings. <<" + print " >>Couldn\'t optimize filter and exposure settings. <<" if (redo != 0): recount(COUNT_TIME) else: