cms-sw · cmsbuild · Dec 8, 2020 · Nov 17, 2020 · Nov 20, 2020 · Nov 22, 2020
diff --git a/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py b/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py
@@ -32,8 +32,7 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('AlignmentTrackSelector')
-#process.MessageLogger.categories.append('')
+process.MessageLogger.AlignmentTrackSelector=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1
 process.MessageLogger.cerr.AlignmentTrackSelector = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py b/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py
@@ -54,8 +54,8 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('DefaultAPETree')
-process.MessageLogger.categories.append('SectorBuilder')
+process.MessageLogger.DefaultAPETree=dict()
+process.MessageLogger.SectorBuilder=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = 0
 process.MessageLogger.cerr.DefaultAPETree = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py b/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py
@@ -35,7 +35,7 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('CalculateAPE')
+process.MessageLogger.CalculateAPE=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = 0
 process.MessageLogger.cerr.CalculateAPE = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py b/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py
@@ -50,13 +50,13 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('SectorBuilder')
-process.MessageLogger.categories.append('ResidualErrorBinning')
-process.MessageLogger.categories.append('HitSelector')
-process.MessageLogger.categories.append('CalculateAPE')
-process.MessageLogger.categories.append('ApeEstimator')
-process.MessageLogger.categories.append('TrackRefitter')
-process.MessageLogger.categories.append('AlignmentTrackSelector')
+process.MessageLogger.SectorBuilder=dict()
+process.MessageLogger.ResidualErrorBinning=dict()
+process.MessageLogger.HitSelector=dict()
+process.MessageLogger.CalculateAPE=dict()
+process.MessageLogger.ApeEstimator=dict()
+process.MessageLogger.TrackRefitter=dict()
+process.MessageLogger.AlignmentTrackSelector=dict()
 process.MessageLogger.cerr.threshold = 'WARNING'
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1

diff --git a/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py b/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py
@@ -41,8 +41,8 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('CalculateAPE')
-#process.MessageLogger.categories.append('ApeEstimatorSummary')
+process.MessageLogger.CalculateAPE=dict()
+#process.MessageLogger.ApeEstimatorSummary=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1
 process.MessageLogger.cerr.CalculateAPE = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/APEEstimation/test/testApeestimator_cfg.py b/Alignment/APEEstimation/test/testApeestimator_cfg.py
@@ -40,13 +40,13 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.categories.append('SectorBuilder')
-process.MessageLogger.categories.append('ResidualErrorBinning')
-process.MessageLogger.categories.append('HitSelector')
-process.MessageLogger.categories.append('CalculateAPE')
-process.MessageLogger.categories.append('ApeEstimator')
-#process.MessageLogger.categories.append('TrackRefitter')
-process.MessageLogger.categories.append('AlignmentTrackSelector')
+process.MessageLogger.SectorBuilder=dict()
+process.MessageLogger.ResidualErrorBinning=dict()
+process.MessageLogger.HitSelector=dict()
+process.MessageLogger.CalculateAPE=dict()
+process.MessageLogger.ApeEstimator=dict()
+#process.MessageLogger.TrackRefitter=dict()
+process.MessageLogger.AlignmentTrackSelector=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1  # Do not use =0, else all error messages (except those listed below) are supressed
 process.MessageLogger.cerr.SectorBuilder = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py b/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py
@@ -18,7 +18,7 @@ process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 process.GlobalTag.globaltag = '%%%GLOBALTAG%%%'
 
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger = cms.Service("MessageLogger",
         destinations = cms.untracked.vstring("%%%LOGFILE%%%"),
         %%%LOGFILE%%% = cms.untracked.PSet(

diff --git a/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py b/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py
@@ -14,10 +14,8 @@
 
 # initialize  MessageLogger
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.destinations = ['alignment']
-process.MessageLogger.statistics = ['alignment']
-process.MessageLogger.categories = ['Alignment']
-process.MessageLogger.alignment = cms.untracked.PSet(
+
+process.MessageLogger.files.alignment = cms.untracked.PSet(
     DEBUG = cms.untracked.PSet(
         limit = cms.untracked.int32(-1)
         ),
@@ -32,11 +30,12 @@
         ),
     Alignment = cms.untracked.PSet(
         limit = cms.untracked.int32(-1),
-        )
+        ),
+    enableStatistics = cms.untracked.bool(True)
     )
 
 
-process.MessageLogger.cerr.placeholder = cms.untracked.bool(True)
+process.MessageLogger.cerr.enable = cms.untracked.bool(False)
 process.options   = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) )
 
 

diff --git a/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py b/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py
@@ -5,7 +5,6 @@
 
 # Messages
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.destinations = ['cout', 'cerr']
 process.MessageLogger.cerr.FwkReport.reportEvery = 10000
 
 process.load("Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi")

diff --git a/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py b/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py
@@ -6,12 +6,12 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
     reportEvery = cms.untracked.int32(100) # every 100th only
 #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...
     ))
