Update resource configs and docstring

Author: LukasBeiske

src/ctapipe/irf/optimize.py

@@ -293,9 +293,9 @@ def __call__(self, theta, reco_energy, reco_energy_bins):
 class PercentileCuts(CutOptimizerBase):
     """
     Calculates G/H separation cut based on the percentile of signal events
-    to keep in each bin.
+    to keep in each bin via ``GhPercentileCutCalculator``.
     Optionally also calculates a percentile cut on theta based on the signal
-    events surviving this G/H cut.
+    events surviving this G/H cut via ``ThetaPercentileCutCalculator``.
     """
 
     def __init__(self, config=None, parent=None, **kwargs):

src/ctapipe/resources/compute_irf.yaml

@@ -25,7 +25,6 @@ DL2EventPreprocessor:
 
   DL2EventQualityQuery:
     quality_criteria:
-      - ["multiplicity 4", "np.count_nonzero(HillasReconstructor_telescopes,axis=1) >= 4"]
       - ["valid classifier", "RandomForestClassifier_is_valid"]
       - ["valid geom reco", "HillasReconstructor_is_valid"]
       - ["valid energy reco", "RandomForestRegressor_is_valid"]

src/ctapipe/resources/optimize_cuts.yaml

@@ -10,7 +10,7 @@ EventSelectionOptimizer:
   proton_target_spectrum: IRFDOC_PROTON_SPECTRUM
   electron_target_spectrum: IRFDOC_ELECTRON_SPECTRUM
   obs_time: 50 hour
-  optimization_algorithm: "PointSourceSensitivityOptimizer"  # Alternative: "PercentileCuts"
+  optimization_algorithm: "PointSourceSensitivityOptimizer" # Alternatives: "PointSourceSensitivityGhOptimizer", "PercentileCuts"
 
 DL2EventPreprocessor:
   energy_reconstructor: "RandomForestRegressor"
@@ -19,7 +19,6 @@ DL2EventPreprocessor:
 
   DL2EventQualityQuery:
     quality_criteria:
-      - ["multiplicity 4", "np.count_nonzero(HillasReconstructor_telescopes,axis=1) >= 4"]
       - ["valid classifier", "RandomForestClassifier_is_valid"]
       - ["valid geom reco", "HillasReconstructor_is_valid"]
       - ["valid energy reco", "RandomForestRegressor_is_valid"]
@@ -29,6 +28,21 @@ DefaultRecoEnergyBins:
   reco_energy_max: 150 TeV
   reco_energy_n_bins_per_decade: 5
 
+PointSourceSensitivityOptimizer:
+  min_background_fov_offset: 0.0 deg
+  max_background_fov_offset: 5.0 deg
+  max_gh_cut_efficiency: 0.8
+  gh_cut_efficiency_step: 0.1
+  alpha: 0.2
+  theta_min_angle: None
+  theta_max_angle: 0.5 deg
+  max_theta_cut_efficiency: 0.8
+  theta_cut_efficiency_step: 0.1
+  multiplicity_cuts: [2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+PointSourceSensitivityGhOptimizer:
+  initial_gh_cut_efficency: 0.4
+
 ThetaPercentileCutCalculator:
   theta_min_angle: None
   theta_max_angle: 0.5 deg
@@ -41,11 +55,3 @@ GhPercentileCutCalculator:
   target_percentile: 68
   min_counts: 10
   smoothing:
-
-PointSourceSensitivityOptimizer:
-  min_background_fov_offset: 0.0 deg
-  max_background_fov_offset: 5.0 deg
-  initial_gh_cut_efficency: 0.4
-  max_gh_cut_efficiency: 0.8
-  gh_cut_efficiency_step: 0.1
-  alpha: 0.2