update codes following PR #965

cta-observatory · Apr 12, 2022 · e08e351 · e08e351
1 parent 6bbfabc
commit e08e351
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/docs/examples/dl3_tool_config.json b/docs/examples/dl3_tool_config.json
@@ -23,6 +23,9 @@
     "min_theta_cut": 0.05,
     "max_theta_cut": 0.32,
     "fill_theta_cut": 0.32,
+    "min_alpha_cut": 1,
+    "max_alpha_cut": 45,
+    "fill_alpha_cut": 45,
     "allowed_tels": [1]
   }
 }
diff --git a/docs/examples/irf_tool_config.json b/docs/examples/irf_tool_config.json
@@ -23,6 +23,9 @@
     "min_theta_cut": 0.05,
     "max_theta_cut": 0.32,
     "fill_theta_cut": 0.32,
+    "min_alpha_cut": 1,
+    "max_alpha_cut": 45,
+    "fill_alpha_cut": 45,
     "allowed_tels": [1]
   },
   "DataBinning": {

diff --git a/lstchain/io/event_selection.py b/lstchain/io/event_selection.py
@@ -103,6 +103,22 @@ class DL3Cuts(Component):
         default_value=0.2,
     ).tag(config=True)
 
+    min_alpha_cut = Float(
+        help="Minimum alpha cut (deg) in an energy bin",
+        default_value=1,
+    ).tag(config=True)
+
+    max_alpha_cut = Float(
+        help="Maximum alpha cut (deg) in an energy bin",
+        default_value=45,
+    ).tag(config=True)
+
+    fill_alpha_cut = Float(
+        help="Fill value of alpha cut (deg) in an energy bin with fewer " +
+            "than minimum number of events present",
+        default_value=45,
+    ).tag(config=True)
+
     alpha_containment = Float(
         help="Percentage containment region for alpha cuts",
         default=0.68,
@@ -213,8 +229,7 @@ def apply_global_alpha_cut(self, data):
         return data[data["alpha"].to_value(u.deg) < self.global_alpha_cut]
 
     def energy_dependent_alpha_cuts(
-            self, data, energy_bins, min_value=1 * u.deg,
-            max_value=90 * u.deg, smoothing=None, min_events=10
+            self, data, energy_bins, smoothing=None
     ):
         """
         Evaluating an optimized energy-dependent alpha cuts, in a given
@@ -227,12 +242,12 @@ def energy_dependent_alpha_cuts(
             data["alpha"],
             data["reco_energy"],
             bins=energy_bins,
-            min_value=min_value,
-            max_value=max_value,
-            fill_value=data["alpha"].max(),
+            min_value=self.min_alpha_cut * u.deg,
+            max_value=self.max_alpha_cut * u.deg,
+            fill_value=self.fill_alpha_cut * u.deg,
             percentile=100 * self.alpha_containment,
             smoothing=smoothing,
-            min_events=min_events,
+            min_events=self.min_event_p_en_bin,
         )
         return alpha_cuts
 
@@ -246,7 +261,7 @@ def apply_energy_dependent_alpha_cuts(self, data, alpha_cuts):
             data["alpha"],
             data["reco_energy"],
             alpha_cuts,
-            operator.le,
+            operator.lt,
         )
         return data[data["selected_alpha"]]
 

diff --git a/lstchain/tools/lstchain_create_irf_files.py b/lstchain/tools/lstchain_create_irf_files.py
@@ -409,7 +409,6 @@ def start(self):
                 if self.energy_dependent_alpha:
                     self.alpha_cuts = self.cuts.energy_dependent_alpha_cuts(
                         gammas, reco_energy_bins,
-                        min_value=1 * u.deg, max_value=90 * u.deg,
                     )
                     gammas = self.cuts.apply_energy_dependent_alpha_cuts(
                         gammas, self.alpha_cuts