Skip to content

Commit c8d5f21

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46913 from mmusich/mm_dev_PromptCalibProdSiPixelAliHLTHGCombined
Follow-up to HLT HG Combined PCL workflow
2 parents cb0b142 + 581a19f commit c8d5f21

File tree

9 files changed

+77
-104
lines changed

9 files changed

+77
-104
lines changed

‎Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLT_cff.py

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -51,84 +51,8 @@
5151
# In the following use
5252
# TrackRefitter (normal tracks), TrackRefitterP5 (cosmics) or TrackRefitterBHM (beam halo)
5353

54-
from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import stripCPEESProducer
55-
hltESPStripCPEfromTrackAngle = stripCPEESProducer.clone(
56-
ComponentType = "StripCPEfromTrackAngle" ,
57-
ComponentName = "hltESPStripCPEfromTrackAngle",
58-
parameters = cms.PSet(
59-
mLC_P2 = cms.double(0.3),
60-
mLC_P1 = cms.double(0.618),
61-
mLC_P0 = cms.double(-0.326),
62-
# useLegacyError = cms.bool( True ), # 50ns menu
63-
# maxChgOneMIP = cms.double( -6000.0 ), # 50ns menu
64-
useLegacyError = cms.bool(False) , # 25ns menu
65-
maxChgOneMIP = cms.double(6000.0) , #25ns menu
66-
mTEC_P1 = cms.double( 0.471 ),
67-
mTEC_P0 = cms.double( -1.885 ),
68-
mTOB_P0 = cms.double( -1.026 ),
69-
mTOB_P1 = cms.double( 0.253 ),
70-
mTIB_P0 = cms.double( -0.742 ),
71-
mTIB_P1 = cms.double( 0.202 ),
72-
mTID_P0 = cms.double( -1.427 ),
73-
mTID_P1 = cms.double( 0.433 )
74-
)
75-
)
76-
77-
hltESPPixelCPEGeneric = cms.ESProducer(
78-
"PixelCPEGenericESProducer",
79-
LoadTemplatesFromDB = cms.bool( True ),
80-
Alpha2Order = cms.bool( True ),
81-
ClusterProbComputationFlag = cms.int32( 0 ),
82-
useLAWidthFromDB = cms.bool( False ),
83-
lAOffset = cms.double( 0.0 ),
84-
lAWidthBPix = cms.double( 0.0 ),
85-
lAWidthFPix = cms.double( 0.0 ),
86-
doLorentzFromAlignment = cms.bool( False ),
87-
useLAFromDB = cms.bool( True ),
88-
xerr_barrel_l1 = cms.vdouble( 0.00115, 0.0012, 8.8E-4 ),
89-
yerr_barrel_l1 = cms.vdouble( 0.00375, 0.0023, 0.0025, 0.0025, 0.0023, 0.0023, 0.0021, 0.0021, 0.0024 ),
90-
xerr_barrel_ln = cms.vdouble( 0.00115, 0.0012, 8.8E-4 ),
91-
yerr_barrel_ln = cms.vdouble( 0.00375, 0.0023, 0.0025, 0.0025, 0.0023, 0.0023, 0.0021, 0.0021, 0.0024 ),
92-
xerr_endcap = cms.vdouble( 0.002, 0.002 ),
93-
yerr_endcap = cms.vdouble( 0.0021 ),
94-
xerr_barrel_l1_def = cms.double( 0.0103 ),
95-
yerr_barrel_l1_def = cms.double( 0.0021 ),
96-
xerr_barrel_ln_def = cms.double( 0.0103 ),
97-
yerr_barrel_ln_def = cms.double( 0.0021 ),
98-
xerr_endcap_def = cms.double( 0.002 ),
99-
yerr_endcap_def = cms.double( 7.5E-4 ),
100-
eff_charge_cut_highX = cms.double( 1.0 ),
101-
eff_charge_cut_highY = cms.double( 1.0 ),
102-
eff_charge_cut_lowX = cms.double( 0.0 ),
103-
eff_charge_cut_lowY = cms.double( 0.0 ),
104-
size_cutX = cms.double( 3.0 ),
105-
size_cutY = cms.double( 3.0 ),
106-
EdgeClusterErrorX = cms.double( 50.0 ),
107-
EdgeClusterErrorY = cms.double( 85.0 ),
108-
inflate_errors = cms.bool( False ),
109-
inflate_all_errors_no_trk_angle = cms.bool( False ),
110-
NoTemplateErrorsWhenNoTrkAngles = cms.bool( False ),
111-
UseErrorsFromTemplates = cms.bool( True ),
112-
TruncatePixelCharge = cms.bool( True ),
113-
IrradiationBiasCorrection = cms.bool( True ),
114-
DoCosmics = cms.bool( False ),
115-
isPhase2 = cms.bool( False ),
116-
SmallPitch = cms.bool( False ),
117-
ComponentName = cms.string( "hltESPPixelCPEGeneric" ),
118-
MagneticFieldRecord = cms.ESInputTag( "","" ),
119-
appendToDataLabel = cms.string( "" )
120-
)
121-
122-
hltESPTTRHBWithTrackAngle = cms.ESProducer(
123-
"TkTransientTrackingRecHitBuilderESProducer",
124-
ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ),
125-
ComputeCoarseLocalPositionFromDisk = cms.bool( False ),
126-
StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ),
127-
PixelCPE = cms.string( "hltESPPixelCPEGeneric" ),
128-
Matcher = cms.string( "StandardMatcher" ),
129-
Phase2StripCPE = cms.string( "" ),
130-
appendToDataLabel = cms.string( "" )
131-
)
54+
# Ingredient: import HLT CPE ESProducers directly to avoid going out of synch
55+
from Alignment.CommonAlignmentProducer.HLTModulesIncludes_cff import hltESPStripCPEfromTrackAngle, hltESPPixelCPEGeneric, hltESPTTRHBWithTrackAngle
13256

