Skip to content

Commit

Permalink
Merge pull request cms-sw#1034 from bundocka/add_caloParams_2022_v0_3
Browse files Browse the repository at this point in the history 
L1T: Add v0_3 with updated EG
  • Loading branch information
@epalencia
epalencia committed Jul 14, 2022
2 parents a0851f2 + af1f676 commit dbde540
Show file tree
Hide file tree
Showing 3 changed files with 341 additions and 1 deletion.
10 changes: 9 additions & 1 deletion L1Trigger/Configuration/python/customiseSettings.py
View file
Expand Up @@ -2,8 +2,16 @@
import os.path
import FWCore.ParameterSet.Config as cms

def L1TSettingsToCaloParamsHI_2022_v0_3(process):
process.load("L1Trigger.L1TCalorimeter.caloParamsHI_2022_v0_3_cfi")
return process

def L1TSettingsToCaloParams_2022_v0_3(process):
process.load("L1Trigger.L1TCalorimeter.caloParams_2022_v0_3_cfi")
return process

def L1TSettingsToCaloParamsHI_2022_v0_2(process):
process.load("L1Trigger.L1TCalorimeter.caloParams_2022_v0_2_cfi")
process.load("L1Trigger.L1TCalorimeter.caloParamsHI_2022_v0_2_cfi")
return process

def L1TSettingsToCaloParams_2022_v0_2(process):
Expand Down
169 changes: 169 additions & 0 deletions L1Trigger/L1TCalorimeter/python/caloParamsHI_2022_v0_3_cfi.py
View file
@@ -0,0 +1,169 @@
import FWCore.ParameterSet.Config as cms

