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

[12_4_X] simple RECO squence for SPLASH runs #37624

Merged
merged 5 commits into from
May 10, 2022
Merged

[12_4_X] simple RECO squence for SPLASH runs #37624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a22ba3
add splash run option
pmandrik Apr 19, 2022
3f62b89
add splash run option
pmandrik Apr 19, 2022
51d1808
move reco options into dqm clients
pmandrik May 9, 2022
1fdb41b
move reco options into dqm clients v2
pmandrik May 9, 2022
7a55b8e
add BeamSplashRun to unittest config
pmandrik May 9, 2022
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
7 changes: 6 additions & 1 deletion Configuration/DataProcessing/python/Reco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ def visualizationProcessing(self, globalTag, **args):

eiStep=''

options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB'
if 'beamSplashRun' in args:
Copy link
Contributor

Choose a reason for hiding this comment

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

this should instead be implemented as a new scenario under Impl (eg, beam splash 2022) Then no need for the complex logic.

Copy link
Contributor

Choose a reason for hiding this comment

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

IIUC, there is no need for this scenario for prompt/express/alca.
Also, this file will still have to be modified to allow injecting a different sequence; the alternative is reimplementing the Reco.visualizationProcessing in full in a base e.g. beamSplash scenario would then trigger a need for support for era-specific files as well. This is way more complex than what is here now.

So, it seemed to me that injection here is more appropriate when I proposed this to the DQM developers about a month ago.

Copy link
Contributor

Choose a reason for hiding this comment

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

perhaps just keep this generic and implement a way to override options.step. (and rename eistep to something more appropriate..)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

eiStep variable was already here, but maybe I can just rename it following you proposal and [0] discussion?
[0] #32643

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I re-implemented beamSplashRun check in the same fashion as

cmssw/Configuration/DataProcessing/python/Reco.py

Lines 155 to 157 in 1fdb41b

if 'preFilter' in args:
options.step +='FILTER:'+args['preFilter']+','
moving out the reco options into ED DQM clients code

options.step += 'RAW2DIGI,L1Reco,RECO'+args['beamSplashRun']+',ENDJOB'
print("Using RECO%s step in visualizationProcessing" % args['beamSplashRun'])
else :
options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB'



dictIO(options,args)
Expand Down
3 changes: 2 additions & 1 deletion DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
from DQM.Integration.config.FrontierCondition_GT_autoExpress_cfi import GlobalTag
kwds = {
'globalTag': GlobalTag.globaltag.value(),
'globalTagConnect': GlobalTag.connect.value()
'globalTagConnect': GlobalTag.connect.value(),
'beamSplashRun' : ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if options.BeamSplashRun else "",
}

# explicitly select the input collection, since we get multiple in online
Expand Down
3 changes: 2 additions & 1 deletion DQM/Integration/python/clients/visualization-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
from DQM.Integration.config.FrontierCondition_GT_autoExpress_cfi import GlobalTag
kwds = {
'globalTag': GlobalTag.globaltag.value(),
'globalTagConnect': GlobalTag.connect.value()
'globalTagConnect': GlobalTag.connect.value(),
'beamSplashRun' : ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if options.BeamSplashRun else "",
}

# explicitly select the input collection, since we get multiple in online
Expand Down
6 changes: 6 additions & 0 deletions DQM/Integration/python/config/unittestinputsource_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
VarParsing.VarParsing.varType.int,
"This number of last events in each lumisection will be processed.")

options.register('BeamSplashRun',
False, # default value
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.bool,
"Set client source settings for beam SPLASH run")

# This is used only by the online clients themselves.
# We need to register it here because otherwise an error occurs saying that there is an unidentified option.
options.register('unitTest',
Expand Down