13357
SiPixelAliTrackRefitterHLT0 = TrackRefitter.clone(
13458
src = 'SiPixelAliLooseSelectorHLT', #'ALCARECOTkAlMinBias'#'ALCARECOTkAlCosmicsCTF0T' #'ALCARECOTkAlMuonIsolated'

‎Alignment/CommonAlignmentProducer/python/HLTModulesIncludes_cff.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from HLTrigger.Configuration.HLT_FULL_cff import fragment
2+
3+
hltESPStripCPEfromTrackAngle = fragment.hltESPStripCPEfromTrackAngle
4+
hltESPPixelCPEGeneric = fragment.hltESPPixelCPEGeneric
5+
hltESPTTRHBWithTrackAngle = fragment.hltESPTTRHBWithTrackAngle

‎Calibration/TkAlCaRecoProducers/test/parseFwkJobReport.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
'SiStripLA_pcl',
1919
'SiPixelAli_pcl', # Alignment
2020
'SiPixelAliHG_pcl',
21-
'SiPixelAliHGCombined_pcl']
21+
'SiPixelAliHGCombined_pcl',
22+
'SiPixelAliHLTHGCombined_pcl'
23+
]
2224
TARGET_DQM_FILES=1
2325
TARGET_DQM_FILENAME='./DQM_V0001_R000325022__Express__PCLTest__ALCAPROMPT.root'
2426
TARGET_DB_FILES=len(TARGET_LIST_OF_TAGS)

‎Calibration/TkAlCaRecoProducers/test/testAlCaHarvesting.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ function cleanTheHouse {
99
rm -fr HGalignment
1010
}
1111

12-
echo "TESTING Calibration/TkAlCaRecoProducers ..."
12+
echo "========== Starting Calibration/TkAlCaRecoProducers Test =========="
1313
cmsRun -e -j testPCLAlCaHarvesting.xml ${SCRAM_TEST_PATH}/testPCLAlCaHarvesting.py || die "Failure running testPCLAlCaHarvesting.py" $?
1414
cleanTheHouse
15-
echo "PARSING Framework Job Report ..."
15+
echo "" # Adding a blank line for better readability
16+
echo "========== Parsing Framework Job Report =========="
1617
python3 ${SCRAM_TEST_PATH}/parseFwkJobReport.py