from L1Trigger.L1TCalorimeter.caloParams_cfi import caloParamsSource
import L1Trigger.L1TCalorimeter.caloParams_cfi
caloStage2Params = L1Trigger.L1TCalorimeter.caloParams_cfi.caloParams.clone(

# towers
#towerLsbH = 0.5
#towerLsbE = 0.5
#towerLsbSum = 0.5
#towerNBitsH = 8
#towerNBitsE = 8
#towerNBitsSum = 9
#towerNBitsRatio = 3
#towerEncoding = True

# regions
#regionLsb = 0.5
#regionPUSType = "None"
#regionPUSParams = []

# EG
egEtaCut = 24,
#egLsb = 0.5
#egSeedThreshold = 2.
#egNeighbourThreshold = 1.
egHcalThreshold = 0.,
egTrimmingLUTFile = "L1Trigger/L1TCalorimeter/data/egTrimmingLUT_10_v16.01.19.txt",
#egMaxHcalEt = 0.
#egMaxPtHOverE = 128.
egHOverEcutBarrel = 1,
egHOverEcutEndcap = 1,
egBypassExtHOverE = 1,
egBypassShape = 1,
egBypassECALFG = 1,

egMaxHOverELUTFile = "L1Trigger/L1TCalorimeter/data/HoverEIdentification_0.995_v15.12.23.txt",
egCompressShapesLUTFile = "L1Trigger/L1TCalorimeter/data/egCompressLUT_v4.txt",
egShapeIdType = "compressed",
#egShapeIdVersion = 0
egShapeIdLUTFile = "L1Trigger/L1TCalorimeter/data/shapeIdentification_adapt0.99_compressedieta_compressedE_compressedshape_v15.12.08.txt", #Not used any more in the current emulator version, merged with calibration LUT

#egPUSType = "None"
egIsolationType = "compressed",
egIsoLUTFile = "L1Trigger/L1TCalorimeter/data/eg_IsoLUT_tight_Opt_L281_7p5_0p9_30p0_12_Jul_2022.txt",
egIsoLUTFile2 = "L1Trigger/L1TCalorimeter/data/eg_IsoLUT_loose_Opt_L137_5p0_0p9_30p0_12_Jul_2022.txt",
#egIsoAreaNrTowersEta = 2
#egIsoAreaNrTowersPhi = 4
egIsoVetoNrTowersPhi = 2,
#egIsoPUEstTowerGranularity = cms.uint32(1)
#egIsoMaxEtaAbsForTowerSum = cms.uint32(4)
#egIsoMaxEtaAbsForIsoSum = cms.uint32(27)
egPUSParams = cms.vdouble(1,4,32), #Isolation window in firmware goes up to abs(ieta)=32 for now
egCalibrationType = "compressed",
egCalibrationVersion = 0,
egCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/egRecalibratedLUTv1_2022_v0_2.txt",

# Tau
#tauLsb = 0.5
isoTauEtaMax = 25,
tauSeedThreshold = 0.,
#tauNeighbourThreshold = 0.
#tauIsoAreaNrTowersEta = 2
#tauIsoAreaNrTowersPhi = 4
#tauIsoVetoNrTowersPhi = 2
#tauPUSType = "None"
tauIsoLUTFile = "L1Trigger/L1TCalorimeter/data/Tau_Iso_LUT_2022_calibThr1p7_rate14kHz_V11gs_effMin0p9_G3.txt",
tauIsoLUTFile2 = "L1Trigger/L1TCalorimeter/data/Tau_Iso_LUT_2022_calibThr1p7_rate14kHz_V11gs_effMin0p9_G3.txt",
tauCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/Tau_Cal_LUT_2022_calibThr1p7_V11.txt",
tauCompressLUTFile = "L1Trigger/L1TCalorimeter/data/tauCompressAllLUT_12bit_v3.txt",
tauPUSParams = [1,4,32],

# jets
#jetLsb = 0.5
jetSeedThreshold = 4.0,
#jetNeighbourThreshold = 0.
jetPUSType = "PhiRing1",
jetPUSUsePhiRing = 1,
#jetBypassPUS = 0

# Calibration options
jetCalibrationType = "LUT",
jetCompressPtLUTFile = "L1Trigger/L1TCalorimeter/data/lut_pt_compress_2022v1_HI.txt",
jetCompressEtaLUTFile = "L1Trigger/L1TCalorimeter/data/lut_eta_compress_2022v1.txt",
jetCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/lut_calib_2022v1_ECALZS_HI.txt",


# sums: 0=ET, 1=HT, 2=MET, 3=MHT
#etSumLsb = 0.5
etSumEtaMin = [1, 1, 1, 1, 1],
etSumEtaMax = [28, 26, 28, 26, 28],
etSumEtThreshold = [0., 30., 0., 30., 0.], # only 2nd (HT) and 4th (MHT) values applied
etSumMetPUSType = "LUT", # et threshold from this LUT supercedes et threshold in line above
#etSumEttPUSType = "None"
#etSumEcalSumPUSType = "None"
#etSumBypassMetPUS = 0
etSumBypassEttPUS = 1,
etSumBypassEcalSumPUS = 1,
#etSumXCalibrationType = "None"
#etSumYCalibrationType = "None"
#etSumEttCalibrationType = "None"
#etSumEcalSumCalibrationType = "None"

etSumMetPUSLUTFile = "L1Trigger/L1TCalorimeter/data/metPumLUT_2022_HCALOff_p5.txt",
#etSumEttPUSLUTFile = "L1Trigger/L1TCalorimeter/data/lut_towEtThresh_dummy.txt"
#etSumEcalSumPUSLUTFile = "L1Trigger/L1TCalorimeter/data/lut_towEtThresh_dummy.txt"
#etSumXCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/lut_etSumPUS_dummy.txt"
#etSumYCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/lut_etSumPUS_dummy.txt"
#etSumEttCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/lut_etSumPUS_dummy.txt"
#etSumEcalSumCalibrationLUTFile = "L1Trigger/L1TCalorimeter/data/lut_etSumPUS_dummy.txt"

etSumCentralityUpper = [6.5, 18.0, 176.5, 456.0, 991.0, 1867.0, 3126.5, 65535.0],
etSumCentralityLower = [0.0, 3.5, 11.5, 126.5, 367.0, 868.5, 1738.5, 65535.0],


# Layer 1 SF
layer1ECalScaleETBins = cms.vint32([3, 6, 9, 12, 15, 20, 25, 30, 35, 40, 45, 55, 70, 256]),
layer1ECalScaleFactors = cms.vdouble([
1.12, 1.13, 1.13, 1.12, 1.12, 1.12, 1.13, 1.12, 1.13, 1.12, 1.13, 1.13, 1.14, 1.13, 1.13, 1.13, 1.14, 1.26, 1.11, 1.20, 1.21, 1.22, 1.19, 1.20, 1.19, 0.00, 0.00, 0.00,
1.12, 1.13, 1.13, 1.12, 1.12, 1.12, 1.13, 1.12, 1.13, 1.12, 1.13, 1.13, 1.14, 1.13, 1.13, 1.13, 1.14, 1.26, 1.11, 1.20, 1.21, 1.22, 1.19, 1.20, 1.19, 1.22, 0.00, 0.00,
1.08, 1.09, 1.08, 1.08, 1.11, 1.08, 1.09, 1.09, 1.09, 1.09, 1.15, 1.09, 1.10, 1.10, 1.10, 1.10, 1.10, 1.23, 1.07, 1.15, 1.14, 1.16, 1.14, 1.14, 1.15, 1.14, 1.14, 0.00,
1.06, 1.06, 1.06, 1.06, 1.06, 1.06, 1.06, 1.06, 1.07, 1.07, 1.07, 1.07, 1.07, 1.08, 1.07, 1.09, 1.08, 1.17, 1.06, 1.11, 1.10, 1.13, 1.10, 1.10, 1.11, 1.11, 1.11, 1.09,
1.04, 1.05, 1.04, 1.05, 1.04, 1.05, 1.06, 1.06, 1.05, 1.05, 1.05, 1.06, 1.06, 1.06, 1.06, 1.06, 1.07, 1.15, 1.04, 1.09, 1.09, 1.10, 1.09, 1.09, 1.10, 1.10, 1.10, 1.08,
1.04, 1.03, 1.04, 1.04, 1.04, 1.04, 1.04, 1.04, 1.04, 1.04, 1.04, 1.04, 1.05, 1.06, 1.04, 1.05, 1.05, 1.13, 1.03, 1.07, 1.08, 1.08, 1.08, 1.07, 1.07, 1.09, 1.08, 1.07,
1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.04, 1.04, 1.05, 1.05, 1.05, 1.05, 1.05, 1.12, 1.03, 1.06, 1.06, 1.08, 1.07, 1.07, 1.06, 1.08, 1.07, 1.06,
1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.04, 1.04, 1.04, 1.04, 1.04, 1.03, 1.10, 1.02, 1.05, 1.06, 1.06, 1.06, 1.06, 1.05, 1.06, 1.06, 1.06,
1.02, 1.02, 1.02, 1.02, 1.02, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.04, 1.03, 1.03, 1.02, 1.07, 1.02, 1.04, 1.04, 1.05, 1.06, 1.05, 1.05, 1.06, 1.06, 1.05,
1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.09, 1.02, 1.04, 1.05, 1.05, 1.05, 1.05, 1.04, 1.05, 1.06, 1.05,
1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.03, 1.03, 1.03, 1.03, 1.03, 1.08, 1.01, 1.04, 1.04, 1.05, 1.05, 1.04, 1.04, 1.05, 1.06, 1.05,
1.01, 1.01, 1.01, 1.01, 1.01, 1.01, 1.02, 1.01, 1.02, 1.02, 1.02, 1.02, 1.03, 1.03, 1.03, 1.03, 1.03, 1.06, 1.01, 1.04, 1.04, 1.05, 1.04, 1.03, 1.03, 1.04, 1.05, 1.04,
1.01, 1.00, 1.01, 1.01, 1.01, 1.01, 1.01, 1.00, 1.01, 1.02, 1.01, 1.01, 1.02, 1.02, 1.02, 1.02, 1.03, 1.04, 1.01, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.03, 1.00, 1.01,
1.02, 1.00, 1.00, 1.02, 1.00, 1.01, 1.01, 1.00, 1.00, 1.02, 1.01, 1.01, 1.02, 1.02, 1.02, 1.02, 1.02, 1.04, 1.01, 1.03, 1.03, 1.03, 1.03, 1.02, 1.02, 1.02, 1.00, 1.01
]),

layer1HCalScaleETBins = cms.vint32([6, 9, 12, 15, 20, 25, 30, 35, 40, 45, 55, 70, 256]),
layer1HCalScaleFactors = cms.vdouble([
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00
]),

layer1HFScaleETBins = cms.vint32([6, 9, 12, 15, 20, 25, 30, 35, 40, 45, 55, 70, 256]),
layer1HFScaleFactors = cms.vdouble([
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00
])
)

0 comments on commit dbde540

Please sign in to comment.