diff --git a/src/triggers.cxx b/src/triggers.cxx index 75edf502..71066b0b 100644 --- a/src/triggers.cxx +++ b/src/triggers.cxx @@ -145,25 +145,34 @@ bool matchParticle(const ROOT::Math::PtEtaPhiMVector &particle, bool pt = particle.pt() > pt_cut; bool eta = abs(particle.eta()) < eta_cut; Logger::get("CheckTriggerMatch") - ->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), particle.eta(), particle.phi(), particle.mass()); + ->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), + particle.eta(), particle.phi(), particle.mass()); Logger::get("CheckTriggerMatch") ->debug("-------------------------------------------------------"); - Logger::get("CheckTriggerMatch")->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR); + Logger::get("CheckTriggerMatch") + ->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR); Logger::get("CheckTriggerMatch") ->debug("deltaR Value: {}", ROOT::Math::VectorUtil::DeltaR(triggerobject, particle)); - Logger::get("CheckTriggerMatch")->debug("id/trigger_particle_id_cut Check: {}/{}", id, trigger_particle_id_cut); + Logger::get("CheckTriggerMatch") + ->debug("id/trigger_particle_id_cut Check: {}/{}", id, + trigger_particle_id_cut); Logger::get("CheckTriggerMatch") ->debug("id Value: {}", triggerobject_ids[idx]); - Logger::get("CheckTriggerMatch")->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut); + Logger::get("CheckTriggerMatch") + ->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut); Logger::get("CheckTriggerMatch") ->debug("bit Value: {}", IntBits(triggerobject_bits[idx])); - Logger::get("CheckTriggerMatch")->debug("pt/pt_cut Check: {}/{}", pt, pt_cut); Logger::get("CheckTriggerMatch") - ->debug("pt Value (trg): {}, pt Value (reco): {}", triggerobject_pts[idx], particle.pt()); - Logger::get("CheckTriggerMatch")->debug("eta/eta_cut Check: {}/{}", eta, eta_cut); + ->debug("pt/pt_cut Check: {}/{}", pt, pt_cut); + Logger::get("CheckTriggerMatch") + ->debug("pt Value (trg): {}, pt Value (reco): {}", + triggerobject_pts[idx], particle.pt()); Logger::get("CheckTriggerMatch") - ->debug("eta (trg) Value: {}, eta (reco) Value: {}", triggerobject_etas[idx], abs(particle.eta())); + ->debug("eta/eta_cut Check: {}/{}", eta, eta_cut); + Logger::get("CheckTriggerMatch") + ->debug("eta (trg) Value: {}, eta (reco) Value: {}", + triggerobject_etas[idx], abs(particle.eta())); Logger::get("CheckTriggerMatch") ->debug("-------------------------------------------------------"); if (deltaR && bit && id && pt && eta) { @@ -219,38 +228,38 @@ ROOT::RDF::RNode GenerateSingleTriggerFlag( const int &trigger_particle_id_cut, const int &triggerbit_cut, const float &DeltaR_threshold) { - auto triggermatch = - [DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut, - triggerbit_cut, hltpath](bool hltpath_match, - const ROOT::Math::PtEtaPhiMVector &particle_p4, - ROOT::RVec triggerobject_bits, - ROOT::RVec triggerobject_ids, - ROOT::RVec triggerobject_pts, - ROOT::RVec triggerobject_etas, - ROOT::RVec triggerobject_phis) { - Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger"); + auto triggermatch = [DeltaR_threshold, pt_cut, eta_cut, + trigger_particle_id_cut, triggerbit_cut, hltpath]( + bool hltpath_match, + const ROOT::Math::PtEtaPhiMVector &particle_p4, + ROOT::RVec triggerobject_bits, + ROOT::RVec triggerobject_ids, + ROOT::RVec triggerobject_pts, + ROOT::RVec triggerobject_etas, + ROOT::RVec triggerobject_phis) { + Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger"); + Logger::get("CheckTriggerMatch") + ->debug("Selected trigger: {}", hltpath); + bool result = false; + bool match_result = false; + if (hltpath_match) { Logger::get("CheckTriggerMatch") - ->debug("Selected trigger: {}", hltpath); - bool result = false; - bool match_result = false; - if (hltpath_match) { - Logger::get("CheckTriggerMatch") - ->debug("Checking Triggerobject match with particles ...."); - match_result = matchParticle( - particle_p4, triggerobject_pts, triggerobject_etas, - triggerobject_phis, triggerobject_bits, triggerobject_ids, - DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut, - triggerbit_cut); - } - result = hltpath_match & match_result; - Logger::get("GenerateSingleTriggerFlag") - ->debug("---> HLT Match: {}", hltpath_match); - Logger::get("GenerateSingleTriggerFlag") - ->debug("---> Total Match: {}", match_result); - Logger::get("GenerateSingleTriggerFlag") - ->debug("--->>>> result: {}", result); - return result; - }; + ->debug("Checking Triggerobject match with particles ...."); + match_result = matchParticle( + particle_p4, triggerobject_pts, triggerobject_etas, + triggerobject_phis, triggerobject_bits, triggerobject_ids, + DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut, + triggerbit_cut); + } + result = hltpath_match & match_result; + Logger::get("GenerateSingleTriggerFlag") + ->debug("---> HLT Match: {}", hltpath_match); + Logger::get("GenerateSingleTriggerFlag") + ->debug("---> Total Match: {}", match_result); + Logger::get("GenerateSingleTriggerFlag") + ->debug("--->>>> result: {}", result); + return result; + }; auto available_trigger = df.GetColumnNames(); std::vector matched_trigger_names; std::regex hltpath_regex = std::regex(hltpath); @@ -365,7 +374,7 @@ ROOT::RDF::RNode GenerateDoubleTriggerFlag( ROOT::RVec triggerobject_phis) { Logger::get("GenerateDoubleTriggerFlag")->debug("Checking Trigger"); Logger::get("CheckTriggerMatch") - ->debug("Selected trigger: {}", hltpath); + ->debug("Selected trigger: {}", hltpath); bool result = false; bool match_result_p1 = false; bool match_result_p2 = false; @@ -669,25 +678,34 @@ bool matchParticle(const ROOT::Math::PtEtaPhiMVector &particle, (trigger_particle_pt_cut < 0.) || (triggerobject_pts[idx] > trigger_particle_pt_cut); Logger::get("CheckTriggerMatch") - ->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), particle.eta(), particle.phi(), particle.mass()); + ->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), + particle.eta(), particle.phi(), particle.mass()); Logger::get("CheckTriggerMatch") ->debug("-------------------------------------------------------"); - Logger::get("CheckTriggerMatch")->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR); + Logger::get("CheckTriggerMatch") + ->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR); Logger::get("CheckTriggerMatch") ->debug("deltaR Value: {}", ROOT::Math::VectorUtil::DeltaR(triggerobject, particle)); - Logger::get("CheckTriggerMatch")->debug("id/trigger_particle_id_cut Check: {}/{}", id, trigger_particle_id_cut); + Logger::get("CheckTriggerMatch") + ->debug("id/trigger_particle_id_cut Check: {}/{}", id, + trigger_particle_id_cut); Logger::get("CheckTriggerMatch") ->debug("id Value: {}", triggerobject_ids[idx]); - Logger::get("CheckTriggerMatch")->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut); + Logger::get("CheckTriggerMatch") + ->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut); Logger::get("CheckTriggerMatch") ->debug("bit Value: {}", IntBits(triggerobject_bits[idx])); - Logger::get("CheckTriggerMatch")->debug("pt/pt_cut Check: {}/{}", pt, pt_cut); Logger::get("CheckTriggerMatch") - ->debug("pt Value (trg): {}, pt Value (reco): {}", triggerobject_pts[idx], particle.pt()); - Logger::get("CheckTriggerMatch")->debug("eta/eta_cut Check: {}/{}", eta, eta_cut); + ->debug("pt/pt_cut Check: {}/{}", pt, pt_cut); + Logger::get("CheckTriggerMatch") + ->debug("pt Value (trg): {}, pt Value (reco): {}", + triggerobject_pts[idx], particle.pt()); Logger::get("CheckTriggerMatch") - ->debug("eta (trg) Value: {}, eta (reco) Value: {}", triggerobject_etas[idx], abs(particle.eta())); + ->debug("eta/eta_cut Check: {}/{}", eta, eta_cut); + Logger::get("CheckTriggerMatch") + ->debug("eta (trg) Value: {}, eta (reco) Value: {}", + triggerobject_etas[idx], abs(particle.eta())); Logger::get("CheckTriggerMatch") ->debug("-------------------------------------------------------"); if (deltaR && bit && id && pt && eta && trigger_particle_pt) { @@ -743,7 +761,8 @@ ROOT::RDF::RNode MatchSingleTriggerObject( const float &DeltaR_threshold, const float &trigger_particle_pt_cut) { auto triggermatch = [DeltaR_threshold, pt_cut, eta_cut, - trigger_particle_id_cut, triggerbit_cut, trigger_particle_pt_cut]( + trigger_particle_id_cut, triggerbit_cut, + trigger_particle_pt_cut]( const ROOT::Math::PtEtaPhiMVector &particle_p4, ROOT::RVec triggerobject_bits, ROOT::RVec triggerobject_ids, @@ -753,11 +772,11 @@ ROOT::RDF::RNode MatchSingleTriggerObject( Logger::get("MatchSingleTriggerObject")->debug("Checking Trigger"); Logger::get("MatchSingleTriggerObject") ->debug("Checking Triggerobject match with particles ...."); - bool match_result = - matchParticle(particle_p4, triggerobject_pts, triggerobject_etas, - triggerobject_phis, triggerobject_bits, - triggerobject_ids, DeltaR_threshold, pt_cut, eta_cut, - trigger_particle_id_cut, triggerbit_cut, trigger_particle_pt_cut); + bool match_result = matchParticle( + particle_p4, triggerobject_pts, triggerobject_etas, + triggerobject_phis, triggerobject_bits, triggerobject_ids, + DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut, + triggerbit_cut, trigger_particle_pt_cut); Logger::get("MatchSingleTriggerObject") ->debug("--->>>> match_result: {}", match_result); return match_result; @@ -821,7 +840,7 @@ ROOT::RDF::RNode GenerateSingleTriggerFlag( ROOT::RVec triggerobject_phis) { Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger"); Logger::get("CheckTriggerMatch") - ->debug("Selected trigger: {}", hltpath); + ->debug("Selected trigger: {}", hltpath); bool result = false; bool match_result = false; if (hltpath_match) { @@ -1082,7 +1101,7 @@ ROOT::RDF::RNode GetPrescaleValues(ROOT::RDF::RNode df, Logger::get("prescale") ->debug("... checking lumi {}, prescale {} ...", std::stoi(i_key), int(i_value)); - if (lumiblock > std::stoi(i_key)) { + if (lumiblock >= std::stoi(i_key)) { if (std::stoi(i_key) >= highest_lumi) { highest_lumi = std::stoi(i_key); prescale = i_value;