Skip to content

bug fix in vertex selection of L2TauTagNNProducer #37291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 10 commits into from
Mar 28, 2022
+68 −95
Merged

bug fix in vertex selection of L2TauTagNNProducer #37291

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f1e90e9
bug fix in vertex selection
valeriadamante Mar 21, 2022
6981053
removed cout
valeriadamante Mar 21, 2022
7d0eef9
fix of vertices selection and code-checks
valeriadamante Mar 22, 2022
2475aeb
removed endl calls from logWarning
valeriadamante Mar 22, 2022
d8d790c
apply code checks
valeriadamante Mar 23, 2022
18448f4
comments implemented
valeriadamante Mar 23, 2022
c74d9c0
apply code checks again
valeriadamante Mar 24, 2022
6b5abf0
new ndof definition and then apply code checks again
valeriadamante Mar 24, 2022
074a706
maxVtx condition added and removed commented lines
valeriadamante Mar 25, 2022
c76cfb5
apply code checks
valeriadamante Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions RecoTauTag/HLTProducers/src/L2TauTagNNProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ class L2TauNNProducer : public edm::stream::EDProducer<edm::GlobalCache<L2TauNNP
const reco::BeamSpot& beamspot,
const MagneticField* magfi);
std::vector<int> selectGoodVertices(const ZVertexSoA& patavtx_soa,
const pixelTrack::TrackSoA& patatracks_tsoa,
const std::vector<int>& TrackGood);
const pixelTrack::TrackSoA& patatracks_tsoa );
std::pair<float, float> impactParameter(int it,
const pixelTrack::TrackSoA& patatracks_tsoa,
float patatrackPhi,
Expand Down Expand Up @@ -567,31 +566,33 @@ void L2TauNNProducer::fillCaloRecHits(tensorflow::Tensor& cellGridMatrix,
}

std::vector<int> L2TauNNProducer::selectGoodVertices(const ZVertexSoA& patavtx_soa,
const pixelTrack::TrackSoA& patatracks_tsoa,
const std::vector<int>& TrackGood) {
auto maxTracks = patatracks_tsoa.stride();
const int nv = patavtx_soa.nvFinal;
std::vector<int> VtxGood;
if (nv == 0)
return VtxGood;
VtxGood.reserve(nv);

std::vector<double> maxChi2_;
std::vector<double> pTSquaredSum(nv);

for (int j = nv - 1; j >= 0; --j) {
std::vector<int> trk_ass_to_vtx;
auto vtx_idx = patavtx_soa.sortInd[j];
assert(vtx_idx < nv);
for (int trk_idx = 0; trk_idx < maxTracks; trk_idx++) {
int vtx_ass_to_track = patavtx_soa.idv[trk_idx];
if (vtx_ass_to_track == int16_t(vtx_idx))
trk_ass_to_vtx.push_back(trk_idx);
}
auto nt = trk_ass_to_vtx.size();
if (nt == 0) {
continue;
}
const pixelTrack::TrackSoA& patatracks_tsoa) {
auto maxTracks = patatracks_tsoa.stride();
const int nv = patavtx_soa.nvFinal;
std::vector<int> VtxGood;
if (nv == 0)
return VtxGood;
VtxGood.reserve(nv);

std::vector<double> maxChi2_;
std::vector<double> pTSquaredSum(nv);

for (int j = nv - 1; j >= 0; --j) {
Copy link
Contributor

@VinInn VinInn Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this double loop is not required.
enough to loop on the tracks, apply selection, and fill pTSquaredSum directly.
No need to sort either as the algorithms is just using the max (not even the location, just the max value of pt2sum).

std::vector<int> trk_ass_to_vtx;
auto vtx_idx = patavtx_soa.sortInd[j];
assert(vtx_idx < nv);
for (int trk_idx = 0; trk_idx < maxTracks; trk_idx++) {
auto nHits = patatracks_tsoa.nHits(trk_idx);
if (nHits == 0)
break;
int vtx_ass_to_track = patavtx_soa.idv[trk_idx];
if (vtx_ass_to_track == int16_t(vtx_idx))
trk_ass_to_vtx.push_back(trk_idx);
}
auto nt = trk_ass_to_vtx.size();
if (nt == 0) {
continue;
}
if (nt < 2) {
trk_ass_to_vtx.clear();
continue;
Expand Down Expand Up @@ -699,7 +700,7 @@ void L2TauNNProducer::fillPatatracks(tensorflow::Tensor& cellGridMatrix,
TrackGood.push_back(it);
}

std::vector<int> VtxGood = selectGoodVertices(patavtx_soa, patatracks_tsoa, TrackGood);
std::vector<int> VtxGood = selectGoodVertices(patavtx_soa, patatracks_tsoa);

for (const auto it : TrackGood) {
const float patatrackPt = patatracks_tsoa.pt[it];
Expand Down