Skip to content

Commit dda3498

Browse files
nfaltermannharrypuuter
nfaltermann
authored and
harrypuuter
committed
fix prescale + clang
1 parent a1872e1 commit dda3498

File tree

1 file changed

+75
-56
lines changed

1 file changed

+75
-56
lines changed

‎src/triggers.cxx

+75-56
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,34 @@ bool matchParticle(const ROOT::Math::PtEtaPhiMVector &particle,
145145
bool pt = particle.pt() > pt_cut;
146146
bool eta = abs(particle.eta()) < eta_cut;
147147
Logger::get("CheckTriggerMatch")
148-
->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), particle.eta(), particle.phi(), particle.mass());
148+
->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(),
149+
particle.eta(), particle.phi(), particle.mass());
149150
Logger::get("CheckTriggerMatch")
150151
->debug("-------------------------------------------------------");
151-
Logger::get("CheckTriggerMatch")->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR);
152+
Logger::get("CheckTriggerMatch")
153+
->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR);
152154
Logger::get("CheckTriggerMatch")
153155
->debug("deltaR Value: {}",
154156
ROOT::Math::VectorUtil::DeltaR(triggerobject, particle));
155-
Logger::get("CheckTriggerMatch")->debug("id/trigger_particle_id_cut Check: {}/{}", id, trigger_particle_id_cut);
157+
Logger::get("CheckTriggerMatch")
158+
->debug("id/trigger_particle_id_cut Check: {}/{}", id,
159+
trigger_particle_id_cut);
156160
Logger::get("CheckTriggerMatch")
157161
->debug("id Value: {}", triggerobject_ids[idx]);
158-
Logger::get("CheckTriggerMatch")->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut);
162+
Logger::get("CheckTriggerMatch")
163+
->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut);
159164
Logger::get("CheckTriggerMatch")
160165
->debug("bit Value: {}", IntBits(triggerobject_bits[idx]));
161-
Logger::get("CheckTriggerMatch")->debug("pt/pt_cut Check: {}/{}", pt, pt_cut);
162166
Logger::get("CheckTriggerMatch")
163-
->debug("pt Value (trg): {}, pt Value (reco): {}", triggerobject_pts[idx], particle.pt());
164-
Logger::get("CheckTriggerMatch")->debug("eta/eta_cut Check: {}/{}", eta, eta_cut);
167+
->debug("pt/pt_cut Check: {}/{}", pt, pt_cut);
168+
Logger::get("CheckTriggerMatch")
169+
->debug("pt Value (trg): {}, pt Value (reco): {}",
170+
triggerobject_pts[idx], particle.pt());
165171
Logger::get("CheckTriggerMatch")
166-
->debug("eta (trg) Value: {}, eta (reco) Value: {}", triggerobject_etas[idx], abs(particle.eta()));
172+
->debug("eta/eta_cut Check: {}/{}", eta, eta_cut);
173+
Logger::get("CheckTriggerMatch")
174+
->debug("eta (trg) Value: {}, eta (reco) Value: {}",
175+
triggerobject_etas[idx], abs(particle.eta()));
167176
Logger::get("CheckTriggerMatch")
168177
->debug("-------------------------------------------------------");
169178
if (deltaR && bit && id && pt && eta) {
@@ -219,38 +228,38 @@ ROOT::RDF::RNode GenerateSingleTriggerFlag(
219228
const int &trigger_particle_id_cut, const int &triggerbit_cut,
220229
const float &DeltaR_threshold) {
221230

222-
auto triggermatch =
223-
[DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut,
224-
triggerbit_cut, hltpath](bool hltpath_match,
225-
const ROOT::Math::PtEtaPhiMVector &particle_p4,
226-
ROOT::RVec<int> triggerobject_bits,
227-
ROOT::RVec<int> triggerobject_ids,
228-
ROOT::RVec<float> triggerobject_pts,
229-
ROOT::RVec<float> triggerobject_etas,
230-
ROOT::RVec<float> triggerobject_phis) {
231-
Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger");
231+
auto triggermatch = [DeltaR_threshold, pt_cut, eta_cut,
232+
trigger_particle_id_cut, triggerbit_cut, hltpath](
233+
bool hltpath_match,
234+
const ROOT::Math::PtEtaPhiMVector &particle_p4,
235+
ROOT::RVec<int> triggerobject_bits,
236+
ROOT::RVec<int> triggerobject_ids,
237+
ROOT::RVec<float> triggerobject_pts,
238+
ROOT::RVec<float> triggerobject_etas,
239+
ROOT::RVec<float> triggerobject_phis) {
240+
Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger");
241+
Logger::get("CheckTriggerMatch")
242+
->debug("Selected trigger: {}", hltpath);
243+
bool result = false;
244+
bool match_result = false;
245+
if (hltpath_match) {
232246
Logger::get("CheckTriggerMatch")
233-
->debug("Selected trigger: {}", hltpath);
234-
bool result = false;
235-
bool match_result = false;
236-
if (hltpath_match) {
237-
Logger::get("CheckTriggerMatch")
238-
->debug("Checking Triggerobject match with particles ....");
239-
match_result = matchParticle(
240-
particle_p4, triggerobject_pts, triggerobject_etas,
241-
triggerobject_phis, triggerobject_bits, triggerobject_ids,
242-
DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut,
243-
triggerbit_cut);
244-
}
245-
result = hltpath_match & match_result;
246-
Logger::get("GenerateSingleTriggerFlag")
247-
->debug("---> HLT Match: {}", hltpath_match);
248-
Logger::get("GenerateSingleTriggerFlag")
249-
->debug("---> Total Match: {}", match_result);
250-
Logger::get("GenerateSingleTriggerFlag")
251-
->debug("--->>>> result: {}", result);
252-
return result;
253-
};
247+
->debug("Checking Triggerobject match with particles ....");
248+
match_result = matchParticle(
249+
particle_p4, triggerobject_pts, triggerobject_etas,
250+
triggerobject_phis, triggerobject_bits, triggerobject_ids,
251+
DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut,
252+
triggerbit_cut);
253+
}
254+
result = hltpath_match & match_result;
255+
Logger::get("GenerateSingleTriggerFlag")
256+
->debug("---> HLT Match: {}", hltpath_match);
257+
Logger::get("GenerateSingleTriggerFlag")
258+
->debug("---> Total Match: {}", match_result);
259+
Logger::get("GenerateSingleTriggerFlag")
260+
->debug("--->>>> result: {}", result);
261+
return result;
262+
};
254263
auto available_trigger = df.GetColumnNames();
255264
std::vector<std::string> matched_trigger_names;
256265
std::regex hltpath_regex = std::regex(hltpath);
@@ -365,7 +374,7 @@ ROOT::RDF::RNode GenerateDoubleTriggerFlag(
365374
ROOT::RVec<float> triggerobject_phis) {
366375
Logger::get("GenerateDoubleTriggerFlag")->debug("Checking Trigger");
367376
Logger::get("CheckTriggerMatch")
368-
->debug("Selected trigger: {}", hltpath);
377+
->debug("Selected trigger: {}", hltpath);
369378
bool result = false;
370379
bool match_result_p1 = false;
371380
bool match_result_p2 = false;
@@ -669,25 +678,34 @@ bool matchParticle(const ROOT::Math::PtEtaPhiMVector &particle,
669678
(trigger_particle_pt_cut < 0.) ||
670679
(triggerobject_pts[idx] > trigger_particle_pt_cut);
671680
Logger::get("CheckTriggerMatch")
672-
->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(), particle.eta(), particle.phi(), particle.mass());
681+
->debug("Partice Lorentz Vector: {}, {}, {}, {}", particle.pt(),
682+
particle.eta(), particle.phi(), particle.mass());
673683
Logger::get("CheckTriggerMatch")
674684
->debug("-------------------------------------------------------");
675-
Logger::get("CheckTriggerMatch")->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR);
685+
Logger::get("CheckTriggerMatch")
686+
->debug("deltaR/matchDeltaR Check: {}/{}", deltaR, matchDeltaR);
676687
Logger::get("CheckTriggerMatch")
677688
->debug("deltaR Value: {}",
678689
ROOT::Math::VectorUtil::DeltaR(triggerobject, particle));
679-
Logger::get("CheckTriggerMatch")->debug("id/trigger_particle_id_cut Check: {}/{}", id, trigger_particle_id_cut);
690+
Logger::get("CheckTriggerMatch")
691+
->debug("id/trigger_particle_id_cut Check: {}/{}", id,
692+
trigger_particle_id_cut);
680693
Logger::get("CheckTriggerMatch")
681694
->debug("id Value: {}", triggerobject_ids[idx]);
682-
Logger::get("CheckTriggerMatch")->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut);
695+
Logger::get("CheckTriggerMatch")
696+
->debug("bit/triggerbit_cut Check: {}/{}", bit, triggerbit_cut);
683697
Logger::get("CheckTriggerMatch")
684698
->debug("bit Value: {}", IntBits(triggerobject_bits[idx]));
685-
Logger::get("CheckTriggerMatch")->debug("pt/pt_cut Check: {}/{}", pt, pt_cut);
686699
Logger::get("CheckTriggerMatch")
687-
->debug("pt Value (trg): {}, pt Value (reco): {}", triggerobject_pts[idx], particle.pt());
688-
Logger::get("CheckTriggerMatch")->debug("eta/eta_cut Check: {}/{}", eta, eta_cut);
700+
->debug("pt/pt_cut Check: {}/{}", pt, pt_cut);
701+
Logger::get("CheckTriggerMatch")
702+
->debug("pt Value (trg): {}, pt Value (reco): {}",
703+
triggerobject_pts[idx], particle.pt());
689704
Logger::get("CheckTriggerMatch")
690-
->debug("eta (trg) Value: {}, eta (reco) Value: {}", triggerobject_etas[idx], abs(particle.eta()));
705+
->debug("eta/eta_cut Check: {}/{}", eta, eta_cut);
706+
Logger::get("CheckTriggerMatch")
707+
->debug("eta (trg) Value: {}, eta (reco) Value: {}",
708+
triggerobject_etas[idx], abs(particle.eta()));
691709
Logger::get("CheckTriggerMatch")
692710
->debug("-------------------------------------------------------");
693711
if (deltaR && bit && id && pt && eta && trigger_particle_pt) {
@@ -743,7 +761,8 @@ ROOT::RDF::RNode MatchSingleTriggerObject(
743761
const float &DeltaR_threshold, const float &trigger_particle_pt_cut) {
744762

745763
auto triggermatch = [DeltaR_threshold, pt_cut, eta_cut,
746-
trigger_particle_id_cut, triggerbit_cut, trigger_particle_pt_cut](
764+
trigger_particle_id_cut, triggerbit_cut,
765+
trigger_particle_pt_cut](
747766
const ROOT::Math::PtEtaPhiMVector &particle_p4,
748767
ROOT::RVec<int> triggerobject_bits,
749768
ROOT::RVec<int> triggerobject_ids,
@@ -753,11 +772,11 @@ ROOT::RDF::RNode MatchSingleTriggerObject(
753772
Logger::get("MatchSingleTriggerObject")->debug("Checking Trigger");
754773
Logger::get("MatchSingleTriggerObject")
755774
->debug("Checking Triggerobject match with particles ....");
756-
bool match_result =
757-
matchParticle(particle_p4, triggerobject_pts, triggerobject_etas,
758-
triggerobject_phis, triggerobject_bits,
759-
triggerobject_ids, DeltaR_threshold, pt_cut, eta_cut,
760-
trigger_particle_id_cut, triggerbit_cut, trigger_particle_pt_cut);
775+
bool match_result = matchParticle(
776+
particle_p4, triggerobject_pts, triggerobject_etas,
777+
triggerobject_phis, triggerobject_bits, triggerobject_ids,
778+
DeltaR_threshold, pt_cut, eta_cut, trigger_particle_id_cut,
779+
triggerbit_cut, trigger_particle_pt_cut);
761780
Logger::get("MatchSingleTriggerObject")
762781
->debug("--->>>> match_result: {}", match_result);
763782
return match_result;
@@ -821,7 +840,7 @@ ROOT::RDF::RNode GenerateSingleTriggerFlag(
821840
ROOT::RVec<float> triggerobject_phis) {
822841
Logger::get("GenerateSingleTriggerFlag")->debug("Checking Trigger");
823842
Logger::get("CheckTriggerMatch")
824-
->debug("Selected trigger: {}", hltpath);
843+
->debug("Selected trigger: {}", hltpath);
825844
bool result = false;
826845
bool match_result = false;
827846
if (hltpath_match) {
@@ -1082,7 +1101,7 @@ ROOT::RDF::RNode GetPrescaleValues(ROOT::RDF::RNode df,
10821101
Logger::get("prescale")
10831102
->debug("... checking lumi {}, prescale {} ...",
10841103
std::stoi(i_key), int(i_value));
1085-
if (lumiblock > std::stoi(i_key)) {
1104+
if (lumiblock >= std::stoi(i_key)) {
10861105
if (std::stoi(i_key) >= highest_lumi) {
10871106
highest_lumi = std::stoi(i_key);
10881107
prescale = i_value;

0 commit comments

Comments
 (0)