Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DQM ZB workflows and moved DQM FS configuration to DQM package #28351

Merged
merged 14 commits into from
Nov 23, 2019
Merged

Fix DQM ZB workflows and moved DQM FS configuration to DQM package #28351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1dc047b
Fix to patch set on PR28336
jfernan2 Nov 4, 2019
11da9d9
Final tuning
jfernan2 Nov 5, 2019
0c0e89e
Removed Pixel Phase1 certification in the new configuration
jfernan2 Nov 5, 2019
ee225f0
Moved FS DQM confiuration into DQMOffline package and created standar…
jfernan2 Nov 5, 2019
b39bce3
Fixed typo
jfernan2 Nov 6, 2019
e2fb4bb
Bring back ack Certification in pixel and strips
jfernan2 Nov 6, 2019
f6cac3d
Final solution (hopefully)
jfernan2 Nov 6, 2019
bb0da32
Harvesting coherent with DQMFakeHlt
jfernan2 Nov 7, 2019
bf52be3
Reverting to old definition, which is apparently the same
jfernan2 Nov 7, 2019
7bd40ad
Tracking in ZB brought back
jfernan2 Nov 8, 2019
23ce9a0
Another typo...
jfernan2 Nov 9, 2019
f9d4cef
Removed wrong comma
jfernan2 Nov 15, 2019
f735dfe
Fixed another typo
jfernan2 Nov 21, 2019
b242359
commonFakeHLT too
jfernan2 Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ def inGeometryKeys(opt):
self.RECOBEFMIXDefaultCFF = 'FastSimulation.Configuration.Reconstruction_BefMix_cff'
self.RECOBEFMIXDefaultSeq = 'reconstruction_befmix'
self.NANODefaultSeq = 'nanoSequenceFS'
self.DQMOFFLINEDefaultCFF="FastSimulation.Configuration.DQMOfflineMC_cff"
self.DQMOFFLINEDefaultCFF="DQMOffline.Configuration.DQMOfflineFS_cff"

# Mixing
if self._options.pileup=='default':
Expand Down Expand Up @@ -1915,7 +1915,7 @@ def renameHLTprocessInSequence(self,sequence,proc=None,HLTprocess='HLT'):


def expandMapping(self,seqList,mapping,index=None):
maxLevel=25
maxLevel=30
level=0
while '@' in repr(seqList) and level<maxLevel:
level+=1
Expand Down
10 changes: 5 additions & 5 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,15 +960,15 @@ def genS(fragment,howMuch):
#### fastsim section ####
##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later
#step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--beamspot' : 'Realistic8TeVCollision',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
'--relval':'27000,3000'},
step1Defaults])
#step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--conditions' :'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
Expand All @@ -984,7 +984,7 @@ def genS(fragment,howMuch):
step1FastUpg2015_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
step1FastUpg2015Defaults])

step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--conditions' :'auto:phase1_2017_realistic',
'--beamspot' : 'Realistic25ns13TeVEarly2017Collision',
Expand All @@ -1000,7 +1000,7 @@ def genS(fragment,howMuch):
step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
step1FastUpg2017Defaults])

step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--conditions' :'auto:phase1_2018_realistic',
'--beamspot' :'Realistic25ns13TeVEarly2018Collision',
Expand Down Expand Up @@ -2547,7 +2547,7 @@ def gen2018HiMix(fragment,howMuch):


