From 9a37bd9381555294401a1d12d7901298f03ace72 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Mon, 12 Feb 2024 18:34:59 +0100 Subject: [PATCH 01/10] Update irf_tool_config.json Set as standard "efficiency cuts" to a 70% efficiency, which is the "baseline analysis" in the LST1 performance paper. --- docs/examples/irf_tool_config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/examples/irf_tool_config.json b/docs/examples/irf_tool_config.json index 88f25dbe43..61de3ef1d6 100644 --- a/docs/examples/irf_tool_config.json +++ b/docs/examples/irf_tool_config.json @@ -13,13 +13,13 @@ "DL3Cuts": { "min_event_p_en_bin": 100, "global_gh_cut": 0.7, - "gh_efficiency": 0.9, + "gh_efficiency": 0.7, "min_gh_cut": 0.1, - "max_gh_cut": 0.95, + "max_gh_cut": 0.98, "global_alpha_cut": 10, "global_theta_cut": 0.2, - "theta_containment": 0.68, - "alpha_containment": 0.68, + "theta_containment": 0.7, + "alpha_containment": 0.7, "min_theta_cut": 0.1, "max_theta_cut": 0.32, "fill_theta_cut": 0.32, From 201e31c58cae16361954b0883762907026b5dbff Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Olaizola Date: Mon, 12 Feb 2024 18:36:47 +0100 Subject: [PATCH 02/10] Removed config file specific to DL3 creation --- docs/examples/dl3_tool_config.json | 31 ------------------------------ 1 file changed, 31 deletions(-) delete mode 100644 docs/examples/dl3_tool_config.json diff --git a/docs/examples/dl3_tool_config.json b/docs/examples/dl3_tool_config.json deleted file mode 100644 index c8d8c830e9..0000000000 --- a/docs/examples/dl3_tool_config.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "EventSelector": { - "filters": { - "intensity": [50, Infinity], - "width": [0, Infinity], - "length": [0, Infinity], - "r": [0, 1], - "wl": [0.01, 1], - "leakage_intensity_width_2": [0, 1], - "event_type": [32, 32] - } - }, - "DL3Cuts": { - "min_event_p_en_bin": 100, - "global_gh_cut": 0.7, - "gh_efficiency": 0.9, - "min_gh_cut": 0.1, - "max_gh_cut": 0.95, - "global_alpha_cut": 10, - "global_theta_cut": 0.2, - "theta_containment": 0.68, - "alpha_containment": 0.68, - "min_theta_cut": 0.1, - "max_theta_cut": 0.32, - "fill_theta_cut": 0.32, - "min_alpha_cut": 1, - "max_alpha_cut": 20, - "fill_alpha_cut": 20, - "allowed_tels": [1] - } -} From 50f73b987cd75c6af02551eba3ce92212a26f375 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Mon, 12 Feb 2024 18:43:22 +0100 Subject: [PATCH 03/10] Updated docs --- docs/introduction.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/introduction.rst b/docs/introduction.rst index 536bea50e1..068d29ee8d 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -126,12 +126,7 @@ To write DL3 files, you should use: For more information, try ``--help`` or see the :doc:`lstchain_api/index`. -Here is an example configuration file for the IRF creation step. - -.. toggle:: - - .. include:: examples/dl3_tool_config.json - :code: json +You should use the same configuration file used for the IRF creation (hence you have the same cuts). Post DL3 analysis From 3667c643b9086d0e73702a489b87424661bab912 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Mon, 12 Feb 2024 19:52:14 +0100 Subject: [PATCH 04/10] Update lst_analysis_workflow.rst --- docs/lst_analysis_workflow.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/lst_analysis_workflow.rst b/docs/lst_analysis_workflow.rst index 52667c4fd0..3c1866e15b 100644 --- a/docs/lst_analysis_workflow.rst +++ b/docs/lst_analysis_workflow.rst @@ -130,9 +130,8 @@ DL3/IRF config files -------------------- -DL3/IRF example config files are provided in `docs/example`: +An example config file for IRF/DL3 creation is provided in `docs/example`: - - `dl3_tool_config.json `_ - `irf_tool_config.json `_ @@ -175,4 +174,4 @@ Then, you can use the conda environment used to produce the MC files: The `ENV_NAME` used for MC production is provided in the lstmcipe config file. -Note: you may also activate the environment defined here using your own conda installation. \ No newline at end of file +Note: you may also activate the environment defined here using your own conda installation. From 4fa58b43996e6090521c548b4259d57e2a1a570c Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Mon, 12 Feb 2024 19:53:24 +0100 Subject: [PATCH 05/10] Update test_tools.py --- lstchain/tools/tests/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lstchain/tools/tests/test_tools.py b/lstchain/tools/tests/test_tools.py index f081727efb..770a3c70ca 100644 --- a/lstchain/tools/tests/test_tools.py +++ b/lstchain/tools/tests/test_tools.py @@ -266,7 +266,7 @@ def test_create_dl3_with_config(temp_dir_observed_files, observed_dl2_file): """ from lstchain.tools.lstchain_create_dl3_file import DataReductionFITSWriter - config_file = os.path.join(os.getcwd(), "docs/examples/dl3_tool_config.json") + config_file = os.path.join(os.getcwd(), "docs/examples/irf_tool_config.json") assert ( run_tool( From 748e727445beb855b7f600ddc9ace4285602e795 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 13 Feb 2024 09:48:48 +0100 Subject: [PATCH 06/10] Rename irf_tool_config.json to irf_dl3_tool_config.json --- docs/examples/{irf_tool_config.json => irf_dl3_tool_config.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/examples/{irf_tool_config.json => irf_dl3_tool_config.json} (100%) diff --git a/docs/examples/irf_tool_config.json b/docs/examples/irf_dl3_tool_config.json similarity index 100% rename from docs/examples/irf_tool_config.json rename to docs/examples/irf_dl3_tool_config.json From f29461716eeac3cd651745a01d471931ccd5a977 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 13 Feb 2024 09:49:33 +0100 Subject: [PATCH 07/10] Update lst_analysis_workflow.rst --- docs/lst_analysis_workflow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/lst_analysis_workflow.rst b/docs/lst_analysis_workflow.rst index 3c1866e15b..7b0c4a1d21 100644 --- a/docs/lst_analysis_workflow.rst +++ b/docs/lst_analysis_workflow.rst @@ -132,7 +132,7 @@ DL3/IRF config files An example config file for IRF/DL3 creation is provided in `docs/example`: - - `irf_tool_config.json `_ + - `irf_dl3_tool_config.json `_ Such files should be used to produce DL3 files and IRFs from DL2 (see :ref:`the Analysis Steps `) From e23e67a9cf40cb63ee61500ae5e19f8bc5c0a074 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 13 Feb 2024 09:49:54 +0100 Subject: [PATCH 08/10] Update test_tools.py --- lstchain/tools/tests/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lstchain/tools/tests/test_tools.py b/lstchain/tools/tests/test_tools.py index 770a3c70ca..52baa08a87 100644 --- a/lstchain/tools/tests/test_tools.py +++ b/lstchain/tools/tests/test_tools.py @@ -69,7 +69,7 @@ def test_create_irf_full_enclosure_with_config( from lstchain.tools.lstchain_create_irf_files import IRFFITSWriter irf_file = temp_dir_observed_files / "fe_irf.fits.gz" - config_file = os.path.join(os.getcwd(), "./docs/examples/irf_tool_config.json") + config_file = os.path.join(os.getcwd(), "./docs/examples/irf_dl3_tool_config.json") assert ( run_tool( From 0ce0a5ad821562c795db148488e23963a31793f4 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 13 Feb 2024 09:50:23 +0100 Subject: [PATCH 09/10] Update test_tools.py --- lstchain/tools/tests/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lstchain/tools/tests/test_tools.py b/lstchain/tools/tests/test_tools.py index 52baa08a87..06f24d7931 100644 --- a/lstchain/tools/tests/test_tools.py +++ b/lstchain/tools/tests/test_tools.py @@ -266,7 +266,7 @@ def test_create_dl3_with_config(temp_dir_observed_files, observed_dl2_file): """ from lstchain.tools.lstchain_create_dl3_file import DataReductionFITSWriter - config_file = os.path.join(os.getcwd(), "docs/examples/irf_tool_config.json") + config_file = os.path.join(os.getcwd(), "docs/examples/irf_dl3_tool_config.json") assert ( run_tool( From 9e257bfd6944e90e070dadc12890e212ca59d3a9 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 13 Feb 2024 10:06:17 +0100 Subject: [PATCH 10/10] Update introduction.rst --- docs/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/introduction.rst b/docs/introduction.rst index 068d29ee8d..48ead518a3 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -112,7 +112,7 @@ Here is an example configuration file for the IRF creation step. .. toggle:: - .. include:: examples/irf_tool_config.json + .. include:: examples/irf_dl3_tool_config.json :code: json