Merge pull request #32190 from Dr15Jones/newMessageLoggerConfig_SimG4CMS

Updated configurations in SimG4CMS to new MessageLogger syntax
cms-sw · Nov 23, 2020 · 5501fbe · 5501fbe
2 parents f7b80a1 + 3b3cf9c
commit 5501fbe
Show file tree

Hide file tree

Showing 25 changed files with 252 additions and 263 deletions.
diff --git a/SimG4CMS/Calo/test/python/genminbias_cfg.py b/SimG4CMS/Calo/test/python/genminbias_cfg.py
@@ -10,13 +10,16 @@
 )
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
         default = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
-            )
-    )
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.Timing = cms.Service("Timing")

diff --git a/SimG4CMS/Calo/test/python/genttbar_cfg.py b/SimG4CMS/Calo/test/python/genttbar_cfg.py
@@ -10,13 +10,16 @@
 )
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
         default = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
-            )
-    )
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.Timing = cms.Service("Timing")

diff --git a/SimG4CMS/Calo/test/python/genzee_cfg.py b/SimG4CMS/Calo/test/python/genzee_cfg.py
@@ -10,13 +10,16 @@
 )
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
         default = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
-            )
-    )
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.Timing = cms.Service("Timing")

diff --git a/SimG4CMS/Calo/test/python/monopoleStepppingAction_cfg.py b/SimG4CMS/Calo/test/python/monopoleStepppingAction_cfg.py
@@ -20,27 +20,28 @@
 process.load("SimG4Core.Application.g4SimHits_cfi")
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('G4cout','G4cerr','SimG4CoreWatcher'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-#        threshold = cms.untracked.string('DEBUG'),
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
         DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        SimG4CoreWatcher = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
         G4cerr = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
         G4cout = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
-        )
-    )
+        ),
+        INFO = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        SimG4CoreWatcher = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.load("IOMC.RandomEngine.IOMC_cff")

diff --git a/SimG4CMS/Calo/test/python/monopole_cfg.py b/SimG4CMS/Calo/test/python/monopole_cfg.py
@@ -19,27 +19,28 @@
 process.GlobalTag.globaltag = autoCond['run1_mc']
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('G4cout','G4cerr','SimG4CoreWatcher'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-#        threshold = cms.untracked.string('DEBUG'),
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
         DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        SimG4CoreWatcher = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
         G4cerr = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
         G4cout = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
-        )
-    )
+        ),
+        INFO = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        SimG4CoreWatcher = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.load("IOMC.RandomEngine.IOMC_cff")

diff --git a/SimG4CMS/Calo/test/python/runHGC1_cfg.py b/SimG4CMS/Calo/test/python/runHGC1_cfg.py
@@ -19,34 +19,35 @@
 process.GlobalTag.globaltag = autoCond['run2_mc']
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('CaloSim', 
-        'HGCSim', 'HGCalGeom', 'G4cerr', 'G4cout'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-        threshold = cms.untracked.string('DEBUG'),
-        INFO = cms.untracked.PSet(
+        CaloSim = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        CaloSim = 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)
         ),
         HGCSim = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         HGCalGeom = 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)
+        INFO = 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")

diff --git a/SimG4CMS/Calo/test/python/runHcalSimHitDump_cfg.py b/SimG4CMS/Calo/test/python/runHcalSimHitDump_cfg.py
@@ -22,15 +22,17 @@
 )
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('HitStudy'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-        default = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
         HitStudy = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
+        default = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+        ),
+        enable = cms.untracked.bool(True)
     )
 )
 

diff --git a/SimG4CMS/Calo/test/python/runTestTime_cfg.py b/SimG4CMS/Calo/test/python/runTestTime_cfg.py
@@ -16,14 +16,10 @@
 process.GlobalTag.globaltag = autoCond['run1_mc']
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('Physics', 'SimG4CoreApplication', 
-                                       'G4cout', 'G4cerr'),
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
         DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
@@ -33,13 +29,18 @@
         G4cout = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        SimG4CoreApplication = cms.untracked.PSet(
+        INFO = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
         Physics = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
-        )
-    )
+        ),
+        SimG4CoreApplication = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        enable = cms.untracked.bool(True)
+    ),
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.load("IOMC.RandomEngine.IOMC_cff")

diff --git a/SimG4CMS/Calo/test/python/runTestWithGun_cfg.py b/SimG4CMS/Calo/test/python/runTestWithGun_cfg.py
@@ -15,57 +15,50 @@
 process.GlobalTag.globaltag = autoCond['run1_mc']
 
 process.MessageLogger = cms.Service("MessageLogger",
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
-        EcalGeom = cms.untracked.PSet(
+        CaloSim = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        MagneticField = cms.untracked.PSet(
+        DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        CaloSim = cms.untracked.PSet(
+        EcalGeom = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        DEBUG = cms.untracked.PSet(
+        EcalSim = 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)
+        ),
         HCalGeom = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        threshold = cms.untracked.string('DEBUG'),
         HFShower = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        G4cout = cms.untracked.PSet(
+        HcalSim = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        SimG4CoreApplication = cms.untracked.PSet(
+        INFO = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        HcalSim = cms.untracked.PSet(
+        MagneticField = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+        ),
+        SimG4CoreApplication = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        EcalSim = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        )
+        enable = cms.untracked.bool(True),
+        threshold = cms.untracked.string('DEBUG')
     ),
-    categories = cms.untracked.vstring('CaloSim', 
-        'EcalGeom', 
-        'EcalSim', 
-        'HCalGeom', 
-        'HcalSim', 
-        'HFShower', 
-        'SimG4CoreApplication', 
-        'G4cout', 
-        'G4cerr', 
-        'MagneticField'),
-    destinations = cms.untracked.vstring('cout')
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.load("IOMC.RandomEngine.IOMC_cff")

diff --git a/SimG4CMS/Calo/test/python/runTest_cfg.py b/SimG4CMS/Calo/test/python/runTest_cfg.py
@@ -16,41 +16,38 @@
 process.GlobalTag.globaltag = autoCond['run1_mc']
 
 process.MessageLogger = cms.Service("MessageLogger",
-    debugModules = cms.untracked.vstring('*'),
+    cerr = cms.untracked.PSet(
+        enable = cms.untracked.bool(False)
+    ),
     cout = cms.untracked.PSet(
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
+        CaloSim = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
         ),
-        EcalGeom = cms.untracked.PSet(
+        DEBUG = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        CaloSim = cms.untracked.PSet(
+        EcalGeom = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        DEBUG = cms.untracked.PSet(
+        EcalSim = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         HCalGeom = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
-        threshold = cms.untracked.string('DEBUG'),
         HFShower = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
         HcalSim = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        EcalSim = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        )
+        INFO = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+        ),
+        enable = cms.untracked.bool(True),
+        threshold = cms.untracked.string('DEBUG')
     ),
-    categories = cms.untracked.vstring('CaloSim', 
-        'EcalGeom', 
-        'EcalSim', 
-        'HCalGeom', 
-        'HcalSim', 
-        'HFShower'),
-    destinations = cms.untracked.vstring('cout')
+    debugModules = cms.untracked.vstring('*')
 )
 
 process.load("IOMC.RandomEngine.IOMC_cff")