Skip to content

Commit

Permalink
Merge pull request cms-sw#1242 from aloeliger/Calo_44606_Fix
Browse files Browse the repository at this point in the history 
Updated seed tower thresholds in endcap to improve efficiency (from cms-sw#44606)
  • Loading branch information
@aloeliger
aloeliger committed Apr 8, 2024
2 parents 80c661f + 45cbf0f commit 66026d3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 22 deletions.
6 changes: 4 additions & 2 deletions L1Trigger/L1CaloTrigger/interface/Phase2L1CaloJetEmulator.h
View file
Expand Up @@ -441,15 +441,17 @@ namespace gctobj {
return jet_tmp;
}

inline jetInfo getRegion(GCTsupertower_t temp[nSTEta][nSTPhi]) {
inline jetInfo getRegion(GCTsupertower_t temp[nSTEta][nSTPhi], float TTseedThreshold) {
jetInfo jet_tmp, jet;
jet_tmp = getJetPosition(temp);
int seed_phi = jet_tmp.phi;
int seed_eta = jet_tmp.eta;
float seed_energy = jet_tmp.seedEnergy;
float seed_tower_energy = jet_tmp.energyMax;
jet = getJetValues(temp, seed_eta, seed_phi);
if (seed_energy > 10. && seed_tower_energy > 5.) { // suppress <= 10 GeV ST as ST seed and <= 5 GeV as max TT in ST
if (seed_energy > 10. &&
seed_tower_energy >
TTseedThreshold) { // suppress <= 10 GeV ST as ST seed and <=5 GeV (3 GeV) as max TT in ST barrel/HF (endcap)
jet_tmp.energy = jet.energy;
jet_tmp.tauEt = jet.tauEt;
} else {
Expand Down
9 changes: 6 additions & 3 deletions L1Trigger/L1CaloTrigger/plugins/Phase2L1CaloJetEmulator.cc
View file
Expand Up @@ -425,9 +425,10 @@ void Phase2L1CaloJetEmulator::produce(edm::Event& iEvent, const edm::EventSetup&

gctobj::GCTsupertower_t tempST[nSTEta][nSTPhi];
gctobj::makeST(temporary, tempST);
float TTseedThresholdBarrel = 5.;

for (int i = 0; i < nJets; i++) {
jet[i] = gctobj::getRegion(tempST);
jet[i] = gctobj::getRegion(tempST, TTseedThresholdBarrel);
l1tp2::Phase2L1CaloJet tempJet;
int gctjeteta = jet[i].etaCenter;
int gctjetphi = jet[i].phiCenter;
Expand Down Expand Up @@ -471,8 +472,9 @@ void Phase2L1CaloJetEmulator::produce(edm::Event& iEvent, const edm::EventSetup&

gctobj::GCTsupertower_t tempST_hgcal[nSTEta][nSTPhi];
gctobj::makeST_hgcal(temporary_hgcal, tempST_hgcal);
float TTseedThresholdEndcap = 3.;
for (int i = nJets; i < 2 * nJets; i++) {
jet[i] = gctobj::getRegion(tempST_hgcal);
jet[i] = gctobj::getRegion(tempST_hgcal, TTseedThresholdEndcap);
l1tp2::Phase2L1CaloJet tempJet;
int hgcaljeteta = jet[i].etaCenter;
int hgcaljetphi = jet[i].phiCenter;
Expand Down Expand Up @@ -516,8 +518,9 @@ void Phase2L1CaloJetEmulator::produce(edm::Event& iEvent, const edm::EventSetup&

gctobj::GCTsupertower_t tempST_hf[nSTEta][nSTPhi];
gctobj::makeST_hf(temporary_hf, tempST_hf);
float TTseedThresholdHF = 5.;
for (int i = 2 * nJets; i < 3 * nJets; i++) {
jet[i] = gctobj::getRegion(tempST_hf);
jet[i] = gctobj::getRegion(tempST_hf, TTseedThresholdHF);
l1tp2::Phase2L1CaloJet tempJet;
int hfjeteta = jet[i].etaCenter;
int hfjetphi = jet[i].phiCenter;
Expand Down
34 changes: 17 additions & 17 deletions L1Trigger/L1CaloTrigger/python/l1tPhase2CaloJetEmulator_cfi.py
View file
Expand Up @@ -85,39 +85,39 @@
nvtx_params = cms.vdouble( -0.229562, 0.050560 )
),
),
# Calibrations derived 21 March 2024 on 14_0_0_pre3 131X QCD sample
# Calibrations derived 4 April 2024 on 14_0_0_pre3 131X QCD sample
jetPtBins = cms.vdouble([ 0.0,20.0,25.0,30.0,35.0,40.0,45.0,50.0,55.0,60.0,65.0,70.0,75.0,80.0,85.0,90.0,95.0,100.0,110.0,120.0,130.0,140.0,150.0,160.0,170.0,180.0,190.0,200.0,225.0,250.0,275.0,300.0,325.0,400.0,500.0]),
absEtaBinsBarrel = cms.vdouble([ 0.00,0.30,0.60,1.00,1.50]),
jetCalibrationsBarrel = cms.vdouble([
2.220, 2.008, 1.942, 1.884, 1.833, 1.788, 1.749, 1.715, 1.685, 1.658, 1.635, 1.614, 1.595, 1.579, 1.564, 1.551, 1.540, 1.524, 1.507, 1.493, 1.481, 1.471, 1.461, 1.453, 1.446, 1.439, 1.432, 1.421, 1.407, 1.393, 1.380, 1.367, 1.340, 1.294,
1.883, 1.759, 1.718, 1.681, 1.647, 1.616, 1.588, 1.563, 1.540, 1.519, 1.501, 1.483, 1.468, 1.454, 1.441, 1.429, 1.418, 1.403, 1.387, 1.372, 1.360, 1.350, 1.341, 1.333, 1.326, 1.319, 1.313, 1.304, 1.293, 1.283, 1.274, 1.265, 1.247, 1.218,
2.025, 1.815, 1.754, 1.702, 1.657, 1.620, 1.588, 1.561, 1.537, 1.517, 1.500, 1.485, 1.472, 1.460, 1.450, 1.441, 1.433, 1.423, 1.410, 1.400, 1.391, 1.382, 1.374, 1.367, 1.360, 1.353, 1.346, 1.334, 1.318, 1.301, 1.285, 1.269, 1.236, 1.180,
2.893, 2.497, 2.377, 2.274, 2.186, 2.110, 2.045, 1.989, 1.941, 1.899, 1.863, 1.831, 1.803, 1.779, 1.757, 1.738, 1.721, 1.699, 1.674, 1.653, 1.635, 1.619, 1.605, 1.591, 1.578, 1.566, 1.555, 1.535, 1.508, 1.481, 1.454, 1.427, 1.374, 1.282,
2.221, 2.009, 1.943, 1.884, 1.833, 1.789, 1.749, 1.715, 1.685, 1.658, 1.635, 1.614, 1.595, 1.579, 1.564, 1.551, 1.540, 1.524, 1.507, 1.493, 1.481, 1.470, 1.461, 1.453, 1.446, 1.439, 1.432, 1.421, 1.407, 1.393, 1.380, 1.366, 1.340, 1.294,
1.886, 1.760, 1.718, 1.680, 1.646, 1.615, 1.587, 1.562, 1.539, 1.519, 1.500, 1.483, 1.467, 1.453, 1.440, 1.429, 1.418, 1.404, 1.387, 1.373, 1.361, 1.351, 1.342, 1.334, 1.327, 1.321, 1.315, 1.306, 1.294, 1.284, 1.274, 1.265, 1.247, 1.217,
2.032, 1.818, 1.755, 1.702, 1.657, 1.619, 1.587, 1.560, 1.536, 1.516, 1.499, 1.484, 1.471, 1.460, 1.450, 1.441, 1.433, 1.423, 1.411, 1.400, 1.391, 1.383, 1.375, 1.367, 1.360, 1.353, 1.346, 1.335, 1.318, 1.301, 1.285, 1.268, 1.236, 1.178,
2.762, 2.411, 2.304, 2.213, 2.135, 2.067, 2.009, 1.959, 1.916, 1.878, 1.846, 1.817, 1.792, 1.770, 1.750, 1.732, 1.717, 1.696, 1.673, 1.653, 1.635, 1.620, 1.606, 1.592, 1.580, 1.568, 1.556, 1.536, 1.508, 1.481, 1.454, 1.427, 1.373, 1.279,
]),
absEtaBinsHGCal = cms.vdouble([ 1.50,1.90,2.40,3.00]),
jetCalibrationsHGCal = cms.vdouble([
2.426, 2.223, 2.157, 2.097, 2.044, 1.996, 1.953, 1.915, 1.881, 1.850, 1.822, 1.797, 1.775, 1.755, 1.737, 1.721, 1.707, 1.687, 1.666, 1.648, 1.634, 1.622, 1.612, 1.604, 1.597, 1.591, 1.585, 1.578, 1.569, 1.561, 1.555, 1.549, 1.538, 1.519,
1.391, 1.374, 1.368, 1.362, 1.356, 1.351, 1.345, 1.340, 1.335, 1.331, 1.326, 1.322, 1.318, 1.314, 1.310, 1.307, 1.303, 1.298, 1.292, 1.287, 1.283, 1.278, 1.275, 1.272, 1.269, 1.267, 1.265, 1.263, 1.263, 1.264, 1.268, 1.273, 1.288, 1.325,
1.713, 1.654, 1.632, 1.611, 1.590, 1.570, 1.551, 1.533, 1.515, 1.498, 1.481, 1.465, 1.450, 1.435, 1.421, 1.407, 1.394, 1.375, 1.352, 1.330, 1.311, 1.293, 1.277, 1.262, 1.249, 1.237, 1.227, 1.212, 1.196, 1.186, 1.182, 1.183, 1.197, 1.252,
2.620, 2.126, 2.008, 1.919, 1.852, 1.802, 1.764, 1.735, 1.712, 1.695, 1.682, 1.671, 1.663, 1.657, 1.651, 1.647, 1.643, 1.638, 1.633, 1.628, 1.624, 1.620, 1.617, 1.613, 1.609, 1.606, 1.602, 1.596, 1.587, 1.578, 1.569, 1.560, 1.542, 1.511,
6.766, 1.454, 1.273, 1.221, 1.207, 1.204, 1.204, 1.205, 1.207, 1.209, 1.210, 1.212, 1.214, 1.215, 1.217, 1.219, 1.221, 1.223, 1.226, 1.230, 1.233, 1.237, 1.240, 1.243, 1.247, 1.250, 1.253, 1.259, 1.268, 1.276, 1.285, 1.293, 1.310, 1.340,
3.635, 2.281, 1.968, 1.737, 1.566, 1.441, 1.349, 1.281, 1.232, 1.197, 1.172, 1.154, 1.142, 1.133, 1.128, 1.125, 1.124, 1.125, 1.128, 1.133, 1.139, 1.145, 1.152, 1.159, 1.166, 1.174, 1.181, 1.193, 1.211, 1.229, 1.247, 1.265, 1.301, 1.364,
]),
absEtaBinsHF = cms.vdouble([ 3.00,3.60,6.00]),
jetCalibrationsHF = cms.vdouble([
4.682, 3.448, 3.109, 2.833, 2.609, 2.425, 2.276, 2.153, 2.051, 1.968, 1.898, 1.840, 1.791, 1.750, 1.714, 1.683, 1.657, 1.622, 1.584, 1.552, 1.524, 1.498, 1.474, 1.451, 1.429, 1.407, 1.386, 1.349, 1.296, 1.244, 1.191, 1.139, 1.035, 0.852,
2.085, 1.767, 1.672, 1.591, 1.522, 1.464, 1.414, 1.371, 1.334, 1.303, 1.276, 1.253, 1.233, 1.216, 1.201, 1.187, 1.176, 1.161, 1.145, 1.132, 1.122, 1.113, 1.105, 1.098, 1.091, 1.085, 1.079, 1.070, 1.056, 1.044, 1.031, 1.018, 0.993, 0.949,
4.632, 3.392, 3.056, 2.784, 2.563, 2.385, 2.239, 2.121, 2.024, 1.944, 1.877, 1.822, 1.776, 1.737, 1.703, 1.674, 1.649, 1.617, 1.580, 1.549, 1.522, 1.497, 1.474, 1.451, 1.429, 1.408, 1.386, 1.349, 1.297, 1.244, 1.192, 1.140, 1.036, 0.853,
2.092, 1.771, 1.675, 1.593, 1.524, 1.465, 1.414, 1.371, 1.335, 1.303, 1.276, 1.253, 1.233, 1.216, 1.201, 1.187, 1.176, 1.161, 1.145, 1.132, 1.122, 1.113, 1.105, 1.098, 1.091, 1.085, 1.080, 1.070, 1.057, 1.044, 1.031, 1.019, 0.994, 0.950,
]),
# Calibrations derived 21 March 2024 on 14_0_0_pre3 131X VBFHiggsTauTau sample
# Calibrations derived 4 April 2024 on 14_0_0_pre3 131X VBFHiggsTauTau sample
tauPtBins = cms.vdouble([ 0.0,10.0,15.0,20.0,25.0,30.0,35.0,40.0,45.0,50.0,55.0,60.0,70.0,80.0,100.0,150.0,200.0]),
tauAbsEtaBinsBarrel = cms.vdouble([ 0.00,0.30,0.60,1.00,1.50]),
tauCalibrationsBarrel = cms.vdouble([
1.974, 1.659, 1.516, 1.411, 1.333, 1.276, 1.233, 1.202, 1.179, 1.162, 1.149, 1.136, 1.126, 1.119, 1.115, 1.114,
1.978, 1.661, 1.517, 1.411, 1.333, 1.276, 1.233, 1.202, 1.179, 1.162, 1.150, 1.137, 1.127, 1.119, 1.115, 1.115,
1.912, 1.641, 1.512, 1.414, 1.338, 1.281, 1.237, 1.203, 1.177, 1.158, 1.143, 1.127, 1.113, 1.102, 1.095, 1.094,
1.988, 1.683, 1.541, 1.433, 1.353, 1.292, 1.246, 1.211, 1.185, 1.166, 1.151, 1.135, 1.122, 1.113, 1.107, 1.106,
2.753, 2.137, 1.865, 1.667, 1.524, 1.421, 1.346, 1.292, 1.253, 1.224, 1.204, 1.183, 1.167, 1.156, 1.150, 1.149,
1.989, 1.683, 1.541, 1.434, 1.353, 1.292, 1.246, 1.211, 1.185, 1.166, 1.151, 1.135, 1.122, 1.113, 1.107, 1.106,
2.734, 2.129, 1.860, 1.665, 1.523, 1.420, 1.346, 1.292, 1.252, 1.224, 1.203, 1.182, 1.166, 1.155, 1.149, 1.148,
]),
tauAbsEtaBinsHGCal = cms.vdouble([ 1.50,1.90,2.40,3.00]),
tauCalibrationsHGCal = cms.vdouble([
4.029, 2.692, 2.185, 1.859, 1.650, 1.516, 1.430, 1.374, 1.339, 1.316, 1.301, 1.289, 1.281, 1.277, 1.275, 1.275,
3.274, 2.537, 2.207, 1.966, 1.790, 1.661, 1.568, 1.499, 1.449, 1.412, 1.386, 1.359, 1.338, 1.323, 1.315, 1.314,
2.467, 2.198, 2.044, 1.907, 1.787, 1.680, 1.586, 1.503, 1.429, 1.364, 1.307, 1.233, 1.153, 1.065, 0.951, 0.891,
3.528, 2.418, 2.003, 1.740, 1.573, 1.466, 1.399, 1.356, 1.329, 1.312, 1.301, 1.292, 1.286, 1.283, 1.282, 1.282,
3.196, 2.328, 1.990, 1.770, 1.625, 1.531, 1.470, 1.429, 1.403, 1.386, 1.374, 1.364, 1.358, 1.355, 1.353, 1.353,
5.837, 3.089, 2.205, 1.704, 1.421, 1.260, 1.170, 1.118, 1.089, 1.073, 1.063, 1.056, 1.053, 1.052, 1.051, 1.051,
]),
)

0 comments on commit 66026d3

Please sign in to comment.