Merge pull request #47341 from asavincms/patch-4

ZS added to L1TCaloLayer1

Author: cmsbuild

L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc

@@ -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 !!";
@@ -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 !!";
@@ -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) {
@@ -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

L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h

@@ -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); }
@@ -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_; }
@@ -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); }

L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsESProducer.cc

@@ -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"));

L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc

@@ -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"));