Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-gex160X Update the overlap finding scripts for Run3/Run2 scenarios #41432

Merged
merged 2 commits into from
Apr 28, 2023
Merged

Run3-gex160X Update the overlap finding scripts for Run3/Run2 scenarios #41432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3300126
Update the overlap finding scripts for Run3/Run2 scenarios
Apr 26, 2023
95332e2
Small fixes as suggested
Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ometryDD4hepExtended2017DD4hepReco_cff.py → ...hon/GeometryDD4hepExtended2017Reco_cff.py
View file
Open in desktop
File renamed without changes.
0 ...ometryDD4hepExtended2018DD4hepReco_cff.py → ...hon/GeometryDD4hepExtended2018Reco_cff.py
View file
Open in desktop
File renamed without changes.
35 changes: 30 additions & 5 deletions SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
###############################################################################
# Way to use this:
# cmsRun g4OverlapCheckDD4jep_cfg.py tol=0.1
# cmsRun g4OverlapCheckDD4hep_cfg.py geometry=2021 tol=0.1
#
# Options for geometry 2017, 2018, 2021, 2023
#
###############################################################################
import FWCore.ParameterSet.Config as cms
import FWCore.ParameterSet.VarParsing as VarParsing
from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep

options = VarParsing.VarParsing('standard')
options.register('geometry',
"2021",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: 2017, 2018, 2021, 2023")
options.register('tol',
0.1,
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -17,9 +23,28 @@
options.parseArguments()
print(options)

process = cms.Process("G4PrintGeometry",Run3_dd4hep)
baseName = "cmsDD4hep" + options.geometry
geomName = "Configuration.Geometry.GeometryDD4hepExtended" + options.geometry + "Reco_cff"

from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
if (options.geometry == "2018"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (options.geometry == "2018"):
if (options.geometry == "2017"):

from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
process = cms.Process('G4PrintGeometry',Run2_2017,dd4hep)
elif (options.geometry == "2018"):
from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
process = cms.Process('G4PrintGeometry',Run2_2018,dd4hep)
else:
from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
process = cms.Process('G4PrintGeometry',Run3_dd4hep)

print("Base file Name: ", baseName)
print("Geom file Name: ", geomName)

process.load('FWCore.MessageService.MessageLogger_cfi')
process.load(geomName)

process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
#if hasattr(process,'MessageLogger'):
# process.MessageLogger.HCalGeom=dict()

from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
process = checkOverlap(process)
Expand All @@ -28,7 +53,7 @@
process.g4SimHits.CheckGeometry = True

# Geant4 geometry check
process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("cms2021dd4hep")
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)
Expand Down
20 changes: 11 additions & 9 deletions ...eomInfo/test/python/g4OverlapCheck_cfg.py → ...Info/test/python/g4OverlapCheckDDD_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
###############################################################################
# Way to use this:
# cmsRun g4OverlapCheck_cfg.py geometry=2021 tol=0.1
# cmsRun g4OverlapCheckDDD_cfg.py geometry=2021 tol=0.1
#
# Options for geometry 2016, 2018, 2021
# Options for geometry 2016, 2017, 2018, 2021, 2023
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"2021",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: 2016, 2018, 2021")
"geometry of operations: 2016, 2017, 2018, 2021, 2023")
options.register('tol',
0.1,
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -32,25 +32,27 @@
####################################################################
# Use the options

baseName = "cmsDDD" + options.geometry
geomName = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"

if (options.geometry == "2016"):
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
process = cms.Process('G4PrintGeometry',Run2_2016)
process.load('Configuration.Geometry.GeometryExtended2016Reco_cff')
baseName = 'cms2016'
elif (options.geometry == "2018"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
elif (options.geometry == "2018"):
elif (options.geometry == "2017"):

from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
process = cms.Process('G4PrintGeometry',Run2_2017)
elif (options.geometry == "2018"):
from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
process = cms.Process('G4PrintGeometry',Run2_2018)
process.load('Configuration.Geometry.GeometryExtended2018Reco_cff')
baseName = 'cms2018'
else:
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
process = cms.Process('G4PrintGeometry',Run3_DDD)
process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
baseName = 'cms2021'

print("Base file Name: ", baseName)
print("Geom file Name: ", geomName)

process.load('FWCore.MessageService.MessageLogger_cfi')
process.load(geomName)

#if hasattr(process,'MessageLogger'):
# process.MessageLogger.HCalGeom=dict()
Expand Down