Skip to content

Commit 3da8316

Browse files
mmusichmmusich
committed
improve calibtree production unit test, set compression settings, multi-threaded production, remove errors from missing triggers
1 parent 7f83ffc commit 3da8316

File tree

2 files changed

+61
-12
lines changed

2 files changed

+61
-12
lines changed

‎CalibTracker/SiStripCommon/test/testProduceCalibrationTree_cfg.py‎

Lines changed: 60 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
import FWCore.ParameterSet.VarParsing as VarParsing
55
from CalibTracker.SiStripCommon.shallowTree_test_template import *
66

7+
###################################################################
8+
def alterTriggersForUnitTest(process):
9+
###################################################################
10+
'''
11+
These modification as necessary only in order to run on a
12+
RelVal MC in which the physics menu is not simulated!
13+
'''
14+
if(hasattr(process,'AAGFilter')):
15+
process.AAGFilter.triggerConditions = ["HLT_Random_v*"]
16+
if(hasattr(process,'IsolatedMuonFilter')):
17+
process.IsolatedMuonFilter.triggerConditions = ["MC_IsoMu_v*"]
18+
19+
return process
20+
721
###################################################################
822
# Setup 'standard' options
923
###################################################################
@@ -45,6 +59,12 @@
4559
VarParsing.VarParsing.varType.int,
4660
"number of events to process (\"-1\" for all)")
4761

62+
options.register('unitTest',
63+
False,
64+
VarParsing.VarParsing.multiplicity.singleton,
65+
VarParsing.VarParsing.varType.bool,
66+
"is for unit test?")
67+
4868
options.parseArguments()
4969

5070
print("conditionGT : ", options.conditionGT)
@@ -68,6 +88,12 @@
6888
process.GlobalTag = GlobalTag(process.GlobalTag, options.conditionGT, options.conditionOverwrite)
6989

7090
process.load('FWCore.MessageService.MessageLogger_cfi')
91+
process.MessageLogger.destinations = ['cout', 'cerr']
92+
if(options.unitTest):
93+
process.MessageLogger.cerr.FwkReport.reportEvery = 1
94+
else:
95+
process.MessageLogger.cerr.FwkReport.reportEvery = 100
96+
7197
process.load('Configuration.StandardSequences.Services_cff')
7298
process.add_( cms.Service( "TFileService",
7399
fileName = cms.string( options.outputFile ),
@@ -81,9 +107,6 @@
81107
fileNames = cms.untracked.vstring(options.inputFiles[0])
82108
)
83109

84-
process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) )
85-
process.MessageLogger.cerr.FwkReport.reportEvery = 10000
86-
87110
#definition of input collection
88111
process.CalibrationTracks.src = cms.InputTag( options.inputCollection )
89112
process.shallowTracks.Tracks = cms.InputTag( options.inputCollection )
@@ -98,22 +121,29 @@
98121
## process.L1T1.L1TechTriggerSeeding = cms.bool(True)
99122
## process.L1T1.L1SeedsLogicalExpression = cms.string('(40 OR 41) AND NOT (36 OR 37 OR 38 OR 39)')
100123

101-
#compressionSettings = 201
124+
compressionSettings = 201
102125
process.EventInfo = cms.EDAnalyzer("ShallowTree",
103126
CompressionSettings = process.gainCalibrationTreeStdBunch.CompressionSettings,
104127
outputCommands = cms.untracked.vstring('drop *',
105128
'keep *_shallowEventRun_*_*',
106129
)
107130
)
108-
#process.gainCalibrationTreeStdBunch.CompressionSettings = cms.untracked.int32(compressionSettings)
109-
#process.gainCalibrationTreeStdBunch0T.CompressionSettings = cms.untracked.int32(compressionSettings)
110-
#process.gainCalibrationTreeIsoMuon.CompressionSettings = cms.untracked.int32(compressionSettings)
111-
#process.gainCalibrationTreeIsoMuon0T.CompressionSettings = cms.untracked.int32(compressionSettings)
112-
#process.gainCalibrationTreeAagBunch.CompressionSettings = cms.untracked.int32(compressionSettings)
113-
#process.gainCalibrationTreeAagBunch0T.CompressionSettings = cms.untracked.int32(compressionSettings)
131+
132+
process.gainCalibrationTreeStdBunch.CompressionSettings = cms.untracked.int32(compressionSettings)
133+
process.gainCalibrationTreeStdBunch0T.CompressionSettings = cms.untracked.int32(compressionSettings)
134+
process.gainCalibrationTreeIsoMuon.CompressionSettings = cms.untracked.int32(compressionSettings)
135+
process.gainCalibrationTreeIsoMuon0T.CompressionSettings = cms.untracked.int32(compressionSettings)
136+
process.gainCalibrationTreeAagBunch.CompressionSettings = cms.untracked.int32(compressionSettings)
137+
process.gainCalibrationTreeAagBunch0T.CompressionSettings = cms.untracked.int32(compressionSettings)
114138

