Merge branch 'rates-fix-eb-cleanup' into '22.0'

EnhancedBiasWeighter: Interface cleanup

See merge request !53590

(cherry picked from commit 4b879299)

0739310e Fix default threshold behaviour
8ee85368 Remove CalculateWeightingData flag

Trigger/TrigCost/EnhancedBiasWeighter/EnhancedBiasWeighter/EnhancedBiasWeighter.h

@@ -184,7 +184,6 @@ class EnhancedBiasWeighter: public asg::AsgTool, public virtual IEnhancedBiasWei
 
     Gaudi::Property<uint32_t> m_runNumber{this, "RunNumber", 0, "Run we're processing (if data), needed at initialize to locate and read in extra configuration."};
     Gaudi::Property<bool> m_errorOnMissingEBWeights{this, "ErrorOnMissingEBWeights", false, "If true, Throws error if EB weights are missing."};
-    Gaudi::Property<bool> m_calculateWeightingData{this, "CalculateWeightingData", true, "If true, read from COOL, CONDBR2 and XMLs. If false, read directly from decorated TRIG1 dAOD."};
     Gaudi::Property<bool> m_enforceEBGRL{this, "EnforceEBGRL", true, "Each Enhanced Bias run has a 'good run list' style veto on some LB. If this flag is true, events in these LB get weight 0"};
     Gaudi::Property<bool> m_useBunchCrossingData{this, "UseBunchCrossingData", true, "BunchCrossing data requires CONDBR2 access. Can be disabled here if this is a problem."};
     Gaudi::Property<bool> m_isMC{this, "IsMC", false,  "MC mode? If so we need a cross section and filter efficiency"};

Trigger/TrigCost/RatesAnalysis/RatesAnalysis/RatesAnalysisAlg.h

@@ -103,7 +103,7 @@ class RatesAnalysisAlg: public ::AthAnalysisAlgorithm {
     const double thresholdMin,
     const double thresholdMax,
     const uint32_t thresholdBins = 100,
-    const RatesScanTrigger::TriggerBehaviour_t behaviour = RatesScanTrigger::TriggerBehaviour_t::kTriggerAboveThreshold,
+    const RatesScanTrigger::TriggerBehaviour_t behaviour = RatesScanTrigger::TriggerBehaviour_t::kTriggerBelowThreshold,
     const double prescale = 1.,
     const std::string& seedName = "",
     const double seedPrecale = 1.,