Skip to content

Increase layer number for HCAL validation. #50929

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 2 commits into from
May 16, 2026
Merged

Increase layer number for HCAL validation. #50929

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
beb5604
Increase layer number for HCAL validation.
bfonta May 13, 2026
670b9f4
Fix comment on the number of barrel layers.
bfonta May 13, 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
2 changes: 1 addition & 1 deletion Validation/HGCalValidation/plugins/BarrelValidator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ void BarrelValidator::fillDescriptions(edm::ConfigurationDescriptions& descripti
desc.add<edm::InputTag>("cpTag_", edm::InputTag("mix", "MergedCaloTruth"));
desc.add<edm::InputTag>("sclTag", edm::InputTag("mix", "MergedCaloTruth"));
desc.add<edm::InputTag>("simVertices", edm::InputTag("g4SimHits"));
desc.add<int>("totallayers_to_monitor", 5);
desc.add<int>("totallayers_to_monitor", 6); // ECAL: 1 layer, HCAL Barrel: 4 depths, HCAL Outer Barrel: 1 depth
desc.add<std::string>("dirName", "BarrelCalorimeters/BarrelValidator/");
descriptions.add("barrelValidator", desc);
}
17 changes: 9 additions & 8 deletions Validation/HGCalValidation/src/BarrelVHistoProducerAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ void BarrelVHistoProducerAlgo::fill_caloparticle_histos(
simHits += barrel_hf.size();
for (auto const& h_and_f : barrel_hf) {
const auto hitDetId = h_and_f.first;
const int layerId = recHitTools_->getLayerWithOffset(hitDetId);
auto layerId = recHitTools_->getLayerWithOffset(hitDetId);
// set to 0 if matched RecHit not found
int layerId_matched_min = 999;
int layerId_matched_max = 0;
Expand Down Expand Up @@ -746,8 +746,8 @@ void BarrelVHistoProducerAlgo::fill_caloparticle_histos(
LogDebug("BarrelValidator") << " matched to RecHit NOT found !" << std::endl;
}

minLayerId = std::min(minLayerId, layerId);
maxLayerId = std::max(maxLayerId, layerId);
minLayerId = std::min(minLayerId, static_cast<int>(layerId));
maxLayerId = std::max(maxLayerId, static_cast<int>(layerId));
minLayerId_matched = std::min(minLayerId_matched, layerId_matched_min);
maxLayerId_matched = std::max(maxLayerId_matched, layerId_matched_max);
}
Expand Down Expand Up @@ -805,7 +805,8 @@ void BarrelVHistoProducerAlgo::BarrelVHistoProducerAlgo::fill_simCluster_histos(
const DetId sh_detid = hAndF.first;

//The layer the cluster belongs to
int layerid = recHitTools_->getLayerWithOffset(sh_detid);
auto layerid = recHitTools_->getLayerWithOffset(sh_detid);
assert(layerid < layers);
if (occurenceSCinlayer[layerid] == 0) {
tnscpl[layerid]++;
}
Expand Down Expand Up @@ -926,7 +927,7 @@ void BarrelVHistoProducerAlgo::layerClusters_to_CaloParticles(
// >=0 --> index of the linked CaloParticle
std::vector<int> hitsToCaloParticleId(numberOfHitsInLC);
const auto firstHitDetId = hits_and_fractions[0].first;
int lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
auto lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
bool isBarrel = recHitTools_->isBarrel(firstHitDetId);
if (!isBarrel)
continue;
Expand Down Expand Up @@ -990,7 +991,7 @@ void BarrelVHistoProducerAlgo::layerClusters_to_CaloParticles(
for (unsigned int lcId = 0; lcId < nLayerClusters; ++lcId) {
const auto firstHitDetId = (clusters[lcId].hitsAndFractions())[0].first;
bool isBarrel = recHitTools_->isBarrel(firstHitDetId);
int lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
auto lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
if (!isBarrel)
continue;
histograms.h_denom_layercl_eta_perlayer.at(lcLayerId)->Fill(clusters[lcId].eta());
Expand Down Expand Up @@ -1278,7 +1279,7 @@ void BarrelVHistoProducerAlgo::layerClusters_to_SimClusters(
bool isBarrel = recHitTools_->isBarrel(firstHitDetId);
if (!isBarrel)
return 9999u;
unsigned int lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
auto lcLayerId = recHitTools_->getLayerWithOffset(firstHitDetId);
return lcLayerId;
};

Expand Down Expand Up @@ -1367,7 +1368,7 @@ void BarrelVHistoProducerAlgo::fill_generic_cluster_histos(
continue;
}
const float lc_en = lcId.energy();
int layerid = recHitTools_->getLayerWithOffset(seedid);
auto layerid = recHitTools_->getLayerWithOffset(seedid);
//Energy clustered per layer
tecpl[layerid] += lc_en;
tnlcpl[layerid] += 1;
Expand Down