Skip to content

Commit

Permalink
Merge pull request #32200 from Dr15Jones/newMessageLoggerConfig_Valid…
Browse files Browse the repository at this point in the history 
…ation

Updated configurations in Validation to new MessageLogger syntax
  • Loading branch information
@cmsbuild
cmsbuild committed Nov 21, 2020
2 parents f2144e4 + 603c2e7 commit 4c9d718
Show file tree
Hide file tree
Showing 26 changed files with 238 additions and 223 deletions.
20 changes: 11 additions & 9 deletions Validation/CheckOverlap/python/testOverlap_cff.py
View file
Expand Up @@ -25,21 +25,23 @@
process.load("SimG4Core.Application.g4SimHits_cfi")

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('G4cout', 'G4cerr'),
debugModules = cms.untracked.vstring('*'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('DEBUG')
),
debugModules = cms.untracked.vstring('*')
)

process.load("IOMC.RandomEngine.IOMC_cff")
Expand Down
20 changes: 11 additions & 9 deletions Validation/CheckOverlap/test/python/runFastTiming_cfg.py
View file
Expand Up @@ -11,21 +11,23 @@
process.load("SimG4Core.Application.g4SimHits_cfi")

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('G4cout', 'G4cerr', 'HGCalGeom'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
HGCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
enable = cms.untracked.bool(True)
)
)

Expand Down
20 changes: 11 additions & 9 deletions Validation/CheckOverlap/test/python/runGEM_cfg.py
View file
Expand Up @@ -13,21 +13,23 @@
process.load("SimG4Core.Application.g4SimHits_cfi")

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('G4cout', 'G4cerr','MuonGeom'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
MuonGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
enable = cms.untracked.bool(True)
)
)

Expand Down
22 changes: 12 additions & 10 deletions Validation/CheckOverlap/test/python/runHE_cfg.py
View file
Expand Up @@ -14,27 +14,29 @@
process.load("SimG4Core.Application.g4SimHits_cfi")

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('G4cout', 'G4cerr', 'SimG4CoreGeometry', 'HCalGeom'),
debugModules = cms.untracked.vstring('*'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cerr = cms.untracked.PSet(
HCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
SimG4CoreGeometry = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('DEBUG')
),
debugModules = cms.untracked.vstring('*')
)

process.load("IOMC.RandomEngine.IOMC_cff")
Expand Down
22 changes: 12 additions & 10 deletions Validation/CheckOverlap/test/python/runHGC_cfg.py
View file
Expand Up @@ -13,24 +13,26 @@
process.load("SimG4Core.Application.g4SimHits_cfi")

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('G4cout', 'G4cerr', 'HGCalGeom'),
debugModules = cms.untracked.vstring('*'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cout = cms.untracked.PSet(
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cerr = cms.untracked.PSet(
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
HGCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('DEBUG')
),
debugModules = cms.untracked.vstring('*')
)

process.load("IOMC.RandomEngine.IOMC_cff")
Expand Down
7 changes: 5 additions & 2 deletions Validation/DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py
View file
Expand Up @@ -49,10 +49,13 @@
)

process.MessageLogger = cms.Service("MessageLogger",
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('WARNING')
),
destinations = cms.untracked.vstring('cout')
)
)

process.source = cms.Source("PoolSource",
Expand Down
12 changes: 8 additions & 4 deletions Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py
View file
Expand Up @@ -41,10 +41,14 @@
)

process.MessageLogger = cms.Service("MessageLogger",
cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING')
),
destinations = cms.untracked.vstring('cout')
)
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('WARNING')
)
)

process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring(
Expand Down
9 changes: 6 additions & 3 deletions Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py
View file
Expand Up @@ -53,10 +53,13 @@
)

process.MessageLogger = cms.Service("MessageLogger",
cout = cms.untracked.PSet(
threshold = cms.untracked.string('WARNING')
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
destinations = cms.untracked.vstring('cout')
cout = cms.untracked.PSet(
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('WARNING')
)
)

process.source = cms.Source("PoolSource",
Expand Down
12 changes: 8 additions & 4 deletions Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py
View file
Expand Up @@ -40,10 +40,14 @@
)

process.MessageLogger = cms.Service("MessageLogger",
cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING')
),
destinations = cms.untracked.vstring('cout')
)
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('WARNING')
)
)

process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring(
Expand Down
18 changes: 10 additions & 8 deletions Validation/Geometry/test/runP_Calo_cfg.py
View file
Expand Up @@ -26,18 +26,20 @@
)

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('MaterialBudget'),
debugModules = cms.untracked.vstring('*'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
MaterialBudget = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
MaterialBudget = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
)
enable = cms.untracked.bool(True),
threshold = cms.untracked.string('DEBUG')
),
debugModules = cms.untracked.vstring('*')
)

process.maxEvents = cms.untracked.PSet(
Expand Down
12 changes: 7 additions & 5 deletions Validation/Geometry/test/runP_Castor_cfg.py
View file
Expand Up @@ -21,15 +21,17 @@
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('MaterialBudget'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
MaterialBudget = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
MaterialBudget = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
enable = cms.untracked.bool(True)
)
)

Expand Down
14 changes: 8 additions & 6 deletions Validation/Geometry/test/runP_Density_cfg.py
View file
Expand Up @@ -26,16 +26,18 @@
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876

process.MessageLogger = cms.Service("MessageLogger",
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
FwkJob = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet( ## but FwkJob category - those unlimitted
limit = cms.untracked.int32(-1)
)
),
categories = cms.untracked.vstring('FwkJob'),
destinations = cms.untracked.vstring('cout')
enable = cms.untracked.bool(True)
)
)

process.source = cms.Source("PoolSource",
Expand Down
14 changes: 8 additions & 6 deletions Validation/Geometry/test/runP_ECAL_cfg.py
View file
Expand Up @@ -26,16 +26,18 @@
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876

process.MessageLogger = cms.Service("MessageLogger",
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
FwkJob = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet( ## but FwkJob category - those unlimitted
limit = cms.untracked.int32(-1)
)
),
categories = cms.untracked.vstring('FwkJob'),
destinations = cms.untracked.vstring('cout')
enable = cms.untracked.bool(True)
)
)

process.source = cms.Source("PoolSource",
Expand Down
17 changes: 9 additions & 8 deletions Validation/Geometry/test/runP_Forward_cfg.py
View file
Expand Up @@ -22,18 +22,19 @@
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('MaterialBudget'),
debugModules = cms.untracked.vstring('*'),
cerr = cms.untracked.PSet(
enable = cms.untracked.bool(False)
),
cout = cms.untracked.PSet(
# threshold = cms.untracked.string('DEBUG'),
MaterialBudget = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
MaterialBudget = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
)
enable = cms.untracked.bool(True)
),
debugModules = cms.untracked.vstring('*')
)

process.source = cms.Source("EmptySource",
Expand Down

0 comments on commit 4c9d718

Please sign in to comment.