-process.MessageLogger.statistics.append('cout')
+process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True)
 
 ##
 ## Process options

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py
@@ -10,7 +10,7 @@
 
 # initialize  MessageLogger
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.alignment = cms.untracked.PSet(
+process.MessageLogger.files.alignment = cms.untracked.PSet(
     DEBUG = cms.untracked.PSet(
         limit = cms.untracked.int32(-1)
         ),
@@ -27,12 +27,11 @@
     Alignment = cms.untracked.PSet(
         limit = cms.untracked.int32(-1),
         reportEvery = cms.untracked.int32(1)
-        )
+        ),
+    enableStatistics = cms.untracked.bool(True)
     )
-process.MessageLogger.cerr.placeholder = cms.untracked.bool(True)
-process.MessageLogger.destinations = ['alignment']
-process.MessageLogger.statistics = ['alignment']
-process.MessageLogger.categories = ['Alignment']
+process.MessageLogger.cerr.enable = cms.untracked.bool(False)
+
 
 
 # initialize magnetic field

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py
@@ -14,7 +14,7 @@
 
 # initialize  MessageLogger
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.alignment = cms.untracked.PSet(
+process.MessageLogger.files.alignment = cms.untracked.PSet(
     DEBUG = cms.untracked.PSet(
         limit = cms.untracked.int32(-1)
         ),
@@ -31,12 +31,9 @@
     Alignment = cms.untracked.PSet(
         limit = cms.untracked.int32(-1),
         reportEvery = cms.untracked.int32(1)
-        )
+        ),
+    enableStatistics = cms.untracked.bool(True)
     )
-process.MessageLogger.cerr.placeholder = cms.untracked.bool(True)
-process.MessageLogger.destinations = ['alignment']
-process.MessageLogger.statistics = ['alignment']
-process.MessageLogger.categories = ['Alignment']
 
 
 # initialize magnetic field

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py
@@ -10,7 +10,7 @@
 
 # initialize  MessageLogger
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.alignment = cms.untracked.PSet(
+process.MessageLogger.files.alignment = cms.untracked.PSet(
     DEBUG = cms.untracked.PSet(
         limit = cms.untracked.int32(-1)
         ),
@@ -27,12 +27,11 @@
     Alignment = cms.untracked.PSet(
         limit = cms.untracked.int32(-1),
         reportEvery = cms.untracked.int32(1)
-        )
+        ),
+    enableStatistics = cms.untracked.bool(True)
     )
-process.MessageLogger.cerr.placeholder = cms.untracked.bool(True)
-process.MessageLogger.destinations = ['alignment']
-process.MessageLogger.statistics = ['alignment']
-process.MessageLogger.categories = ['Alignment']
+process.MessageLogger.cerr.enable = cms.untracked.bool(False)
+
 
 
 # initialize magnetic field

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py
@@ -29,7 +29,7 @@
 # MessageLogger
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.MessageLogger.cerr.threshold = 'INFO'
-process.MessageLogger.categories.append('TrackerTreeGenerator')
+process.MessageLogger.TrackerTreeGenerator=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1
 process.MessageLogger.cerr.TrackerTreeGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1))

diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py
@@ -157,9 +157,8 @@
 )
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
-process.MessageLogger.destinations = ['cout', 'cerr']
 process.MessageLogger.cerr.FwkReport.reportEvery = 1000