‎Calibration/TkAlCaRecoProducers/test/testPCLAlCaHarvesting.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def findRunStopTime(run_number):
8383
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAli_dbOutput)
8484
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAliHG_dbOutput)
8585
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAliHGCombined_dbOutput)
86+
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAliHLTHGCombined_dbOutput)
8687
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelLA_dbOutput)
8788
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelLAMCS_dbOutput)
8889
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiStripLA_dbOutput)
@@ -107,6 +108,7 @@ def findRunStopTime(run_number):
107108
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAli_metadata)
108109
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAliHG_metadata)
109110
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAliHGCombined_metadata)
111+
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAliHLTHGCombined_metadata )
110112
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelLA_metadata)
111113
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelLAMCS_metadata)
112114
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiStripLA_metadata)
@@ -146,6 +148,16 @@ def findRunStopTime(run_number):
146148
process.SiPixelAliMilleFileExtractorHG.outputBinaryFile = cms.string('')
147149
process.SiPixelAliPedeAlignmentProducerHG.algoConfig.mergeBinaryFiles=[]
148150

151+
process.SiPixelAliHGCombined = cms.Path(process.ALCAHARVESTSiPixelAliHGCombined)
152+
process.SiPixelAliMilleFileExtractorHGMinBias.outputBinaryFile = cms.string('')
153+
process.SiPixelAliMilleFileExtractorHGZMuMu.outputBinaryFile = cms.string('')
154+
process.SiPixelAliPedeAlignmentProducerHGCombined.algoConfig.mergeBinaryFiles=[]
155+
156+
process.SiPixelAliHLTHGCombined = cms.Path(process.ALCAHARVESTSiPixelAliHLTHGCombined)
157+
process.SiPixelAliMilleFileExtractorHLTHGMinBias.outputBinaryFile = cms.string('')
158+
process.SiPixelAliMilleFileExtractorHLTHGZMuMu.outputBinaryFile = cms.string('')
159+
process.SiPixelAliPedeAlignmentProducerHLTHGCombined.algoConfig.mergeBinaryFiles=[]
160+
149161
process.SiPixelLA = cms.Path(process.ALCAHARVESTSiPixelLorentzAngle)
150162
process.SiPixelLAMCS = cms.Path(process.ALCAHARVESTSiPixelLorentzAngleMCS)
151163
process.SiPixelQuality = cms.Path(process.ALCAHARVESTSiPixelQuality)
@@ -166,6 +178,7 @@ def findRunStopTime(run_number):
166178
process.SiPixelAli,
167179
process.SiPixelAliHG,
168180
process.SiPixelAliHGCombined,
181+
process.SiPixelAliHLTHGCombined,
169182
process.SiPixelLA,
170183
process.SiPixelLAMCS,
171184
process.SiStripLA,

‎CondFormats/Common/data/SiPixelAliHLTHGCombRcd_prep.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
3+
"destinationTags": {
4+
"SiPixelAliHLTHGCombined_PCL_v0_hlt": {}
5+
},
6+
"inputTag": "SiPixelAliHLTHGCombined_pcl",
7+
"since": null,
8+
"userText": "T0 PCL Upload for SiPixel HG Combined (MiBias + Z->mm) Ali. for High Level Trigger (prep)"
9+
}

‎CondFormats/Common/data/SiPixelAliHLTHGCombRcd_prod.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS",
3+
"destinationTags": {
4+
"SiPixelAliHLTHGCombined_PCL_v0_hlt": {}
5+
},
6+
"inputTag": "SiPixelAliHLTHGCombined_pcl",
7+
"since": null,
8+
"userText": "T0 PCL Upload for SiPixel HG Combined (MinBias + Z->mm) Ali. for High Level Trigger (prod)"
9+
}

