Merge pull request #618 in B2/basf2 from feature/BII-8897-modify-eclleakagealgorithm-rel06 to release/06-00

* commit '2d179af10819572f9ee2cf70a7429263953f6d4e':
  mods for high backgrounds plus extra diagnostic output

Author: GiacomoXT

calibration/scripts/prompt/calibrations/caf_ecl_leakage.py

@@ -29,7 +29,9 @@
                                expert_config={"number_energies": 8,
                                               "forward_energies": [0.030, 0.050, 0.100, 0.200, 0.483, 1.166, 2.816, 6.800],
                                               "barrel_energies": [0.030, 0.050, 0.100, 0.200, 0.458, 1.049, 2.402, 5.500],
-                                              "backward_energies": [0.030, 0.050, 0.100, 0.200, 0.428, 0.917, 1.962, 4.200]}
+                                              "backward_energies": [0.030, 0.050, 0.100, 0.200, 0.428, 0.917, 1.962, 4.200],
+                                              "lowEnergyThreshold": 0.,
+                                              "noNCrysThreshold": 0.}
                                )
 
 
@@ -48,9 +50,6 @@ def get_calibrations(input_data, **kwargs):
     file_to_iov_leakage = input_data["single_gamma_mc"]
     input_files_leakage = list(file_to_iov_leakage.keys())
 
-    # ..Algorithm
-    algo_leakage = Belle2.ECL.eclLeakageAlgorithm()
-
     # ..Collector
     ecl_leakage_collector = basf2.register_module("eclLeakageCollector")
     ecl_leakage_collector.param("granularity", "all")
@@ -70,6 +69,13 @@ def get_calibrations(input_data, **kwargs):
     backward_energies = expert_config["backward_energies"]
     ecl_leakage_collector.param("energies_backward", backward_energies)
 
+    # ..Algorithm
+    algo_leakage = Belle2.ECL.eclLeakageAlgorithm()
+    lowEnergyThreshold = expert_config["lowEnergyThreshold"]
+    algo_leakage.setLowEnergyThreshold(lowEnergyThreshold)
+    noNCrysThreshold = expert_config["noNCrysThreshold"]
+    algo_leakage.setNoNCrysThreshold(noNCrysThreshold)
+
     # ..The calibration
     cal_ecl_leakage = Calibration(
         name="ecl_leakage",

ecl/calibration/include/eclLeakageAlgorithm.h

@@ -24,13 +24,30 @@ namespace Belle2 {
       /** Destructor */
       virtual ~eclLeakageAlgorithm() {}
 
+      /** Setter for m_lowEnergyThreshold */
+      void setLowEnergyThreshold(double lowEnergyThreshold) {m_lowEnergyThreshold = lowEnergyThreshold;}
+
+      /** Getter for m_lowEnergyThreshold */
+      double getLowEnergyThreshold() {return m_lowEnergyThreshold;}
+
+      /** Setter for m_noNCrysThreshold */
+      void setNoNCrysThreshold(double noNCrysThreshold) {m_noNCrysThreshold = noNCrysThreshold;}
+
+      /** Getter for m_noNCrysThreshold */
+      double getNoNCrysThreshold() {return m_noNCrysThreshold;}
+
+
     protected:
 
       /** Run algorithm */
       virtual EResult calibrate() override;
 
     private:
 
+      /** Parameters to control fit procedure */
+      double m_lowEnergyThreshold = 0.0; /**< only minimal fits below this value */
+      double m_noNCrysThreshold = 0.0; /**< no nCrys fits below this value */
+
       /** For TTree */
       int t_cellID = 0; /**< cellID of photon */
       int t_thetaID = 0; /**< thetaID of photon */