diff --git a/iexcode/instruments/shutters.py b/iexcode/instruments/shutters.py index ebeca3f54cc11355f8cdb4af343f71a985557946..6cffb7e0e9d1de95f2fd43d712a93fddb38de6b1 100644 --- a/iexcode/instruments/shutters.py +++ b/iexcode/instruments/shutters.py @@ -70,11 +70,13 @@ def main_shutter_check_open(): ################################ branch shutters ############################## ############################################################################################################## -def branch_shutter_status(branch=iex.BL.branch,verbose=False): +def branch_shutter_status(branch=None,verbose=False): """ checks on the status of the main shutter and returns shutter_open = True / False """ + if branch == None: + branch = iex.BL.branch pvA="PA:29ID:S"+branch+"S_BLOCKING_BEAM.VAL" pvB="PB:29ID:S"+branch+"S_BLOCKING_BEAM.VAL" #"ON" = 1 => shutter open @@ -89,27 +91,31 @@ def branch_shutter_status(branch=iex.BL.branch,verbose=False): print(branch+"-shutter is "+status) return shutter_open -def branch_shutter_close(branch=iex.BL.branch,verbose=False): +def branch_shutter_close(branch=None,verbose=False): """ closes current branch shutter Previously: Close_BranchShutter """ + if branch == None: + branch = iex.BL.branch caput("PC:29ID:S"+branch+"S_CLOSE_REQUEST.VAL",1,wait=True,timeout=18000) print("Closing "+branch+"-Shutter...") -def branch_shutter_open(branch=iex.BL.branch,verbose=False): +def branch_shutter_open(branch=None,verbose=False): """ Opens current branch shutter Previoulsy: Open_BranchShutter """ + if branch == None: + branch = iex.BL.branch shutter_status = branch_shutter_status() if shutter_status: print(branch+"-Shutter already open...") else: caput("PC:29ID:S"+branch+"S_OPEN_REQUEST.VAL",1,wait=True,timeout=18000) print("Opening "+branch+"-Shutter...") - \ No newline at end of file +