#data
steps['HARVESTD']={'-s':'HARVESTING:@standardDQM+@ExtraHLT+@miniAODDQM',
steps['HARVESTD']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM',
'--conditions':'auto:run1_data',
'--data':'',
'--filetype':'DQM',
Expand Down
6 changes: 1 addition & 5 deletions .../Configuration/python/DQMOfflineMC_cff.py → .../Configuration/python/DQMOfflineFS_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import FWCore.ParameterSet.Config as cms

# FastSim version of DQMOffline/Configuration/python/DQMOfflineMC_cff.py .
# On long term FastSim should actually use DQMOffline/Configuration/python/DQMOfflineMC_cff.py,
# with fastsim modifications applied via fastSim era.
# For now this is too much of a hassle because DQMOffline/Configuration/python/DQMOfflineMC_cff.py is a bit of a mess.
# Therefore we define here a FastSim specific DQM sequence with only the most relevant modules, and/or the ones that don't cause too much headache

from DQMOffline.RecoB.PrimaryVertexMonitor_cff import *
from DQM.Physics.DQMPhysics_cff import *
Expand All @@ -25,5 +21,5 @@
singleTopMuonMediumDQM.setup.jetExtras.jetCorrector = cms.InputTag("ak4PFCHSL1FastL2L3Corrector")
singleTopElectronMediumDQM.setup.jetExtras.jetCorrector = cms.InputTag("ak4PFCHSL1FastL2L3Corrector")

DQMOffline = cms.Sequence(DQMOfflinePrePOG)
DQMOfflineFS = cms.Sequence(DQMOfflinePrePOG)
PostDQMOffline = cms.Sequence()
1 change: 1 addition & 0 deletions DQMOffline/Configuration/python/DQMOffline_Certification_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
sipixelCertification # segfaults when included
Copy link
Contributor Author

@jfernan2 jfernan2 Nov 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmusich do you know/recall by chance why these lines are here? They actually try to remove Pixel certification on any Phase1 wf as I am now trying to do. Thanks

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git blame points to #17855

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @makortel !
I am afraid the removal was not fully effective, and now I am actually removing the PixelCertification in Phase1 wf, hence the change.
However, if I don't remove it I get:
Calling method for module SiPixelCertification/'sipixelCertification'
Exception Message:
A std::exception was thrown.
DQM object not found: Pixel/EventInfo/reportSummary

]))


DQMCertCommonFakeHLT = cms.Sequence( DQMCertCommon )
DQMCertCommonFakeHLT.remove( dqmOfflineTriggerCert )
2 changes: 1 addition & 1 deletion DQMOffline/Configuration/python/DQMOffline_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
DQMOfflineTAU = cms.Sequence( produceDenomsData *
pfTauRunDQMValidation )

DQMOfflineTrackerStrip = cms.Sequence( SiStripDQMTier0Common )
DQMOfflineTrackerStripCommon = cms.Sequence( SiStripDQMTier0Common )

DQMOfflineTrackerPixel = cms.Sequence( siPixelOfflineDQM_source )

Expand Down
46 changes: 31 additions & 15 deletions DQMOffline/Configuration/python/autoDQM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
autoDQM = { 'common': ['@dcs+DQMMessageLoggerSeq+@strip+@pixel+@tracking+@L1TMon+@hlt+@beam+@castor+@physics+@tau',
autoDQM = { 'DQMMessageLogger': ['DQMMessageLoggerSeq',
'PostDQMOffline',
'DQMMessageLoggerClientSeq'],

'common': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@hlt+@beam+@castor+@physics+@tau',
'PostDQMOffline',
'@dcs+DQMMessageLoggerClientSeq+@strip+@pixel+@tracking+@L1TMon+@hlt+@beam+@fed+@tau+dqmFastTimerServiceClient'],
'@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@hlt+@beam+@fed+@tau+dqmFastTimerServiceClient'],

fabiocos marked this conversation as resolved.
Show resolved Hide resolved
'commonFakeHLT': ['@dcs+DQMMessageLoggerSeq+@strip+@pixel+@tracking+@L1TMon+@beam+@castor+@physics+@tau',
'commonFakeHLT': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@beam+@castor+@physics+@tau',
'PostDQMOffline',
'@dcs+DQMMessageLoggerClientSeq+@strip+@pixel+@tracking+@L1TMon+@beam+@fed+@tau+dqmFastTimerServiceClient'],
'@dcs+@DQMMessageLoggerClient+@stripCommon+@pixel+@tracking+@L1TMon+@beam+@fed+@tau+dqmFastTimerServiceClient'],

