diff --git a/Alignment/APEEstimation/test/createTrackerAlignmentErrorExtendedRcd_cfg.py b/Alignment/APEEstimation/test/createTrackerAlignmentErrorExtendedRcd_cfg.py index 9ae78acf6f322..141f5a1800e13 100644 --- a/Alignment/APEEstimation/test/createTrackerAlignmentErrorExtendedRcd_cfg.py +++ b/Alignment/APEEstimation/test/createTrackerAlignmentErrorExtendedRcd_cfg.py @@ -118,37 +118,39 @@ ) -process.MessageLogger = cms.Service( - "MessageLogger", - statistics = cms.untracked.vstring('cout', 'alignment'), - categories = cms.untracked.vstring('Alignment'), +process.MessageLogger = cms.Service("MessageLogger", + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), cout = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - noLineBreaks = cms.untracked.bool(True) - ), - alignment = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), noLineBreaks = cms.untracked.bool(True), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(-1) + threshold = cms.untracked.string('DEBUG') + ), + files = cms.untracked.PSet( + alignment = cms.untracked.PSet( + Alignment = cms.untracked.PSet( + limit = cms.untracked.int32(-1) ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(-1) + DEBUG = cms.untracked.PSet( + limit = cms.untracked.int32(-1) ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(-1) + ERROR = cms.untracked.PSet( + limit = cms.untracked.int32(-1) ), - threshold = cms.untracked.string('INFO'), - Alignment = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) - ), - destinations = cms.untracked.vstring( - 'cout', ## .log automatically - 'alignment') + INFO = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + WARNING = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + enableStatistics = cms.untracked.bool(True), + noLineBreaks = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ) ) +) ### speficy the source diff --git a/Alignment/CommonAlignmentAlgorithm/test/apeSetting_cfg.py b/Alignment/CommonAlignmentAlgorithm/test/apeSetting_cfg.py index 48d9d6b29b2a6..fe9f89846ec87 100644 --- a/Alignment/CommonAlignmentAlgorithm/test/apeSetting_cfg.py +++ b/Alignment/CommonAlignmentAlgorithm/test/apeSetting_cfg.py @@ -37,33 +37,37 @@ # to be refined... process.MessageLogger = cms.Service("MessageLogger", - statistics = cms.untracked.vstring('cout', 'alignment'), - categories = cms.untracked.vstring('Alignment'), - cout = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - noLineBreaks = cms.untracked.bool(True) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) ), - alignment = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), noLineBreaks = cms.untracked.bool(True), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - threshold = cms.untracked.string('INFO'), - Alignment = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) + threshold = cms.untracked.string('DEBUG') ), - destinations = cms.untracked.vstring('cout', ## .log automatically - 'alignment') + files = cms.untracked.PSet( + alignment = cms.untracked.PSet( + Alignment = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + DEBUG = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + ERROR = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + INFO = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + WARNING = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + enableStatistics = cms.untracked.bool(True), + noLineBreaks = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ) + ) ) process.source = cms.Source("EmptySource") diff --git a/Alignment/CommonAlignmentProducer/test/alignment_cfg.py b/Alignment/CommonAlignmentProducer/test/alignment_cfg.py index e7f0f97b7e444..5c89bcc29e706 100644 --- a/Alignment/CommonAlignmentProducer/test/alignment_cfg.py +++ b/Alignment/CommonAlignmentProducer/test/alignment_cfg.py @@ -4,35 +4,37 @@ # initialize MessageLogger process.MessageLogger = cms.Service("MessageLogger", - statistics = cms.untracked.vstring('cout', - 'alignment'), - categories = cms.untracked.vstring('Alignment'), - cout = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - noLineBreaks = cms.untracked.bool(True) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) ), - alignment = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), noLineBreaks = cms.untracked.bool(True), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - threshold = cms.untracked.string('INFO'), - Alignment = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) + threshold = cms.untracked.string('DEBUG') ), - destinations = cms.untracked.vstring('cout', ## .log automatically - - 'alignment') + files = cms.untracked.PSet( + alignment = cms.untracked.PSet( + Alignment = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + DEBUG = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + ERROR = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + INFO = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + WARNING = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + enableStatistics = cms.untracked.bool(True), + noLineBreaks = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ) + ) ) # we need conditions diff --git a/Alignment/HIPAlignmentAlgorithm/test/serialGeomCompare_tpl.py b/Alignment/HIPAlignmentAlgorithm/test/serialGeomCompare_tpl.py index ed4aad7447f8a..abeaed18f5330 100644 --- a/Alignment/HIPAlignmentAlgorithm/test/serialGeomCompare_tpl.py +++ b/Alignment/HIPAlignmentAlgorithm/test/serialGeomCompare_tpl.py @@ -14,8 +14,17 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('detailedInfo', - 'cout') + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True) + ), + files = cms.untracked.PSet( + detailedInfo = cms.untracked.PSet( + + ) + ) ) process.source = cms.Source("EmptySource") diff --git a/Alignment/HIPAlignmentAlgorithm/test/serialIntoNtuples_tpl.py b/Alignment/HIPAlignmentAlgorithm/test/serialIntoNtuples_tpl.py index 09d2a3e197d1f..3603f23d2f7e1 100644 --- a/Alignment/HIPAlignmentAlgorithm/test/serialIntoNtuples_tpl.py +++ b/Alignment/HIPAlignmentAlgorithm/test/serialIntoNtuples_tpl.py @@ -12,8 +12,17 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('detailedInfo', - 'cout') + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True) + ), + files = cms.untracked.PSet( + detailedInfo = cms.untracked.PSet( + + ) + ) ) process.PoolDBESSource = cms.ESSource("PoolDBESSource", diff --git a/Alignment/LaserAlignment/test/LaserAlignmentEventFilter_test.py b/Alignment/LaserAlignment/test/LaserAlignmentEventFilter_test.py index 75f30aae07050..2cad04bc42dd2 100644 --- a/Alignment/LaserAlignment/test/LaserAlignmentEventFilter_test.py +++ b/Alignment/LaserAlignment/test/LaserAlignmentEventFilter_test.py @@ -39,17 +39,15 @@ ) ## message logger -process.MessageLogger = cms.Service( - "MessageLogger", - destinations = cms.untracked.vstring( 'cout', 'cerr' ), - #destinations = cms.untracked.vstring( 'cerr' ), - debugModules = cms.untracked.vstring( 'LaserAlignmentEventFilter' ), +process.MessageLogger = cms.Service("MessageLogger", cerr = cms.untracked.PSet( - threshold = cms.untracked.string( 'ERROR' ) + threshold = cms.untracked.string('ERROR') ), cout = cms.untracked.PSet( - threshold = cms.untracked.string( 'INFO' ) - ) + enable = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ), + debugModules = cms.untracked.vstring('LaserAlignmentEventFilter') ) diff --git a/Alignment/LaserAlignment/test/RawDataConverter_full_chain.py b/Alignment/LaserAlignment/test/RawDataConverter_full_chain.py index 865f8a183e797..b69d70bc5a7c1 100644 --- a/Alignment/LaserAlignment/test/RawDataConverter_full_chain.py +++ b/Alignment/LaserAlignment/test/RawDataConverter_full_chain.py @@ -18,17 +18,15 @@ ) ## message logger -process.MessageLogger = cms.Service( - "MessageLogger", - destinations = cms.untracked.vstring( 'cout', 'cerr' ), - #destinations = cms.untracked.vstring( 'cerr' ), - debugModules = cms.untracked.vstring( 'RawDataConverter' ), +process.MessageLogger = cms.Service("MessageLogger", cerr = cms.untracked.PSet( - threshold = cms.untracked.string( 'ERROR' ) + threshold = cms.untracked.string('ERROR') ), cout = cms.untracked.PSet( - threshold = cms.untracked.string( 'INFO' ) - ) + enable = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ), + debugModules = cms.untracked.vstring('RawDataConverter') ) diff --git a/Alignment/LaserAlignment/test/t0ProducerStandalone.py b/Alignment/LaserAlignment/test/t0ProducerStandalone.py index 1c5d6e5d113d4..74d8686b6bd8e 100644 --- a/Alignment/LaserAlignment/test/t0ProducerStandalone.py +++ b/Alignment/LaserAlignment/test/t0ProducerStandalone.py @@ -3,14 +3,14 @@ process = cms.Process( "laserAlignmentT0ProducerProcess" ) -process.MessageLogger = cms.Service( "MessageLogger", - cerr = cms.untracked.PSet( - threshold = cms.untracked.string( 'ERROR' ) - ), - cout = cms.untracked.PSet( - threshold = cms.untracked.string( 'INFO' ) - ), - destinations = cms.untracked.vstring( 'cout', 'cerr' ) +process.MessageLogger = cms.Service("MessageLogger", + cerr = cms.untracked.PSet( + threshold = cms.untracked.string('ERROR') + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ) ) process.source = cms.Source( "PoolSource", diff --git a/Alignment/LaserAlignment/test/t0ProducerStandalone_LASFilter.py b/Alignment/LaserAlignment/test/t0ProducerStandalone_LASFilter.py index d7e50b8354278..24525583d7318 100644 --- a/Alignment/LaserAlignment/test/t0ProducerStandalone_LASFilter.py +++ b/Alignment/LaserAlignment/test/t0ProducerStandalone_LASFilter.py @@ -3,14 +3,14 @@ process = cms.Process( "laserAlignmentT0ProducerProcess" ) -process.MessageLogger = cms.Service( "MessageLogger", - cerr = cms.untracked.PSet( - threshold = cms.untracked.string( 'ERROR' ) - ), - cout = cms.untracked.PSet( - threshold = cms.untracked.string( 'INFO' ) - ), - destinations = cms.untracked.vstring( 'cout', 'cerr' ) +process.MessageLogger = cms.Service("MessageLogger", + cerr = cms.untracked.PSet( + threshold = cms.untracked.string('ERROR') + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + threshold = cms.untracked.string('INFO') + ) ) process.source = cms.Source( "PoolSource", diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py index 774d862012566..52a82ef24ce4d 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py +++ b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py @@ -12,46 +12,33 @@ # process.load("FWCore.MessageLogger.MessageLogger_cfi") # This whole mess does not really work - I do not get rid of FwkReport and TrackProducer info... process.MessageLogger = cms.Service("MessageLogger", - statistics = cms.untracked.vstring('alignment'), ##, 'cout') - - categories = cms.untracked.vstring('Alignment', - 'LogicError', - 'FwkReport', - 'TrackProducer'), - # FwkReport = cms.untracked.PSet( threshold = cms.untracked.string('WARNING') ), - # TrackProducer = cms.untracked.PSet( threshold = cms.untracked.string('WARNING') ), -# cout = cms.untracked.PSet( -# threshold = cms.untracked.string('DEBUG'), -# FwkReport = cms.untracked.PSet( -# threshold = cms.untracked.string('ERROR') -# ), -# TrackProducer = cms.untracked.PSet( -# threshold = cms.untracked.string('ERROR') -# ) -# ), - alignment = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(10) - ), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(10) - ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - threshold = cms.untracked.string('DEBUG'), - LogicError = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - Alignment = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) ), - destinations = cms.untracked.vstring('alignment') ## (, 'cout') - + files = cms.untracked.PSet( + alignment = cms.untracked.PSet( + Alignment = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + DEBUG = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + ERROR = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + INFO = cms.untracked.PSet( + limit = cms.untracked.int32(10) + ), + LogicError = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + WARNING = cms.untracked.PSet( + limit = cms.untracked.int32(10) + ), + enableStatistics = cms.untracked.bool(True), + threshold = cms.untracked.string('DEBUG') + ) + ) ) # initialize magnetic field diff --git a/Alignment/MuonAlignment/test/MuonGeometryArrange.py b/Alignment/MuonAlignment/test/MuonGeometryArrange.py index b2869fb7f0f15..dba3cf1182aec 100644 --- a/Alignment/MuonAlignment/test/MuonGeometryArrange.py +++ b/Alignment/MuonAlignment/test/MuonGeometryArrange.py @@ -69,14 +69,15 @@ ) process.MessageLogger = cms.Service("MessageLogger", - info_txt = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), - cerr = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), - destinations = cms.untracked.vstring('info_txt','cerr') - ) + cerr = cms.untracked.PSet( + threshold = cms.untracked.string('INFO') + ), + files = cms.untracked.PSet( + info_txt = cms.untracked.PSet( + threshold = cms.untracked.string('INFO') + ) + ) +) process.source = cms.Source("EmptySource") diff --git a/Alignment/MuonAlignment/test/test-read_cfg.py b/Alignment/MuonAlignment/test/test-read_cfg.py index 3945936264509..f1afb82b96b2b 100644 --- a/Alignment/MuonAlignment/test/test-read_cfg.py +++ b/Alignment/MuonAlignment/test/test-read_cfg.py @@ -16,14 +16,14 @@ process.load("Alignment.MuonAlignment.Scenarios_cff") process.MessageLogger = cms.Service("MessageLogger", - info_txt = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), cerr = cms.untracked.PSet( threshold = cms.untracked.string('ERROR') ), - destinations = cms.untracked.vstring('info_txt', - 'cerr') + files = cms.untracked.PSet( + info_txt = cms.untracked.PSet( + threshold = cms.untracked.string('INFO') + ) + ) ) process.maxEvents = cms.untracked.PSet( diff --git a/Alignment/OfflineValidation/test/testCompare_cfg.py b/Alignment/OfflineValidation/test/testCompare_cfg.py index a43bb868c4f04..641a72c8e3d74 100644 --- a/Alignment/OfflineValidation/test/testCompare_cfg.py +++ b/Alignment/OfflineValidation/test/testCompare_cfg.py @@ -17,8 +17,17 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('detailedInfo', - 'cout') + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True) + ), + files = cms.untracked.PSet( + detailedInfo = cms.untracked.PSet( + + ) + ) ) process.source = cms.Source("EmptySource") diff --git a/Alignment/OfflineValidation/test/testIntoNtuples_cfg.py b/Alignment/OfflineValidation/test/testIntoNtuples_cfg.py index 916d1497bb10a..a6b2bda506b4b 100644 --- a/Alignment/OfflineValidation/test/testIntoNtuples_cfg.py +++ b/Alignment/OfflineValidation/test/testIntoNtuples_cfg.py @@ -16,9 +16,18 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('detailedInfo', - 'cout') - ) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), + cout = cms.untracked.PSet( + enable = cms.untracked.bool(True) + ), + files = cms.untracked.PSet( + detailedInfo = cms.untracked.PSet( + + ) + ) +) from CondCore.DBCommon.CondDBSetup_cfi import * diff --git a/Alignment/SurveyAnalysis/test/run-converter_cfg.py b/Alignment/SurveyAnalysis/test/run-converter_cfg.py index 714b74c24122b..d0daec393fd78 100644 --- a/Alignment/SurveyAnalysis/test/run-converter_cfg.py +++ b/Alignment/SurveyAnalysis/test/run-converter_cfg.py @@ -14,19 +14,22 @@ process.load("Alignment.SurveyAnalysis.SurveyInfoScenario_cff") process.MessageLogger = cms.Service("MessageLogger", - test = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - noLineBreaks = cms.untracked.bool(True) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) ), - statistics = cms.untracked.vstring('cout', - 'test'), cout = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - noLineBreaks = cms.untracked.bool(True) + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), + noLineBreaks = cms.untracked.bool(True), + threshold = cms.untracked.string('DEBUG') ), - categories = cms.untracked.vstring('Alignment'), - destinations = cms.untracked.vstring('cout', - 'test') + files = cms.untracked.PSet( + test = cms.untracked.PSet( + enableStatistics = cms.untracked.bool(True), + noLineBreaks = cms.untracked.bool(True), + threshold = cms.untracked.string('DEBUG') + ) + ) ) process.maxEvents = cms.untracked.PSet( diff --git a/Alignment/TrackerAlignment/test/trackerGeometryAnalyzer_cfg.py b/Alignment/TrackerAlignment/test/trackerGeometryAnalyzer_cfg.py index 1e43019785d1a..09856e25c4673 100644 --- a/Alignment/TrackerAlignment/test/trackerGeometryAnalyzer_cfg.py +++ b/Alignment/TrackerAlignment/test/trackerGeometryAnalyzer_cfg.py @@ -6,26 +6,32 @@ # Logging process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger = cms.Service("MessageLogger", - #statistics = cms.untracked.vstring('trackerGeometryAnalyzer'), - destinations = cms.untracked.vstring('trackerGeometryAnalyzer'), - categories = cms.untracked.vstring( - 'TrackerGeometryAnalyzer', - 'AlignableBuildProcess' - #'AlignableMap' - ), - - trackerGeometryAnalyzer = cms.untracked.PSet( - INFO = cms.untracked.PSet(limit = cms.untracked.int32( 0)), - DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(-1)), - WARNING = cms.untracked.PSet(limit = cms.untracked.int32( 0)), - ERROR = cms.untracked.PSet(limit = cms.untracked.int32(-1)), - - threshold = cms.untracked.string('DEBUG'), - - TrackerGeometryAnalyzer = cms.untracked.PSet(limit = cms.untracked.int32(-1)), - AlignableBuildProcess = cms.untracked.PSet(limit = cms.untracked.int32(-1)) - #AlignableMap = cms.untracked.PSet(limit = cms.untracked.int32(-1)) - ) + cerr = cms.untracked.PSet( + enable = cms.untracked.bool(False) + ), + files = cms.untracked.PSet( + trackerGeometryAnalyzer = cms.untracked.PSet( + AlignableBuildProcess = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + DEBUG = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + ERROR = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + INFO = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + TrackerGeometryAnalyzer = cms.untracked.PSet( + limit = cms.untracked.int32(-1) + ), + WARNING = cms.untracked.PSet( + limit = cms.untracked.int32(0) + ), + threshold = cms.untracked.string('DEBUG') + ) + ) ) #===============================================================================