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

Run2-gex132C Put the new 2018 scenarios in the standard places as decided in the SIM meeting #37676

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Run2-gex132C Put the new 2018 scenarios in the standard places as decided in the SIM meeting #37676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...hon/GeometryDD4HepExtended2018Reco_cff.py → ...ometryDD4hepExtended2018DD4hepReco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Geometry.HcalCommonData.GeometryDD4HepExtended2018_cff import *
from Configuration.Geometry.GeometryDD4hepExtended2018DD4hep_cff import *

from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
Expand Down
2 changes: 1 addition & 1 deletion .../python/GeometryDD4HepExtended2018_cff.py → ...n/GeometryDD4hepExtended2018DD4hep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryDD4hep_cff import *
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/HcalCommonData/data/cmsExtendedGeometry2018.xml")
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2018DD4hep.xml")

from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
Expand Down
2 changes: 1 addition & 1 deletion ...ta/python/GeometryExtended2018Reco_cff.py → ...python/GeometryExtended2018DDDReco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Geometry.HcalCommonData.GeometryExtended2018_cff import *
from Configuration.Geometry.GeometryExtended2018DDD_cff import *


# Reconstruction geometry services
Expand Down
2 changes: 1 addition & 1 deletion ...onData/python/GeometryExtended2018_cff.py → ...try/python/GeometryExtended2018DDD_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.HcalCommonData.cmsExtendedGeometry2018XML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometry2018DDDXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
Expand Down
0 ...mmonData/data/cmsExtendedGeometry2018.xml → .../dd4hep/cmsExtendedGeometry2018DD4hep.xml
View file
Open in desktop
File renamed without changes.
0 .../python/cmsExtendedGeometry2018XML_cfi.py → ...thon/cmsExtendedGeometry2018DDDXML_cfi.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Geometry/HcalCommonData/test/python/TTbar_13TeV_TuneCUETP8M1_cfi_GEN_SIM_10824.0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryExtended2018Reco_cff')
process.load('Geometry.HcalCommonData.GeometryExtended2018_cff')
process.load('Configuration.Geometry.GeometryExtended2018DDDReco_cff')
process.load('Configuration.Geometry.GeometryExtended2018DDD_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeVEarly2018Collision_cfi')
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HcalCommonData/test/python/TTbar_13TeV_TuneCUETP8M1_cfi_GEN_SIM_10824.911.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryDD4HepExtended2018Reco_cff')
process.load('Geometry.HcalCommonData.GeometryDD4HepExtended2018_cff')
process.load('Configuration.Geometry.GeometryDD4hepExtended2018DD4hep_cff')
process.load('Configuration.Geometry.GeometryDD4hepExtended2018DD4hepReco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeVEarly2018Collision_cfi')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/step2_DIGI_L1_DIGI2RAW_HLT_10824.0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryExtended2018Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2018DDDReco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Digi_cff')
process.load('Configuration.StandardSequences.SimL1Emulator_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/step2_DIGI_L1_DIGI2RAW_HLT_10824.911.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryDD4HepExtended2018Reco_cff')
process.load('Configuration.Geometry.GeometryDD4hepExtended2018DD4hepReco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Digi_cff')
process.load('Configuration.StandardSequences.SimL1Emulator_cff')
Expand Down
2 changes: 1 addition & 1 deletion ...alCommonData/test/python/step3_RAW2DIGI_L1Reco_RECO_RECOSIM_PAT_VALIDATION_DQM_10824.0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryExtended2018Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2018DDDReco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.RawToDigi_cff')
process.load('Configuration.StandardSequences.L1Reco_cff')
Expand Down
2 changes: 1 addition & 1 deletion ...CommonData/test/python/step3_RAW2DIGI_L1Reco_RECO_RECOSIM_PAT_VALIDATION_DQM_10824.911.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Geometry.HcalCommonData.GeometryDD4HepExtended2018Reco_cff')
process.load('Configuration.Geometry.GeometryDD4hepExtended2018DD4hepReco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.RawToDigi_cff')
process.load('Configuration.StandardSequences.L1Reco_cff')
Expand Down