Merge pull request #48800 from bsunanda/Phase2-hgx364A

Phase2-hgx364A Changes made to resolve an issue in making tests for overlap checks

Author: cmsbuild

SimG4Core/Application/python/g4SimHits_cfi.py

@@ -118,6 +118,7 @@
         Depth = cms.int32(3),        # -1 means check whatever depth
         PVname = cms.string(''),
         LVname = cms.string(''),
+        NodeName = cms.string(''),
         NodeNames = cms.vstring('World')
     ),
     G4Commands = cms.vstring(),

SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckBigXML_cfg.py

@@ -38,17 +38,18 @@
 process.g4SimHits.CheckGeometry = True
 
 # Geant4 geometry check 
-process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("cmsBigXMLddd2021")
-process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(True)
-process.g4SimHits.G4CheckOverlap.Tolerance  = cms.double(options.tol)
-process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000)
-process.g4SimHits.G4CheckOverlap.Depth      = cms.int32(-1)
+process.g4SimHits.G4CheckOverlap.NodeName = ""
+process.g4SimHits.G4CheckOverlap.OutputBaseName = "cmsBigXMLddd2021"
+process.g4SimHits.G4CheckOverlap.OverlapFlag = True
+process.g4SimHits.G4CheckOverlap.Tolerance  = options.tol
+process.g4SimHits.G4CheckOverlap.Resolution = 10000
+process.g4SimHits.G4CheckOverlap.Depth      = -1
 # tells if NodeName is G4Region or G4PhysicalVolume
-process.g4SimHits.G4CheckOverlap.RegionFlag = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.RegionFlag = False
 # list of names
-process.g4SimHits.G4CheckOverlap.NodeNames  = cms.vstring('OCMS')
+process.g4SimHits.G4CheckOverlap.NodeNames  = ['OCMS']
 # enable dump gdml file 
-process.g4SimHits.G4CheckOverlap.gdmlFlag   = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.gdmlFlag   = False
 # if defined a G4PhysicsVolume info is printed
 process.g4SimHits.G4CheckOverlap.PVname     = ''
 # if defined a list of daughter volumes is printed

SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py

@@ -56,18 +56,18 @@
 process.g4SimHits.CheckGeometry = True
 
 # Geant4 geometry check 
-process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string(baseName)
-process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(True)
-process.g4SimHits.G4CheckOverlap.Tolerance  = cms.double(options.tol)
-process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000)
-process.g4SimHits.G4CheckOverlap.Depth      = cms.int32(-1)
+process.g4SimHits.G4CheckOverlap.NodeName = ""
+process.g4SimHits.G4CheckOverlap.OutputBaseName = baseName
+process.g4SimHits.G4CheckOverlap.OverlapFlag = True
+process.g4SimHits.G4CheckOverlap.Tolerance  = options.tol
+process.g4SimHits.G4CheckOverlap.Resolution = 10000
+process.g4SimHits.G4CheckOverlap.Depth      = -1
 # tells if NodeName is G4Region or G4PhysicalVolume
-process.g4SimHits.G4CheckOverlap.RegionFlag = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.RegionFlag = False
 # list of names
-process.g4SimHits.G4CheckOverlap.NodeNames  = cms.vstring('cms:OCMS_1')
-# process.g4SimHits.G4CheckOverlap.NodeNames  = cms.vstring('DefaultRegionForTheWorld')
+process.g4SimHits.G4CheckOverlap.NodeNames  = ['cms:OCMS_1']
 # enable dump gdml file 
-process.g4SimHits.G4CheckOverlap.gdmlFlag   = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.gdmlFlag   = False
 # if defined a G4PhysicsVolume info is printed
 process.g4SimHits.G4CheckOverlap.PVname     = ''
 # if defined a list of daughter volumes is printed

SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py

@@ -62,17 +62,18 @@
 process.g4SimHits.CheckGeometry = True
 
 # Geant4 geometry check 
-process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string(baseName)
-process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(True)
-process.g4SimHits.G4CheckOverlap.Tolerance  = cms.double(options.tol)
-process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000)
-process.g4SimHits.G4CheckOverlap.Depth      = cms.int32(-1)
+process.g4SimHits.G4CheckOverlap.NodeName = ""
+process.g4SimHits.G4CheckOverlap.OutputBaseName = baseName
+process.g4SimHits.G4CheckOverlap.OverlapFlag = True
+process.g4SimHits.G4CheckOverlap.Tolerance  = options.tol
+process.g4SimHits.G4CheckOverlap.Resolution = 10000
+process.g4SimHits.G4CheckOverlap.Depth      = -1
 # tells if NodeName is G4Region or G4PhysicalVolume
-process.g4SimHits.G4CheckOverlap.RegionFlag = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.RegionFlag = False
 # list of names
-process.g4SimHits.G4CheckOverlap.NodeNames  = cms.vstring('cms:OCMS_1')
+process.g4SimHits.G4CheckOverlap.NodeNames  = ['cms:OCMS_1']
 # enable dump gdml file 
-process.g4SimHits.G4CheckOverlap.gdmlFlag   = cms.bool(False)
+process.g4SimHits.G4CheckOverlap.gdmlFlag   = False
 # if defined a G4PhysicsVolume info is printed
 process.g4SimHits.G4CheckOverlap.PVname     = ''
 # if defined a list of daughter volumes is printed