Merge pull request #32185 from Dr15Jones/newMessageLoggerConfig_Align…

…ment Updated configurations in Alignment to new MessageLogger syntax
cms-sw · Dec 2, 2020 · aa368a5 · aa368a5
2 parents e6e67ba + 4a793e6
commit aa368a5
Show file tree

Hide file tree

Showing 16 changed files with 235 additions and 198 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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