'commonSiStripZeroBias': ['@dcs+DQMMessageLoggerSeq+DQMOfflineCommonSiStripZeroBias+@tracking+@L1TMon+@hlt+@beam+@castor+@physics',
'commonSiStripZeroBias': ['@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@hlt+@beam+@castor+@physics',
'PostDQMOffline',
'@dcs+DQMMessageLoggerClientSeq+DQMHarvestCommonSiStripZeroBias+@tracking+@L1TMon+@hlt+@beam+@fed+dqmFastTimerServiceClient'],
'@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@hlt+@beam+@fed+dqmFastTimerServiceClient'],

'commonSiStripZeroBiasFakeHLT': ['@dcs+DQMMessageLoggerSeq+DQMOfflineCommonSiStripZeroBiasFakeHLT+@tracking+@L1TMon+@beam+@castor+@physics',
'commonSiStripZeroBiasFakeHLT': ['@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@beam+@castor+@physics',
'PostDQMOffline',
'@dcs+DQMMessageLoggerClientSeq+DQMHarvestCommonSiStripZeroBiasFakeHLT+@tracking+@L1TMon+@beam+@fed+dqmFastTimerServiceClient'],
'@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@beam+@fed+dqmFastTimerServiceClient'],

'trackingOnlyDQM': ['DQMOfflineTracking',
'PostDQMOffline',
Expand All @@ -34,6 +38,10 @@
'PostDQMOffline',
'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],

'stripCommon': ['DQMOfflineTrackerStripCommon',
'PostDQMOffline',
'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],

'stripZeroBias': ['DQMOfflineTrackerStripMinBias',
'PostDQMOffline',
'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is DQMCertTrackerStrip removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module was giving an error without crash, so I originally removed it until I found another solution. I am very sorry for the inconvenience. Thanks for the check!

Expand All @@ -42,6 +50,10 @@
'PostDQMOffline',
'DQMHarvestTrackerPixel+DQMCertTrackerPixel'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is DQMCertTrackerPixel removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module was the cause of the crash, since it was originally removed for Phase1 wf. at the end of DQMOffline/Configuration/python/DQMOffline_Certification_cff.py
Until I realized that it took me a while. Now the configuration is much clearer IMHO so that this kind of mistakes should be less frequent now
I am very sorry. Thanks for the check!


'pixelOnlyDQM': ['DQMOfflineTrackerPixel',
'PostDQMOffline',
'DQMHarvestTrackerPixel'],

'castor': ['DQMOfflineCASTOR',
'PostDQMOffline',
'DQMNone'],
Expand All @@ -50,6 +62,10 @@
'PostDQMOffline',
'DQMHarvestTracking+DQMCertTracking'],

'trackingZeroBias': ['DQMOfflineTrackingMinBias',
'PostDQMOffline',
'DQMHarvestTracking+DQMCertTracking'],

'hlt': ['DQMOfflineTrigger',
'PostDQMOffline',
'DQMHarvestTrigger+DQMCertTrigger'],
Expand Down Expand Up @@ -162,23 +178,23 @@
'PostDQMOffline',
'DQMHarvestPF'],

# 'standardDQM': ['@dcs+@DQMMessageLogger+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@physics+@HLTMon',
'standardDQM': ['DQMOffline',
'PostDQMOffline',
'dqmHarvesting'],
# 'standardDQM': ['@dcs+DQMMessageLoggerSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@physics+@HLTMon',
# 'PostDQMOffline',
# '@dcs+DQMMessageLoggerClientSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@fed+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@HLTMon'],

'standardDQMFS': ['DQMOfflineFS',
'PostDQMOffline',
'dqmHarvesting'],

'ExtraHLT': ['DQMOfflineExtraHLT',
'PostDQMOffline',
'dqmHarvestingExtraHLT'],

'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
# 'standardDQMFakeHLT': ['@dcs+@DQMMessageLogger+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam+@physics',
'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
'PostDQMOffline',
'dqmHarvestingFakeHLT'],
# 'standardDQMFakeHLT': ['@dcs+DQMMessageLoggerSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam+@physics',
# 'PostDQMOffline',
# '@dcs+DQMMessageLoggerClientSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@fed+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam'],

'standardDQMHIFakeHLT': ['DQMOfflineHeavyIonsFakeHLT',
'PostDQMOfflineHI',
Expand Down