‎CondFormats/Common/test/DropBoxMetadataReader.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,29 @@
2929
# toRead lists of record names to be sought inside the DropBoxMetadataRcd payload avaialble to the ProduceDropBoxMetadata;
3030
# for instance, if write is True, you're reading back the metadata you've just entered in the payload from the .json files
3131
toRead = cms.untracked.vstring(
32-
'BeamSpotObjectsRcdByRun',
33-
'BeamSpotObjectsRcdByLumi',
34-
'BeamSpotObjectsRcdHPByLumi',
35-
'BeamSpotObjectsRcdHPByRun',
36-
'SiStripBadStripRcd',
37-
'SiStripBadStripFromHitEffRcd',
38-
'SiStripApvGainRcd',
39-
'TrackerAlignmentRcd',
40-
'TrackerAlignmentHGRcd',
41-
'TrackerAlignmentHGCombinedRcd',
42-
'SiStripApvGainRcdAAG',
43-
'EcalPedestalsRcd',
44-
"LumiCorrectionsRcd",
45-
"SiPixelQualityFromDbRcd_prompt",
46-
"SiPixelQualityFromDbRcd_stuckTBM",
47-
"SiPixelQualityFromDbRcd_other",
48-
"SiPixelLorentzAngleRcd",
49-
"SiPixelLorentzAngleRcdMCS",
50-
"CTPPSRPAlignmentCorrectionsDataRcd",
51-
"PPSTimingCalibrationRcd_HPTDC",
52-
"PPSTimingCalibrationRcd_SAMPIC",
53-
"SiStripLorentzAngleRcd",
54-
) # same strings as fType
32+
"BeamSpotObjectsRcdByRun",
33+
"BeamSpotObjectsRcdByLumi",
34+
"BeamSpotObjectsRcdHPByLumi",
35+
"BeamSpotObjectsRcdHPByRun",
36+
"SiStripBadStripRcd",
37+
"SiStripBadStripFromHitEffRcd",
38+
"SiStripApvGainRcd",
39+
"TrackerAlignmentRcd",
40+
"TrackerAlignmentHGRcd",
41+
"TrackerAlignmentHGCombinedRcd",
42+
"TrackerAlignmentHLTHGCombinedRcd",
43+
"SiStripApvGainRcdAAG",
44+
"EcalPedestalsRcd",
45+
"LumiCorrectionsRcd",
46+
"SiPixelQualityFromDbRcd_prompt",
47+
"SiPixelQualityFromDbRcd_stuckTBM",
48+
"SiPixelQualityFromDbRcd_other",
49+
"SiPixelLorentzAngleRcd",
50+
"SiPixelLorentzAngleRcdMCS",
51+
"CTPPSRPAlignmentCorrectionsDataRcd",
52+
"PPSTimingCalibrationRcd_HPTDC",
53+
"PPSTimingCalibrationRcd_SAMPIC",
54+
"SiStripLorentzAngleRcd") # same strings as fType
5555
)
5656

5757
process.p = cms.Path(process.myReader)

‎CondFormats/Common/test/ProduceDropBoxMetadata.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ def encodeJsonInString(filename):
7373
SiPixelAliHGCombRcd_prod_str = encodeJsonInString("SiPixelAliHGCombRcd_prod.json")
7474
SiPixelAliHGCombRcd_prep_str = encodeJsonInString("SiPixelAliHGCombRcd_prep.json")
7575

76+
#SiPixelAliHLTHGComb
77+
SiPixelAliHLTHGCombRcd_prod_str = encodeJsonInString("SiPixelAliHLTHGCombRcd_prod.json")
78+
SiPixelAliHLTHGCombRcd_prep_str = encodeJsonInString("SiPixelAliHLTHGCombRcd_prep.json")
79+
7680
#EcalPedestalsRcd
7781
EcalPedestalsRcd_prod_str = encodeJsonInString("EcalPedestal_prod.json")
7882
EcalPedestalsRcd_prep_str = encodeJsonInString("EcalPedestal_prep.json")
@@ -184,6 +188,12 @@ def encodeJsonInString(filename):
184188
prodMetaData = cms.untracked.string(SiPixelAliHGCombRcd_prod_str),
185189
prepMetaData = cms.untracked.string(SiPixelAliHGCombRcd_prep_str),
186190
),
191+
cms.PSet(record = cms.untracked.string('TrackerAlignmentHLTHGCombinedRcd'),
192+
Source = cms.untracked.string("AlcaHarvesting"),
193+
FileClass = cms.untracked.string("ALCA"),
194+
prodMetaData = cms.untracked.string(SiPixelAliHLTHGCombRcd_prod_str),
195+
prepMetaData = cms.untracked.string(SiPixelAliHLTHGCombRcd_prep_str),
196+
),
187197
cms.PSet(record = cms.untracked.string('SiStripApvGainRcdAAG'),
188198
Source = cms.untracked.string("AlcaHarvesting"),
189199
FileClass = cms.untracked.string("ALCA"),

0 commit comments

Comments
 (0)