Skip to content

HGCal validation histograms refactor #51565

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

Open
fdoljanin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

HGCal validation histograms refactor #51565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1e4f52
HGCal validation histograms refactor
fdoljanin Aug 6, 2026
ffa2215
Merge branch 'master' into 2D_hgcal_histograms
fdoljanin Sep 9, 2026
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
78 changes: 21 additions & 57 deletions Validation/HGCalValidation/interface/HGVHistoProducerAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
*/

#include <fstream>
#include <map>
#include <memory>
#include <optional>
#include <tuple>
#include <utility>
#include <vector>
#include <unordered_map>

Expand Down Expand Up @@ -34,6 +38,11 @@
#include "SimDataFormats/Associations/interface/TICLAssociationMap.h"

struct HGVHistoProducerAlgoHistograms {
using RegisteredHistogram = std::pair<int, dqm::reco::MonitorElement*>;
using HistogramKey = std::tuple<int, int, int>;

std::map<HistogramKey, std::vector<RegisteredHistogram>> registeredTracksterHistograms;

//Info
//To be able to spot any issues both in -z and +z a layer id was introduced
//that spans from 0 to 103 for hgcal_v9 geometry. The mapping for hgcal_v9 is:
Expand Down Expand Up @@ -159,20 +168,6 @@ struct HGVHistoProducerAlgoHistograms {
std::vector<dqm::reco::MonitorElement*> h_energy_vs_score_caloparticle2trackster[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_energy_vs_score_caloparticle2bestTrackster[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_energy_vs_score_caloparticle2bestTrackster2[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_trackster_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numMerge_trackster_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_trackster2caloparticle[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_trackster2bestCaloparticle[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_trackster2bestCaloparticle2[numberOfValidationTypes_];
Expand All @@ -183,41 +178,6 @@ struct HGVHistoProducerAlgoHistograms {
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_trackster2bestCaloparticle_vs_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_caloparticle2trackster_assoc_vs_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_sharedenergy_caloparticle2trackster_assoc_vs_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_trackster_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numEff_caloparticle_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_num_caloparticle_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_numDup_trackster_time[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_eta[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_phi[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_en[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_pt[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_R[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_alpha[numberOfValidationTypes_];
std::vector<dqm::reco::MonitorElement*> h_denom_caloparticle_time[numberOfValidationTypes_];
// Generic histograms
std::vector<dqm::reco::MonitorElement*> h_tracksternum;
std::vector<dqm::reco::MonitorElement*> h_conttracksternum;
Expand Down Expand Up @@ -257,8 +217,8 @@ class HGVHistoProducerAlgo {
using TracksterToTracksterMap = ticl::
TICLAssociationMap<ticl::mapWithSharedEnergyAndScore, std::vector<ticl::Trackster>, std::vector<ticl::Trackster>>;
using SimClusterToCaloParticleMap =
ticl::TICLAssociationMap<ticl::oneToOneMapWithFraction, std::vector<SimCluster>, std::vector<CaloParticle>>;
enum validationType { byHits_CP = 0, byLCs, byLCs_CP, byHits };
ticl::AssociationMap<ticl::oneToOneMapWithFraction, std::vector<SimCluster>, std::vector<CaloParticle>>;
enum TracksterAssociationType { byHits_CP = 0, byLCs, byLCs_CP, byHits };

HGVHistoProducerAlgo(const edm::ParameterSet& pset);
~HGVHistoProducerAlgo();
Expand Down Expand Up @@ -293,7 +253,10 @@ class HGVHistoProducerAlgo {

void bookTracksterHistos(DQMStore::IBooker& ibook, Histograms& histograms, unsigned int layers);

void bookTracksterSTSHistos(DQMStore::IBooker& ibook, Histograms& histograms, const validationType valType);
void bookTracksterSTSHistos(DQMStore::IBooker& ibook,
Histograms& histograms,
const TracksterAssociationType associationType,
int tracksterCollectionIndex);

void layerClusters_to_CaloParticles(const Histograms& histograms,
edm::Handle<reco::CaloClusterCollection> clusterHandle,
Expand Down Expand Up @@ -323,10 +286,10 @@ class HGVHistoProducerAlgo {
edm::MultiSpan<HGCRecHit> const& hits) const;

void tracksters_to_SimTracksters_fp(const Histograms& histograms,
const int count,
const int tracksterCollectionIndex,
const TracksterToTracksterMap& trackstersToSimTrackstersMap,
const TracksterToTracksterMap& simTrackstersToTrackstersMap,
const validationType valType,
const TracksterAssociationType associationType,
const SimClusterToCaloParticleMap& scToCpMap,
const std::vector<CaloParticle>& cP,
const std::vector<size_t>& cPIndices,
Expand Down Expand Up @@ -376,7 +339,7 @@ class HGVHistoProducerAlgo {
edm::MultiSpan<HGCRecHit> const& hits) const;
void fill_cluster_histos(const Histograms& histograms, const int count, const reco::CaloCluster& cluster) const;
void fill_trackster_histos(const Histograms& histograms,
const int count,
const int tracksterCollectionIndex,
const ticl::TracksterCollection& tracksters,
const reco::CaloClusterCollection& layerClusters,
const ticl::TracksterCollection& simTSs,
Expand Down Expand Up @@ -430,6 +393,8 @@ class HGVHistoProducerAlgo {
};

private:
class HistogramBuilder;

double getEta(double eta) const;

std::shared_ptr<ticlgeom::Tools> recHitTools_;
Expand All @@ -440,8 +405,6 @@ class HGVHistoProducerAlgo {
"SimTrackster Associated by LCs",
"SimTrackster from CP Associated by LCs",
"SimTrackster Associated by Hits"}};
// Must be in sync with labels in PostProcessorHGCAL_cfi.py
std::array<std::string, numberOfValidationTypes_> valSuffix_ = {{"_byHits_CP", "_byLCs", "_byLCs_CP", "_byHits"}};

//private data members
double minEta_, maxEta_;
Expand Down Expand Up @@ -524,6 +487,7 @@ class HGVHistoProducerAlgo {
int nintY_;
double minZ_, maxZ_;
int nintZ_;
std::unique_ptr<HistogramBuilder> histogramBuilder_;
};

#endif
8 changes: 4 additions & 4 deletions Validation/HGCalValidation/plugins/HGCalValidator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,20 +307,20 @@ void HGCalValidator::bookHistograms(DQMStore::IBooker& ibook,
// CP Linking by Hits
ibook.setCurrentFolder(dirName + "/" + label_TSbyHitsCP_);
histoProducerAlgo_->bookTracksterSTSHistos(
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::validationType::byHits_CP);
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::TracksterAssociationType::byHits_CP, www);
// CP Linking by LCs
ibook.setCurrentFolder(dirName + "/" + label_TSbyLCsCP_);

histoProducerAlgo_->bookTracksterSTSHistos(
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::validationType::byLCs_CP);
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::TracksterAssociationType::byLCs_CP, www);
// SimTracksters Linking by Hits
ibook.setCurrentFolder(dirName + "/" + label_TSbyHits_);
histoProducerAlgo_->bookTracksterSTSHistos(
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::validationType::byHits);
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::TracksterAssociationType::byHits, www);
// SimTracksters Linking by LCs
ibook.setCurrentFolder(dirName + "/" + label_TSbyLCs_);
histoProducerAlgo_->bookTracksterSTSHistos(
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::validationType::byLCs);
ibook, histograms.histoProducerAlgo, HGVHistoProducerAlgo::TracksterAssociationType::byLCs, www);
}
} //end of booking Tracksters loop

Expand Down
Loading