diff --git a/response_tools/detector_response.py b/response_tools/detector_response.py index a3f1652..aa096bd 100644 --- a/response_tools/detector_response.py +++ b/response_tools/detector_response.py @@ -102,10 +102,11 @@ def cdte_det_resp(cdte:int=None, region:int=None, pitch=None, side:str="merged", event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" file : `str` @@ -143,15 +144,10 @@ def cdte_det_resp(cdte:int=None, region:int=None, pitch=None, side:str="merged", logging.warning(f"In {sys._getframe().f_code.co_name}, the `side` must be in [\"pt\", \"merged\"].") return - if event_type not in ["1hit", "2hit", "all", "mix"]: - logging.warning(f"In {sys._getframe().f_code.co_name}, the `event_type` must be in [\"1hit\", \"2hit\", (\"all\", \"mix\")].") + if event_type not in ["1hit", "2hit", "all"]: + logging.warning(f"In {sys._getframe().f_code.co_name}, the `event_type` must be in [\"1hit\", \"2hit\", \"all\"].") return - if side=="merged" and event_type=="mix": - event_type="all" - elif side in ["pt"] and event_type=="all": - event_type="mix" - region = pitch2region[pitch] if have_pitch else region _f = os.path.join(FILE_PATH, diff --git a/response_tools/responses.py b/response_tools/responses.py index 67dbd1c..5873073 100644 --- a/response_tools/responses.py +++ b/response_tools/responses.py @@ -493,10 +493,11 @@ def foxsi4_telescope2_rmf(region:int=None, pitch=None, _side:str="merged", _even _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -664,10 +665,11 @@ def foxsi4_telescope3_rmf(region:int=None, pitch=None, _side:str="merged", _even _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -832,10 +834,11 @@ def foxsi4_telescope4_rmf(region:int=None, pitch=None, _side:str="merged", _even _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -998,10 +1001,11 @@ def foxsi4_telescope5_rmf(region:int=None, pitch=None, _side:str="merged", _even _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns diff --git a/response_tools/telescope_parts.py b/response_tools/telescope_parts.py index 2561d87..9382d69 100644 --- a/response_tools/telescope_parts.py +++ b/response_tools/telescope_parts.py @@ -370,10 +370,11 @@ def foxsi4_position2_detector_response(region:int=None, pitch=None, _side:str="m _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -528,10 +529,11 @@ def foxsi4_position3_detector_response(region:int=None, pitch=None, _side:str="m _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -662,10 +664,11 @@ def foxsi4_position4_detector_response(region:int=None, pitch=None, _side:str="m _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns @@ -816,10 +819,11 @@ def foxsi4_position5_detector_response(region:int=None, pitch=None, _side:str="m _event_type : `str` Define the type of event trigger being considered in the - response. Must be in ["1hit", "2hit", ("all", "mix")]. - Note: \"all\" and \"mix\" are the same but some from different - naming conventions on the merged and individual detector sides. - This will be fixed at some point in the future. + response. Must be in ["1hit", "2hit", "all"]. + Note: \"all\" and \"mix\" (old) are the same but some from + different naming conventions on the merged and individual + detector sides. This has been fixed and all files use \"all\" + now. Default: "all" Returns