Skip to content

Commit

Permalink
Merge pull request #43510 from bundocka/L1To2ointFix
Browse files Browse the repository at this point in the history
L1T o2o: fix int/2 bug
  • Loading branch information
cmsbuild authored Dec 8, 2023
2 parents 440af30 + 13ce0bb commit 32be86f
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions L1TriggerConfig/L1TConfigProducers/src/L1TCaloParamsOnlineProd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ bool L1TCaloParamsOnlineProd::readCaloLayer2OnlineSettings(l1t::CaloParamsHelper
}
}
// Layer 2 params specification
paramsHelper.setEgSeedThreshold((conf["leptonSeedThreshold"].getValue<int>()) / 2);
paramsHelper.setTauSeedThreshold((conf["leptonSeedThreshold"].getValue<int>()) / 2);
paramsHelper.setEgNeighbourThreshold((conf["leptonTowerThreshold"].getValue<int>()) / 2);
paramsHelper.setTauNeighbourThreshold((conf["leptonTowerThreshold"].getValue<int>()) / 2);
paramsHelper.setPileUpTowerThreshold((conf["pileUpTowerThreshold"].getValue<int>()) / 2);
paramsHelper.setEgSeedThreshold((conf["leptonSeedThreshold"].getValue<int>()) / 2.);
paramsHelper.setTauSeedThreshold((conf["leptonSeedThreshold"].getValue<int>()) / 2.);
paramsHelper.setEgNeighbourThreshold((conf["leptonTowerThreshold"].getValue<int>()) / 2.);
paramsHelper.setTauNeighbourThreshold((conf["leptonTowerThreshold"].getValue<int>()) / 2.);
paramsHelper.setPileUpTowerThreshold((conf["pileUpTowerThreshold"].getValue<int>()) / 2.);

paramsHelper.setEgMaxPtHOverE((conf["egammaRelaxationThreshold"].getValue<int>()) / 2.);
paramsHelper.setEgEtaCut((conf["egammaMaxEta"].getValue<int>()));
Expand All @@ -164,7 +164,7 @@ bool L1TCaloParamsOnlineProd::readCaloLayer2OnlineSettings(l1t::CaloParamsHelper
paramsHelper.setTauIsolationLUT(l1t::convertToLUT(conf["tauIsoLUT"].getVector<int>()));
paramsHelper.setTauTrimmingShapeVetoLUT(l1t::convertToLUT(conf["tauTrimmingLUT"].getVector<int>()));

paramsHelper.setJetSeedThreshold((conf["jetSeedThreshold"].getValue<int>()) / 2);
paramsHelper.setJetSeedThreshold((conf["jetSeedThreshold"].getValue<int>()) / 2.);
paramsHelper.setJetBypassPUS(conf["jetBypassPileUpSub"].getValue<bool>());
paramsHelper.setJetPUSUsePhiRing(conf["jetPUSUsePhiRing"].getValue<bool>());
paramsHelper.setJetCalibrationLUT(l1t::convertToLUT(conf["jetEnergyCalibLUT"].getVector<uint32_t>()));
Expand All @@ -179,10 +179,10 @@ bool L1TCaloParamsOnlineProd::readCaloLayer2OnlineSettings(l1t::CaloParamsHelper
etSumEtaMax.push_back(conf["towerCountMaxEta"].getValue<int>());

etSumEtThresh.push_back(0); //deprecated by EttPUSLUT
etSumEtThresh.push_back(conf["HT_jetThreshold"].getValue<int>() / 2);
etSumEtThresh.push_back(conf["HT_jetThreshold"].getValue<int>() / 2.);
etSumEtThresh.push_back(0); //deprecated by MetPUSLUT
etSumEtThresh.push_back(conf["MHT_jetThreshold"].getValue<int>() / 2);
etSumEtThresh.push_back(conf["towerCountThreshold"].getValue<int>() / 2);
etSumEtThresh.push_back(conf["MHT_jetThreshold"].getValue<int>() / 2.);
etSumEtThresh.push_back(conf["towerCountThreshold"].getValue<int>() / 2.);

for (uint i = 0; i < 5; ++i) {
paramsHelper.setEtSumEtaMax(i, etSumEtaMax.at(i));
Expand All @@ -200,8 +200,8 @@ bool L1TCaloParamsOnlineProd::readCaloLayer2OnlineSettings(l1t::CaloParamsHelper
etSumCentUpperValues = conf["ET_centralityUpperThresholds"].getVector<double>();

for (uint i = 0; i < 8; ++i) {
paramsHelper.setEtSumCentLower(i, etSumCentLowerValues[i] / 2);
paramsHelper.setEtSumCentUpper(i, etSumCentUpperValues[i] / 2);
paramsHelper.setEtSumCentLower(i, etSumCentLowerValues[i] / 2.);
paramsHelper.setEtSumCentUpper(i, etSumCentUpperValues[i] / 2.);
}

// demux tower sum calib LUTs
Expand Down

0 comments on commit 32be86f

Please sign in to comment.