Skip to content
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

remove normalisation by area in seeding #468

Merged
merged 9 commits into from
Jul 27, 2021
Merged

remove normalisation by area in seeding #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b984be
remove normalisation by area in seeding
echapon Apr 12, 2021
4734a02
Add custominsation function
echapon Jul 1, 2021
1e6a739
Default to mod. seeding with thr=20
echapon Jul 7, 2021
3916fdf
code-format
echapon Jul 7, 2021
49e646f
remove normalisation by area in seeding
echapon Apr 12, 2021
7b75999
Add custominsation function
echapon Jul 1, 2021
1bf0432
JB's comments to the PR
echapon Jul 19, 2021
c575216
code-formats and fixes in customHistoSeeding.py
echapon Jul 23, 2021
1d48cf4
Remove duplicated code
echapon Jul 23, 2021
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
3 changes: 3 additions & 0 deletions L1Trigger/L1THGCal/interface/backend/HGCalHistoSeedingImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ class HGCalHistoSeedingImpl {
std::vector<double> neighbour_weights_;
std::vector<double> smoothing_ecal_;
std::vector<double> smoothing_hcal_;
bool seeds_norm_by_area_;

float area_10pct_;

HGCalTriggerTools triggerTools_;
Navigator navigator_;
Expand Down
6 changes: 6 additions & 0 deletions L1Trigger/L1THGCal/python/customHistoSeeding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,9 @@ def custom_3dclustering_XYHistoMax(process,
process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d
return process

def custom_3dclustering_seedNoArea(process,
Copy link

Choose a reason for hiding this comment

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

The function should return process

seed_threshold=cms.double(20)):
parameters_c3d = histoMax_C3d_seeding_params.clone(seeds_norm_by_area = False,
threshold_histo_multicluster = seed_threshold)
process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d
return process
1 change: 1 addition & 0 deletions L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
seeding_space=cms.string("RPhi"),# RPhi, XY
seed_smoothing_ecal=seed_smoothing_ecal,
seed_smoothing_hcal=seed_smoothing_hcal,
seeds_norm_by_area=cms.bool(True)
)

histoMax_C3d_clustering_params = cms.PSet(dR_multicluster=cms.double(0.03),
Expand Down
19 changes: 16 additions & 3 deletions L1Trigger/L1THGCal/src/backend/HGCalHistoSeedingImpl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ HGCalHistoSeedingImpl::HGCalHistoSeedingImpl(const edm::ParameterSet& conf)
neighbour_weights_(conf.getParameter<std::vector<double>>("neighbour_weights")),
smoothing_ecal_(conf.getParameter<std::vector<double>>("seed_smoothing_ecal")),
smoothing_hcal_(conf.getParameter<std::vector<double>>("seed_smoothing_hcal")),
seeds_norm_by_area_(conf.getParameter<bool>("seeds_norm_by_area")),
kROverZMin_(conf.getParameter<double>("kROverZMin")),
kROverZMax_(conf.getParameter<double>("kROverZMax")) {
if (seedingAlgoType_ == "HistoMaxC3d") {
Expand Down Expand Up @@ -64,6 +65,13 @@ HGCalHistoSeedingImpl::HGCalHistoSeedingImpl(const edm::ParameterSet& conf)
<< "Inconsistent size of neighbour weights vector in HGCalMulticlustering ( " << neighbour_weights_.size()
<< " ). Should be " << neighbour_weights_size_ << "\n";
}

// compute quantities for non-normalised-by-area histoMax
// The 0.1 factor in bin1_10pct is an attempt to keep the same rough scale for seeds. The exact value is arbitrary.
int bin1_10pct = (int)0.1 * nBins1_;
float R1_10pct = kROverZMin_ + bin1_10pct * (kROverZMax_ - kROverZMin_) / nBins1_;
float R2_10pct = R1_10pct + ((kROverZMax_ - kROverZMin_) / nBins1_);
area_10pct_ = ((M_PI * (pow(R2_10pct, 2) - pow(R1_10pct, 2))) / nBins2_);
}

HGCalHistoSeedingImpl::Histogram HGCalHistoSeedingImpl::fillHistoClusters(
Expand Down Expand Up @@ -166,16 +174,21 @@ HGCalHistoSeedingImpl::Histogram HGCalHistoSeedingImpl::fillSmoothPhiHistoCluste
for (int z_side : {-1, 1}) {
for (unsigned bin1 = 0; bin1 < nBins1_; bin1++) {
int nBinsSide = (binSums[bin1] - 1) / 2;
float R1 = kROverZMin_ + bin1 * (kROverZMax_ - kROverZMin_) / nBins1_;
float R2 = R1 + ((kROverZMax_ - kROverZMin_) / nBins1_);
double area =
((M_PI * (pow(R2, 2) - pow(R1, 2))) / nBins2_) *
(1 +
2.0 *
(1 -
pow(0.5,
nBinsSide))); // Takes into account different area of bins in different R-rings + sum of quadratic weights used

if (seeds_norm_by_area_) {
float R1 = kROverZMin_ + bin1 * (kROverZMax_ - kROverZMin_) / nBins1_;
float R2 = R1 + ((kROverZMax_ - kROverZMin_) / nBins1_);
area = area * ((M_PI * (pow(R2, 2) - pow(R1, 2))) / nBins2_);
} else {
area = area * area_10pct_;
}

for (unsigned bin2 = 0; bin2 < nBins2_; bin2++) {
const auto& bin_orig = histoClusters.at(z_side, bin1, bin2);
float content = bin_orig.values[Bin::Content::Sum];
Expand Down