diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/tools/onnx/RingerSelector.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/tools/onnx/RingerSelector.cxx index 194f3fc1617c677e52263e8961844fdbe49474b5..575fac600790326e5e12141753777ef2e769421f 100644 --- a/PhysicsAnalysis/RingerSelectorTools/Root/tools/onnx/RingerSelector.cxx +++ b/PhysicsAnalysis/RingerSelectorTools/Root/tools/onnx/RingerSelector.cxx @@ -117,12 +117,12 @@ namespace Ringer{ bool RingerSelector::accept( const xAOD::TrigRingerRings *ringsCluster, float discr, float avgmu ) const { float et = ringsCluster->emCluster()->et()/Gaudi::Units::GeV; - float eta = std::min( std::abs(ringsCluster->emCluster()->eta()), float(2.5)); + float eta = std::abs(ringsCluster->emCluster()->eta()); ATH_MSG_DEBUG( "Event et = "<< et << ", eta = " << eta ); for( auto& cutDef : m_thresholds ){ - if ( et <= cutDef.etMin() || et > cutDef.etMax() ) continue; - if ( eta <= cutDef.etaMin() || eta > cutDef.etaMax() ) continue; + if ( et < cutDef.etMin() || et >= cutDef.etMax() ) continue; + if ( eta < cutDef.etaMin() || eta >= cutDef.etaMax() ) continue; return cutDef.accept( discr, avgmu ); }// loop over all thresholds @@ -204,13 +204,13 @@ namespace Ringer{ float RingerSelector::predict(const xAOD::TrigRingerRings *ringsCluster , const xAOD::TrigElectron *el ) const { float et = ringsCluster->emCluster()->et()/Gaudi::Units::GeV; - float eta = std::min( std::abs(ringsCluster->emCluster()->eta()), float(2.5)); + float eta = std::abs(ringsCluster->emCluster()->eta()); // Find the correct model and predict for( auto& model : m_models ){ - if(et<=model.etMin() || et > model.etMax()) continue; - if(eta<=model.etaMin() || eta > model.etaMax()) continue; + if(et<model.etMin() || et >= model.etMax()) continue; + if(eta<model.etaMin() || eta >= model.etaMax()) continue; auto inputs = prepare_inputs( model.barcode(), ringsCluster, el ); auto output = model.predict( inputs ); // propagate the input throut the model diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/RingerSelectorTool.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/RingerSelectorTool.cxx index c282a1c39404b3db88a842aa4a2991ec0e1ff821..a8f3337154571d1c355d0b9a8294ce2bb2c7e6f7 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/RingerSelectorTool.cxx +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/RingerSelectorTool.cxx @@ -144,15 +144,14 @@ bool RingerSelectorTool::accept( double discriminant, double et, double eta, do const { eta = std::fabs(eta); - if(eta>2.50) eta=2.50;///fix for events out of the ranger et = et/Gaudi::Units::GeV; ///in GeV double threshold = 0.0; double avgmu = mu; //Apply cut for(unsigned i=0; i < m_cutDefs.size(); ++i){ - if((avgmu > m_cutDefs[i]->mumin()) && (avgmu <= m_cutDefs[i]->mumax())){ - if((et > m_cutDefs[i]->etmin()) && (et <= m_cutDefs[i]->etmax())){ - if((eta > m_cutDefs[i]->etamin()) && (eta <= m_cutDefs[i]->etamax())){ + if((avgmu >= m_cutDefs[i]->mumin()) && (avgmu < m_cutDefs[i]->mumax())){ + if((et >= m_cutDefs[i]->etmin()) && (et < m_cutDefs[i]->etmax())){ + if((eta >= m_cutDefs[i]->etamin()) && (eta < m_cutDefs[i]->etamax())){ if(m_doPileupCorrection){ // Limited Pileup @@ -183,14 +182,13 @@ bool RingerSelectorTool::retrieve(double et, double eta, double mu, std::shared_ const { eta = std::fabs(eta); - if(eta>2.50) eta=2.50;///fix for events out of the ranger et = et/Gaudi::Units::GeV; ///in GeV if(!m_discriminators.empty()){ for(unsigned i=0; i<m_discriminators.size(); ++i){ - if(mu > m_discriminators[i]->mumin() && mu <= m_discriminators[i]->mumax()){ - if(et > m_discriminators[i]->etmin() && et <= m_discriminators[i]->etmax()){ - if(eta > m_discriminators[i]->etamin() && eta <= m_discriminators[i]->etamax()){ + if(mu >= m_discriminators[i]->mumin() && mu < m_discriminators[i]->mumax()){ + if(et >= m_discriminators[i]->etmin() && et < m_discriminators[i]->etmax()){ + if(eta >= m_discriminators[i]->etamin() && eta < m_discriminators[i]->etamax()){ discr = m_discriminators[i]; preproc = m_preprocs[i]; return true;