diff --git a/RecoTracker/LSTCore/standalone/code/core/trkCore.cc b/RecoTracker/LSTCore/standalone/code/core/trkCore.cc index f782308d4cffd..7ed8c96706e6a 100644 --- a/RecoTracker/LSTCore/standalone/code/core/trkCore.cc +++ b/RecoTracker/LSTCore/standalone/code/core/trkCore.cc @@ -388,7 +388,10 @@ std::vector matchedSimTrkIdxs(std::vector hitidxs, // Compute all permutations std::function> &, std::vector, size_t, std::vector> &)> perm = - [&](std::vector> &result, std::vector intermediate, size_t n, std::vector> &va) { + [&](std::vector> &result, + std::vector intermediate, + size_t n, + std::vector> &va) { // std::cout << " 'called': " << "called" << std::endl; if (va.size() > n) { for (auto x : va[n]) { diff --git a/RecoTracker/LSTCore/standalone/code/core/trktree.cc b/RecoTracker/LSTCore/standalone/code/core/trktree.cc index 87cd32b334d01..fb3e36c4c315b 100644 --- a/RecoTracker/LSTCore/standalone/code/core/trktree.cc +++ b/RecoTracker/LSTCore/standalone/code/core/trktree.cc @@ -6744,7 +6744,9 @@ namespace tas { const std::vector > &simhit_hitType() { return trk.simhit_hitType(); } const std::vector &ph2_isUpper() { return trk.ph2_isUpper(); } const std::vector &see_nStrip() { return trk.see_nStrip(); } - const std::vector &trk_bestSimTrkShareFracSimClusterDenom() { return trk.trk_bestSimTrkShareFracSimClusterDenom(); } + const std::vector &trk_bestSimTrkShareFracSimClusterDenom() { + return trk.trk_bestSimTrkShareFracSimClusterDenom(); + } const std::vector &simhit_side() { return trk.simhit_side(); } const std::vector &simhit_x() { return trk.simhit_x(); } const std::vector &see_q() { return trk.see_q(); } diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc index 36d1da7da835b..4ed069536ec39 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc +++ b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc @@ -709,7 +709,7 @@ void setGnnNtupleMiniDoublet(SDL::Event* event, unsigned int MD) { //________________________________________________________________________________________________________________________________ std::tuple> parseTrackCandidate(SDL::Event* event, - unsigned int idx) { + unsigned int idx) { // Get the type of the track candidate SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); short type = trackCandidatesInGPU.trackCandidateType[idx]; @@ -742,8 +742,8 @@ std::tuple> parseTrackCandidate( } //________________________________________________________________________________________________________________________________ -std::tuple, std::vector> parsepT5(SDL::Event* event, - unsigned int idx) { +std::tuple, std::vector> parsepT5( + SDL::Event* event, unsigned int idx) { // Get relevant information SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); SDL::quintupletsBuffer& quintupletsInGPU = (*event->getQuintuplets()); @@ -854,8 +854,8 @@ std::tuple, std::vector, std::vector> parsepT3(SDL::Event* event, - unsigned int idx) { +std::tuple, std::vector> parsepT3( + SDL::Event* event, unsigned int idx) { // Get relevant information SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); SDL::tripletsBuffer& tripletsInGPU = (*event->getTriplets()); @@ -889,8 +889,8 @@ std::tuple, std::vector, std::vector> parseT5(SDL::Event* event, - unsigned int idx) { +std::tuple, std::vector> parseT5( + SDL::Event* event, unsigned int idx) { SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); SDL::quintupletsBuffer& quintupletsInGPU = (*event->getQuintuplets()); unsigned int T5 = trackCandidatesInGPU.directObjectIndices[idx]; @@ -923,8 +923,8 @@ std::tuple, std::vector, std::vector> parsepLS(SDL::Event* event, - unsigned int idx) { +std::tuple, std::vector> parsepLS( + SDL::Event* event, unsigned int idx) { SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); SDL::segmentsBuffer& segmentsInGPU = (*event->getSegments()); diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h index 66bb20e34080f..811aedd58f809 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h +++ b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h @@ -26,15 +26,16 @@ void setPixelTripletOutputBranches(SDL::Event* event); void setGnnNtupleBranches(SDL::Event* event); void setGnnNtupleMiniDoublet(SDL::Event* event, unsigned int MD); -std::tuple> parseTrackCandidate(SDL::Event* event, unsigned int); -std::tuple, std::vector> parsepT5(SDL::Event* event, - unsigned int); -std::tuple, std::vector> parsepT3(SDL::Event* event, - unsigned int); -std::tuple, std::vector> parseT5(SDL::Event* event, - unsigned int); -std::tuple, std::vector> parsepLS(SDL::Event* event, - unsigned int); +std::tuple> parseTrackCandidate(SDL::Event* event, + unsigned int); +std::tuple, std::vector> parsepT5( + SDL::Event* event, unsigned int); +std::tuple, std::vector> parsepT3( + SDL::Event* event, unsigned int); +std::tuple, std::vector> parseT5( + SDL::Event* event, unsigned int); +std::tuple, std::vector> parsepLS( + SDL::Event* event, unsigned int); // Print multiplicities void printMiniDoubletMultiplicities(SDL::Event* event); diff --git a/RecoTracker/LSTCore/standalone/code/rooutil/anautil.cc b/RecoTracker/LSTCore/standalone/code/rooutil/anautil.cc index e67f6b41a7f83..cb30b70665860 100644 --- a/RecoTracker/LSTCore/standalone/code/rooutil/anautil.cc +++ b/RecoTracker/LSTCore/standalone/code/rooutil/anautil.cc @@ -576,7 +576,10 @@ void RooUtil::Cutflow::fillCutflow(std::vector& cutlist, THist* h, THis } //_______________________________________________________________________________________________________ -void RooUtil::Cutflow::fillCutflow_v2(std::vector& cuttreelist, THist* h, THist* hraw, float wgtsyst) { +void RooUtil::Cutflow::fillCutflow_v2(std::vector& cuttreelist, + THist* h, + THist* hraw, + float wgtsyst) { for (unsigned int i = 0; i < cuttreelist.size(); ++i) { RooUtil::CutTree* ct = cuttreelist[i]; // if (std::find(cutflow_nofill_cut_list.begin(), cutflow_nofill_cut_list.end(), ct->name) != cutflow_nofill_cut_list.end()) diff --git a/RecoTracker/LSTCore/standalone/code/rooutil/anautil.h b/RecoTracker/LSTCore/standalone/code/rooutil/anautil.h index 97d48b8f4771b..b0232638d3761 100644 --- a/RecoTracker/LSTCore/standalone/code/rooutil/anautil.h +++ b/RecoTracker/LSTCore/standalone/code/rooutil/anautil.h @@ -208,16 +208,18 @@ namespace RooUtil { TString = ""); void bookVecHistogram( TString, - std::pair()>, std::function()>>>, + std::pair< + TString, + std::tuple()>, std::function()>>>, TString = ""); void bookHistogram(TString, std::pair, std::function>>, TString = ""); void bookVecHistogram( TString, - std::pair, std::function()>, std::function()>>>, + std::pair< + TString, + std::tuple, std::function()>, std::function()>>>, TString = ""); void book2DHistogram( TString,