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

[15_0] ZS added to L1TCaloLayer1 #47433

Open
wants to merge 10 commits into
base: CMSSW_15_0_X
Choose a base branch
from
+173 −2
Open

[15_0] ZS added to L1TCaloLayer1 #47433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7f9e776
Update L1TCaloLayer1FetchLUTs.cc
asavincms Feb 12, 2025
ed7ab6d
Add files via upload
asavincms Feb 12, 2025
2d8d175
Add files via upload
asavincms Feb 12, 2025
e2fef4c
Add files via upload
asavincms Feb 12, 2025
ee62c9b
ZS added for E/HCal
asavincms Feb 12, 2025
e2379cd
Update L1TCaloLayer1FetchLUTs.cc
asavincms Feb 13, 2025
446262f
Update L1TCaloLayer1FetchLUTs.cc
asavincms Feb 13, 2025
f195a67
Update L1TCaloLayer1FetchLUTs.cc
asavincms Feb 13, 2025
d89a6db
Add files via upload
asavincms Feb 13, 2025
0276bfc
Update L1TCaloLayer1FetchLUTs.cc
asavincms Feb 18, 2025
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
7 changes: 6 additions & 1 deletion L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ bool L1TCaloLayer1FetchLUTs(
}
size_t numEcalPhiBins = (*std::max_element(ecalScalePhiBins.begin(), ecalScalePhiBins.end())) + 1;
auto ecalSF = caloParams.layer1ECalScaleFactors();
auto ecalZSF = caloParams.layer1ECalZSFactors();
if (ecalSF.size() != ecalScaleETBins.size() * numEcalPhiBins * 28) {
edm::LogError("L1TCaloLayer1FetchLUTs") << "caloParams.layer1ECalScaleFactors().size() != "
"caloParams.layer1ECalScaleETBins().size()*numEcalPhiBins*28 !!";
Expand All @@ -97,6 +98,7 @@ bool L1TCaloLayer1FetchLUTs(
}
size_t numHcalPhiBins = (*std::max_element(hcalScalePhiBins.begin(), hcalScalePhiBins.end())) + 1;
auto hcalSF = caloParams.layer1HCalScaleFactors();
auto hcalZSF = caloParams.layer1HCalZSFactors();
if (hcalSF.size() != hcalScaleETBins.size() * numHcalPhiBins * 28) {
edm::LogError("L1TCaloLayer1FetchLUTs") << "caloParams.layer1HCalScaleFactors().size() != "
"caloParams.layer1HCalScaleETBins().size()*numHcalPhiBins*28 !!";
Expand Down Expand Up @@ -195,6 +197,8 @@ bool L1TCaloLayer1FetchLUTs(
calibratedECalInput *= ecalSF.at(phiBin * ecalScaleETBins.size() * 28 + etBin * 28 + etaBin);
if (useLSB)
calibratedECalInput /= caloLSB;
if (ecalZSF.size() >= 28 && ecalInput < ecalZSF.size() / 28 - 1)
calibratedECalInput *= ecalZSF.at(ecalInput * 28 + etaBin);

value = calibratedECalInput;
if (fwVersion > 2) {
Expand Down Expand Up @@ -261,7 +265,8 @@ bool L1TCaloLayer1FetchLUTs(
calibratedHcalInput *= hcalSF.at(phiBin * hcalScaleETBins.size() * 28 + etBin * 28 + etaBin);
if (useLSB)
calibratedHcalInput /= caloLSB;

if (hcalZSF.size() >= 28 && hcalInput < hcalZSF.size() / 28 - 1)
calibratedHcalInput *= hcalZSF.at(hcalInput * 28 + etaBin);
value = calibratedHcalInput;
if (fwVersion > 2) {
// Saturate if either decompressed value is over 127.5 GeV or input saturated
Expand Down
8 changes: 7 additions & 1 deletion L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ namespace l1t {
layer1HCalFBUpper = 50,
layer1HCalFBLower = 51,
hiZDC = 52,
NUM_CALOPARAMNODES = 53
layer1ECalZS = 53,
layer1HCalZS = 54,
NUM_CALOPARAMNODES = 55
};

CaloParamsHelper() { pnode_.resize(NUM_CALOPARAMNODES); }
Expand Down Expand Up @@ -556,6 +558,8 @@ namespace l1t {
}

// Layer 1 LUT specification
std::vector<double> const& layer1ECalZSFactors() const { return pnode_[layer1ECalZS].dparams_; }
std::vector<double> const& layer1HCalZSFactors() const { return pnode_[layer1HCalZS].dparams_; }
std::vector<double> const& layer1ECalScaleFactors() const { return pnode_[layer1ECal].dparams_; }
std::vector<double> const& layer1HCalScaleFactors() const { return pnode_[layer1HCal].dparams_; }
std::vector<double> const& layer1HFScaleFactors() const { return pnode_[layer1HF].dparams_; }
Expand All @@ -567,6 +571,8 @@ namespace l1t {
std::vector<unsigned> const& layer1ECalScalePhiBins() const { return pnode_[layer1ECal].uparams_; }
std::vector<unsigned> const& layer1HCalScalePhiBins() const { return pnode_[layer1HCal].uparams_; }
std::vector<unsigned> const& layer1HFScalePhiBins() const { return pnode_[layer1HF].uparams_; }
void setLayer1ECalZSFactors(std::vector<double> params) { pnode_[layer1ECalZS].dparams_ = std::move(params); }
void setLayer1HCalZSFactors(std::vector<double> params) { pnode_[layer1HCalZS].dparams_ = std::move(params); }
void setLayer1ECalScaleFactors(std::vector<double> params) { pnode_[layer1ECal].dparams_ = std::move(params); }
void setLayer1HCalScaleFactors(std::vector<double> params) { pnode_[layer1HCal].dparams_ = std::move(params); }
void setLayer1HFScaleFactors(std::vector<double> params) { pnode_[layer1HF].dparams_ = std::move(params); }
Expand Down
2 changes: 2 additions & 0 deletions L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ L1TCaloParamsESProducer::L1TCaloParamsESProducer(const edm::ParameterSet& conf)
m_params_helper.setQ2LUT(*q2LUT);

// Layer 1 LUT specification
m_params_helper.setLayer1ECalZSFactors(conf.getParameter<std::vector<double>>("layer1ECalZSFactors"));
m_params_helper.setLayer1HCalZSFactors(conf.getParameter<std::vector<double>>("layer1HCalZSFactors"));
m_params_helper.setLayer1ECalScaleFactors(conf.getParameter<std::vector<double>>("layer1ECalScaleFactors"));
m_params_helper.setLayer1HCalScaleFactors(conf.getParameter<std::vector<double>>("layer1HCalScaleFactors"));
m_params_helper.setLayer1HFScaleFactors(conf.getParameter<std::vector<double>>("layer1HFScaleFactors"));
Expand Down
2 changes: 2 additions & 0 deletions L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ L1TCaloStage2ParamsESProducer::L1TCaloStage2ParamsESProducer(const edm::Paramete
m_params_helper.setQ2LUT(*q2LUT);

// Layer 1 LUT specification
m_params_helper.setLayer1ECalZSFactors(conf.getParameter<std::vector<double>>("layer1ECalZSFactors"));
m_params_helper.setLayer1HCalZSFactors(conf.getParameter<std::vector<double>>("layer1HCalZSFactors"));
m_params_helper.setLayer1ECalScaleFactors(conf.getParameter<std::vector<double>>("layer1ECalScaleFactors"));
m_params_helper.setLayer1HCalScaleFactors(conf.getParameter<std::vector<double>>("layer1HCalScaleFactors"));
m_params_helper.setLayer1HFScaleFactors(conf.getParameter<std::vector<double>>("layer1HFScaleFactors"));
Expand Down
Loading