115139
#process.TkCalPath = cms.Path(process.L1T1*process.TkCalFullSequence)
116140

141+
### if it is a unit test run, do not look for not existing triggers
142+
### e.g. no AAG in MC
143+
144+
if(options.unitTest):
145+
alterTriggersForUnitTest(process)
146+
117147
process.TkCalPath_StdBunch = cms.Path(process.TkCalSeq_StdBunch*process.shallowEventRun*process.EventInfo)
118148
process.TkCalPath_StdBunch0T = cms.Path(process.TkCalSeq_StdBunch0T*process.shallowEventRun*process.EventInfo)
119149
process.TkCalPath_IsoMuon = cms.Path(process.TkCalSeq_IsoMuon*process.shallowEventRun*process.EventInfo)
@@ -123,13 +153,14 @@
123153

124154
process.schedule = cms.Schedule( process.TkCalPath_StdBunch,
125155
process.TkCalPath_StdBunch0T,
126-
process.TkCalPath_IsoMuon, # no After Abort Gap in MC
156+
process.TkCalPath_IsoMuon,
127157
process.TkCalPath_IsoMuon0T,
128158
process.TkCalPath_AagBunch,
129159
process.TkCalPath_AagBunch0T,
130160
)
131161

132162
process.options = cms.untracked.PSet(
163+
#wantSummary = cms.untracked.bool(True),
133164
Rethrow = cms.untracked.vstring('OtherCMS',
134165
'StdException',
135166
'Unknown',
@@ -157,3 +188,21 @@
157188
'ProductDoesNotSupportPtr',
158189
'NotFound')
159190
)
191+
192+
process.Timing = cms.Service("Timing",
193+
summaryOnly = cms.untracked.bool(True),
194+
useJobReport = cms.untracked.bool(True)
195+
)
196+
197+
'''
198+
if(options.unitTest):
199+
process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck",
200+
ignoreTotal = cms.untracked.int32(1),
201+
moduleMemorySummary = cms.untracked.bool(True)
202+
)
203+
'''
204+
205+
#Setup FWK for multithreaded
206+
process.options.numberOfThreads=cms.untracked.uint32(4)
207+
process.options.numberOfStreams=cms.untracked.uint32(0)
208+
#process.options.numberOfConcurrentLuminosityBlocks=cms.untracked.uint32(2) ## not yet

‎CalibTracker/SiStripCommon/test/test_all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ function die { echo $1: status $2 ; exit $2; }
44

55
echo "TESTING CalibTracker/SiStripCommon ..."
66
cmsRun ${LOCAL_TEST_DIR}/test_all_cfg.py || die "Failure running test_CalibTrackerSiStripCommon_cfg.py" $?
7-
cmsRun ${LOCAL_TEST_DIR}/testProduceCalibrationTree_cfg.py maxEvents=1 || die "Failure running produceCalibrationTree_template_cfg.py" $?
7+
cmsRun ${LOCAL_TEST_DIR}/testProduceCalibrationTree_cfg.py maxEvents=10 unitTest=True || die "Failure running produceCalibrationTree_template_cfg.py" $?

0 commit comments

Comments
 (0)