Merge branch 'master-unit' into 'master'

GeneratorFilters : correct the units

See merge request !46415

Generators/GeneratorFilters/src/DiBjetFilter.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // -------------------------------------------------------------
@@ -33,11 +33,11 @@ DiBjetFilter::DiBjetFilter(const std::string& name, ISvcLocator* pSvcLocator)
 {
   //--------------------------------------------------------------------------    
   // Local Member Data:-
-  declareProperty("LeadJetPtMin",m_leadJet_ptMin=0/Gaudi::Units::GeV);
-  declareProperty("LeadJetPtMax",m_leadJet_ptMax=50000/Gaudi::Units::GeV);
-  declareProperty("BottomPtMin",m_bottomPtMin=5.0/Gaudi::Units::GeV);
+  declareProperty("LeadJetPtMin",m_leadJet_ptMin=0*Gaudi::Units::GeV);
+  declareProperty("LeadJetPtMax",m_leadJet_ptMax=50000*Gaudi::Units::GeV);
+  declareProperty("BottomPtMin",m_bottomPtMin=5.0*Gaudi::Units::GeV);
   declareProperty("BottomEtaMax",m_bottomEtaMax=3.0);
-  declareProperty("JetPtMin",m_jetPtMin=15.0/Gaudi::Units::GeV);
+  declareProperty("JetPtMin",m_jetPtMin=15.0*Gaudi::Units::GeV);
   declareProperty("JetEtaMax",m_jetEtaMax=2.7);
   declareProperty("DeltaRFromTruth",m_deltaRFromTruth=0.3);
   declareProperty("TruthContainerName",m_TruthJetContainerName="AntiKt4TruthJets");

Generators/GeneratorFilters/src/MultiBjetFilter.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 // This is a general-purpose multi-b-jet filter. It can cut on:
 //    - Multiplicity of b-jets (both min and max can be specified)
@@ -32,9 +32,9 @@ MultiBjetFilter::MultiBjetFilter(const std::string& name, ISvcLocator* pSvcLocat
   declareProperty("NBJetsMax", m_nBJetsMax = -1); // Negative number means no cut
   declareProperty("LeadJetPtMin", m_leadJet_ptMin = 0);
   declareProperty("LeadJetPtMax", m_leadJet_ptMax = -1); // Negative number means no cut
-  declareProperty("BottomPtMin", m_bottomPtMin = 5.0/Gaudi::Units::GeV);
+  declareProperty("BottomPtMin", m_bottomPtMin = 5.0*Gaudi::Units::GeV);
   declareProperty("BottomEtaMax", m_bottomEtaMax = 3.0);
-  declareProperty("JetPtMin", m_jetPtMin = 15.0/Gaudi::Units::GeV);
+  declareProperty("JetPtMin", m_jetPtMin = 15.0*Gaudi::Units::GeV);
   declareProperty("JetEtaMax", m_jetEtaMax = 2.7);
   declareProperty("DeltaRFromTruth", m_deltaRFromTruth = 0.3);
   declareProperty("TruthContainerName", m_TruthJetContainerName = "AntiKt4TruthJets");

Generators/GeneratorFilters/src/WZtoLeptonFilter.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "GaudiKernel/PhysicalConstants.h"
@@ -75,8 +75,8 @@ StatusCode WZtoLeptonFilter::filterFinalize() {
                "0 for more leptons ( difficult to recon ) : " << m_reconeffi << "\n" <<
                "Etacut_electron : " << m_Eta_e << "\n"                               <<
                "Etacut_muon     : " << m_Eta_mu << "\n"                              <<
-               "Ptcut_electron (GeV) : " << m_Pt_e/Gaudi::Units::GeV << "\n"                       <<
-               "Ptcut_muon           : " << m_Pt_mu/Gaudi::Units::GeV);
+               "Ptcut_electron (GeV) : " << m_Pt_e*Gaudi::Units::GeV << "\n"                       <<
+               "Ptcut_muon           : " << m_Pt_mu*Gaudi::Units::GeV);
 
   if (m_AthenaCalls == 0) {
     ATH_MSG_INFO(" ERROR, Your filter is not interfaced/called at all " << "################   WZtoLeptonFilter Finished  ##############");