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.

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] Update GT for DQM clients unitTests and input file used for unitTest #38713

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@
else:
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')
process.GlobalTag.DBParameters.authenticationPath = '.'
# you may need to set manually the GT in the line below
#process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'


#--------------------------------------------------------
# Swap offline <-> online BeamSpot as in Express and HLT
import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
else:
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')
# you may need to set manually the GT in the line below
#process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
process.GlobalTag.DBParameters.authenticationPath = cms.untracked.string('.')
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

# Change Beam Monitor variables
process.dqmBeamMonitor.useLockRecords = cms.untracked.bool(useLockRecords)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
else:
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')
# you may need to set manually the GT in the line below
#process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
# Use this to run locally (for testing purposes), choose the right GT
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#from Configuration.AlCa.GlobalTag import GlobalTag
#process.GlobalTag = GlobalTag(process.GlobalTag, "auto:run2_data", "")
#process.GlobalTag = GlobalTag(process.GlobalTag, "auto:run3_data", "")
# Otherwise use this
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
##
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#-----------------------------
# Castor DQM Source + SimpleReconstrctor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#--------------------------
# Service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
#---- for offline DB: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

# message logger
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
#---- for offline DB: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

# message logger
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

process.load("EventFilter.ESRawToDigi.esRawToDigi_cfi")
#process.ecalPreshowerDigis = EventFilter.ESRawToDigi.esRawToDigi_cfi.esRawToDigi.clone()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

process.hltESSHcalSeverityLevel = cms.ESSource( "EmptyESSource",
iovIsRunNotTime = cms.bool( True ),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
process.GlobalTag.RefreshEachRun = True
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3s_data', '')

#process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
process.GlobalTag.RefreshEachRun = True
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#process.load("Configuration.StandardSequences.GeometryRecoDB_cff")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
process.GlobalTag.RefreshEachRun = True
# Condition for lxplus:: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
process.GlobalTag.RefreshEachRun = True
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#process.load("Configuration.StandardSequences.GeometryRecoDB_cff")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

# # Condition for lxplus: change and possibly customise the GT
# from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
# process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
# process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

# Required to load EcalMappingRecord
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
elif(offlineTesting):
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

# Please *do not* delete this toGet statement as it is needed to fetch BeamSpotOnline
# information every lumisection (instead of every run as for the other records in the GT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
process.load('Configuration/StandardSequences/MagneticField_AutoFromDBCurrent_cff')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
elif(offlineTesting):
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#-----------------------
# Reconstruction Modules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#-----------------------
# Reconstruction Modules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# Condition for lxplus: change and possibly customise the GT
#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')
#process.GlobalTag.globaltag = "102X_dataRun2_Express_v4"
process.GlobalTag.RefreshEachRun = True

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#you may need to set manually the GT in the line below
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#--------------------------------------------
## Patch to avoid using Run Info information in reconstruction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
# Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')

#----------------------------
# DQM Live Environment
Expand Down
8 changes: 4 additions & 4 deletions DQM/Integration/python/config/unittestinputsource_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@
"Unique run key from RCMS for Frontier")

options.register('runNumber',
344518,
355380,
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.int,
"Run number. This run number has to be present in the dataset configured with the dataset option.")

options.register('dataset',
'/ExpressCosmics/Commissioning2021-Express-v1/FEVT',
'/ExpressPhysics/Run2022B-Express-v1/FEVT',
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"Dataset name like '/ExpressCosmics/Commissioning2021-Express-v1/FEVT'")

options.register('maxLumi',
2,
20,
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.int,
"Only lumisections up to maxLumi are processed.")

options.register('minLumi',
1,
19,
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.int,
"Only lumisections starting from minLumi are processed.")
Expand Down