-process.MessageLogger.statistics.append('cout')
+process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True)
 """
 
 

diff --git a/Alignment/OfflineValidation/test/GeometryCentering_cfg.py b/Alignment/OfflineValidation/test/GeometryCentering_cfg.py
@@ -5,7 +5,6 @@
 process.load("Configuration.Geometry.GeometryDB_cff")
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.destinations = ['cout', 'cerr']
 
 ### needed to get the geometry
 from Configuration.AlCa.GlobalTag import GlobalTag

diff --git a/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py b/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py
@@ -80,7 +80,6 @@ def customiseKinksAndBows(process):
 # Messages
 ###################################################################
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.destinations = ['cout', 'cerr']
 process.MessageLogger.cerr.FwkReport.reportEvery = 1000
 
 ####################################################################

diff --git a/Alignment/OfflineValidation/test/PVValidation_T_cfg.py b/Alignment/OfflineValidation/test/PVValidation_T_cfg.py
@@ -75,7 +75,6 @@ def customiseKinksAndBows(process):
 # Messages
 ###################################################################
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.destinations = ['cout', 'cerr']
 process.MessageLogger.cerr.FwkReport.reportEvery = 1000
 
 ####################################################################

diff --git a/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py b/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py
@@ -59,7 +59,7 @@ def best_match(rcd):
 print("maxEvents         : ", options.maxEvents)
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
         reportEvery = cms.untracked.int32(1000) # every 100th only
         #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...

diff --git a/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py b/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py
@@ -65,7 +65,7 @@ def best_match(rcd):
 print("outputFile        : ", options.outputRootFile)
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
         reportEvery = cms.untracked.int32(1000) # every 100th only
         #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...

diff --git a/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py b/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py
@@ -11,12 +11,12 @@
 ## Message Logger
 ##
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
     reportEvery = cms.untracked.int32(100) # every 100th only
 #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...
     ))
-process.MessageLogger.statistics.append('cout')
+process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True)
 
 
 ##

diff --git a/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py b/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py
@@ -6,7 +6,7 @@
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.MessageLogger.cerr.threshold = 'ERROR'
 process.MessageLogger.cerr.FwkReport.reportEvery = 10000
-process.MessageLogger.categories.append('TrackRefitter')
+process.MessageLogger.TrackRefitter=dict()
 
 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(False) )
 

diff --git a/Alignment/OfflineValidation/test/inspectData_cfg.py b/Alignment/OfflineValidation/test/inspectData_cfg.py
@@ -39,7 +39,7 @@
 # Message logger service
 ###################################################################
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
     reportEvery = cms.untracked.int32(1000) # every 100th only
     #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...

diff --git a/Alignment/OfflineValidation/test/offlinevalidator_cfg.py b/Alignment/OfflineValidation/test/offlinevalidator_cfg.py
@@ -6,14 +6,14 @@
 ## Message Logger
 ####################################################################
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
-process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True))
+process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False))
 process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet(
     reportEvery = cms.untracked.int32(1000) # every 100th only
 #    limit = cms.untracked.int32(10)       # or limit to 10 printouts...
     ))
 
 
-process.MessageLogger.statistics.append('cout')
+process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True)
 process.options = cms.untracked.PSet(
         Rethrow = cms.untracked.vstring("ProductNotFound") # make this exception fatal
         #    , fileMode  =  cms.untracked.string('FULLMERGE') # any file order (default): caches all lumi/run products (memory!)

diff --git a/Alignment/OfflineValidation/test/test_all_cfg.py b/Alignment/OfflineValidation/test/test_all_cfg.py
@@ -44,21 +44,22 @@ class RefitType(Enum):
 # Messages
 ###################################################################
 process.load('FWCore.MessageService.MessageLogger_cfi')   
-process.MessageLogger.categories.append("PrimaryVertexValidation")  
-process.MessageLogger.categories.append("SplitVertexResolution")
-process.MessageLogger.categories.append("FilterOutLowPt")  
-process.MessageLogger.destinations = cms.untracked.vstring("cout")
+process.MessageLogger.cerr.enable = False
+process.MessageLogger.PrimaryVertexValidation=dict()  
+process.MessageLogger.SplitVertexResolution=dict()
+process.MessageLogger.FilterOutLowPt=dict()  
 process.MessageLogger.cout = cms.untracked.PSet(
+    enable = cms.untracked.bool(True),
     threshold = cms.untracked.string("INFO"),
     default   = cms.untracked.PSet(limit = cms.untracked.int32(0)),                       
     FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1),
                                    reportEvery = cms.untracked.int32(1000)
                                    ),                                                      
     PrimaryVertexValidation = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
     SplitVertexResolution   = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
-    FilterOutLowPt          = cms.untracked.PSet( limit = cms.untracked.int32(-1))
+    FilterOutLowPt          = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
+    enableStatistics = cms.untracked.bool(True)
     )
-process.MessageLogger.statistics.append('cout') 
 
 ####################################################################
 # Produce the Transient Track Record in the event

diff --git a/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py b/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py
@@ -27,7 +27,7 @@
 usedGlobalTag = process.GlobalTag.globaltag.value()
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.MessageLogger.LOGFILE = cms.untracked.PSet(
+process.MessageLogger.files.LOGFILE = cms.untracked.PSet(
     DEBUG = cms.untracked.PSet(
         limit = cms.untracked.int32(-1)
         ),
@@ -44,12 +44,11 @@
     Alignment = cms.untracked.PSet(
         limit = cms.untracked.int32(-1),
         reportEvery = cms.untracked.int32(1)
-        )
+        ),
+    enableStatistics = cms.untracked.bool(True)
     )
-process.MessageLogger.cerr.placeholder = cms.untracked.bool(True)
-process.MessageLogger.destinations = ['LOGFILE']
-process.MessageLogger.statistics = ['LOGFILE']
-process.MessageLogger.categories = ['Alignment']
+process.MessageLogger.cerr.enable = cms.untracked.bool(False)
+
 
 ## if alignment constants not from global tag, add this
 from CondCore.CondDB.CondDB_cfi import *

diff --git a/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py b/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py
@@ -17,7 +17,7 @@
 ##
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.MessageLogger.cerr.threshold = 'INFO'
-process.MessageLogger.categories.append('TrackerTreeGenerator')
+process.MessageLogger.TrackerTreeGenerator=dict()
 process.MessageLogger.cerr.INFO.limit = 0
 process.MessageLogger.cerr.default.limit = -1
 process.MessageLogger.cerr.TrackerTreeGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1))