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

PPS Full simulation integration #29916

Closed
wants to merge 16 commits into from
Closed

PPS Full simulation integration #29916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e0580a0
Remaining config files needed to implement PPS simulation into cmssw …
mundim Oct 16, 2019
296b09d
Implementing PR review comments, removing unneeded Sequence usage ins…
mundim Oct 17, 2019
152e640
Rebasing to the last IB; adapting test config to the new pps ERAS; re…
mundim Oct 18, 2019
1841b30
Modifing Generator_cff to trigger the proton propagation at generator…
mundim Mar 10, 2020
934a392
Removing a print statement from a test config
mundim Mar 23, 2020
448e43c
Re-coding test config to minimize changes due to the missing DB sim g…
mundim Apr 4, 2020
75b8a94
Update SimPPS/PPSPixelDigiProducer/src/RPixChargeShare.cc
mundim Apr 21, 2020
dbbccad
Update Configuration/StandardSequences/python/Generator_cff.py
mundim Apr 21, 2020
f756341
Rebasing to new IB, implementing the new proton transport
mundim May 19, 2020
9f60f06
Moving redefinition of parameters from other packages to the respecti…
mundim May 21, 2020
be78549
Update SimG4Core/Application/python/g4SimHits_cfi.py
mundim May 21, 2020
f0ec064
Update g4SimHits_cfi.py
mundim Jun 3, 2020
4a2d443
Resolving a bug in PPSProtonTransport; moving the propagator do use d…
mundim Jun 9, 2020
e4f9d2c
bringing a file compliant with code-format option
mundim Jun 9, 2020
a076a10
Including PPS geometry into the extended one; removing the alternativ…
mundim Jun 12, 2020
d90ea01
including a remainder
mundim Jun 12, 2020
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
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run3_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
from Configuration.Eras.Modifier_stage2L1Trigger_2021_cff import stage2L1Trigger_2021
from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021

Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017]), run3_common, run3_GEM, run3_HB, stage2L1Trigger_2021)
Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017]), run3_common, run3_GEM, run3_HB, stage2L1Trigger_2021,ctpps_2021)

5 changes: 3 additions & 2 deletions Configuration/StandardSequences/python/DigiToRaw_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
from EventFilter.CastorRawToDigi.CastorDigiToRaw_cfi import *
from EventFilter.RawDataCollector.rawDataCollector_cfi import *
from L1Trigger.Configuration.L1TDigiToRaw_cff import *
from EventFilter.CTPPSRawToDigi.ctppsDigiToRaw_cff import *

DigiToRawTask = cms.Task(L1TDigiToRawTask, siPixelRawData, SiStripDigiToRaw, ecalPacker, esDigiToRaw, hcalRawDataTask, cscpacker, dtpacker, rpcpacker, castorRawData, rawDataCollector)
DigiToRawTask = cms.Task(L1TDigiToRawTask, siPixelRawData, SiStripDigiToRaw, ecalPacker, esDigiToRaw, hcalRawDataTask, cscpacker, dtpacker, rpcpacker, ctppsRawData, castorRawData, rawDataCollector)
DigiToRaw = cms.Sequence(DigiToRawTask)

ecalPacker.Label = 'simEcalDigis'
Expand Down Expand Up @@ -52,4 +53,4 @@
phase2_muon.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([rpcpacker]))

from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))
fastSim.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData,ctppsRawData]))
8 changes: 5 additions & 3 deletions Configuration/StandardSequences/python/Digi_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
#
from SimMuon.Configuration.SimMuon_cff import *
#
# PPS Digis
# returns sequence "ctppsDigi"
from SimPPS.Configuration.SimPPS_cff import *
#
# TrackingParticle Producer is now part of the mixing module, so
# it is no longer run here.
#
Expand All @@ -29,7 +33,7 @@
from Configuration.StandardSequences.Generator_cff import *
from GeneratorInterface.Core.generatorSmeared_cfi import *

doAllDigiTask = cms.Task(generatorSmeared, calDigiTask, muonDigiTask)
doAllDigiTask = cms.Task(generatorSmeared, calDigiTask, muonDigiTask, ctppsDigiTask)
from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
# premixing stage2 runs muon digis after PreMixingModule (configured in DataMixerPreMix_cff)
premix_stage2.toReplaceWith(doAllDigiTask, doAllDigiTask.copyAndExclude([muonDigiTask]))
Expand Down Expand Up @@ -79,5 +83,3 @@ def _modifyEnableHcalHardcode( theProcess ):

from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
modifyEnableHcalHardcode_ = hcalHardcodeConditions.makeProcessModifier( _modifyEnableHcalHardcode )


3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Generator_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
GeneInfo = cms.Sequence(GeneInfoTask)
genJetMET = cms.Sequence(genJetMETTask)

pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+GenSmeared+GeneInfo+genJetMET)
from SimPPS.Configuration.GenPPS_cff import *
pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+GenSmeared+GeneInfo+genJetMET, PPSTransportTask)

# sequence for bare generator result only, without vertex smearing and analysis objects added

Expand Down
17 changes: 17 additions & 0 deletions EventFilter/CTPPSRawToDigi/python/ctppsDigiToRaw_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import FWCore.ParameterSet.Config as cms
from EventFilter.RawDataCollector.rawDataCollector_cfi import *

from EventFilter.CTPPSRawToDigi.ctppsPixelRawData_cfi import ctppsPixelRawData
from EventFilter.CTPPSRawToDigi.ctppsTotemRawData_cfi import ctppsTotemRawData

ctppsRawData = cms.Task()

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toReplaceWith(ctppsRawData, cms.Task(ctppsTotemRawData))

from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
ctpps_2017.toReplaceWith(ctppsRawData, cms.Task(ctppsTotemRawData,ctppsPixelRawData))

from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
ctpps_2018.toReplaceWith(ctppsRawData, cms.Task(ctppsPixelRawData))

3 changes: 3 additions & 0 deletions EventFilter/RawDataCollector/python/rawDataCollector_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
run3_GEM.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gemPacker")) )

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toModify(rawDataCollector.RawCollectionList, func = lambda list: list.extend([cms.InputTag("ctppsTotemRawData"),cms.InputTag("ctppsPixelRawData")]) )
101 changes: 98 additions & 3 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring(
'Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
Expand Down Expand Up @@ -247,7 +247,7 @@
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
'Geometry/ForwardCommonData/data/brm/2021/v1/brm.xml',
'Geometry/ForwardCommonData/data/zdcmaterials.xml',
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
Expand Down Expand Up @@ -283,7 +283,102 @@
'Geometry/MuonSimData/data/muonProdCuts/2021/v1/muonProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'),
'Geometry/CMSCommonData/data/FieldParameters.xml')
# Adding PPS geometry files
+cms.vstring(
'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
'Geometry/ForwardCommonData/data/totemRotations.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_103.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
'Geometry/VeryForwardData/data/RP_Hybrid.xml',
'Geometry/VeryForwardData/data/RP_Materials.xml',
'Geometry/VeryForwardData/data/RP_Transformations.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
'Geometry/VeryForwardData/data/RP_Device.xml',
'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
'Geometry/VeryForwardData/data/ppstrackerMaterials.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
Loading