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.

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

81X Track Trigger primitives update #15075

Closed
wants to merge 13 commits into from
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023TkOnlysim_cff import *
Copy link
Contributor

Choose a reason for hiding this comment

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

@sviret - IMHO, it would be nice to have consistent capitalization in new file names (e.g. geometry scenarios): TkOnlySim and TkOnlyTilted.
BTW, Shouldn't TkOnlySim be TkOnlyFlat (as contrary to Tilted, rather then contrary to Reco)?

# Reconstruction geometry services
# Tracking Geometry
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
SelectedCalos = cms.vstring('HCAL' ,
'ZDC' ,
'CASTOR' ,
'EcalBarrel' ,
'TOWER' )
)

from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *

from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023TkOnlysimXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023TkOnlytilted_cff import *
# Reconstruction geometry services
# Tracking Geometry
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
SelectedCalos = cms.vstring('HCAL' ,
'ZDC' ,
'CASTOR' ,
'EcalBarrel' ,
'TOWER' )
)

from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *

from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023TkOnlytiltedXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import FWCore.ParameterSet.Config as cms

## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe)

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/PhaseII/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
#'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
#'Geometry/CMSCommonData/data/cmsCalo.xml',
#'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
#'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseII/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
#'Geometry/CMSCommonData/data/muonMB.xml',
#'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdInnerDisk7.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk7.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk8.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk9.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdOuterDisk10.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade4.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade5.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade6.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade7.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade8.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade9.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwdblade10.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/FlatTracker/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/FlatTracker/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/FlatTracker/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'),
rootNodeName = cms.string('cms:OCMS')
)


Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import FWCore.ParameterSet.Config as cms

## 2015 + new phase 1 pixel detector

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/PhaseII/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
#'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
#'Geometry/CMSCommonData/data/cmsCalo.xml',
#'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
#'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseII/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
#'Geometry/CMSCommonData/data/muonMB.xml',
#'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk7.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk7.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk8.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk9.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk10.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade4.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade5.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade6.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade7.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade8.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade9.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade10.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'),
rootNodeName = cms.string('cms:OCMS')
)


3 changes: 2 additions & 1 deletion L1Trigger/TrackTrigger/interface/TTStubAlgorithmRecord.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"

#include "boost/mpl/vector.hpp"

class TTStubAlgorithmRecord
: public edm::eventsetup::DependentRecordImplementation< TTStubAlgorithmRecord, boost::mpl::vector< TrackerDigiGeometryRecord, IdealGeometryRecord, IdealMagneticFieldRecord > >{};
: public edm::eventsetup::DependentRecordImplementation< TTStubAlgorithmRecord, boost::mpl::vector< TrackerDigiGeometryRecord, TrackerTopologyRcd, IdealMagneticFieldRecord > >{};

#endif

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/TrackTrigger/interface/TTStubAlgorithm_cbc3.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class ES_TTStubAlgorithm_cbc3 : public edm::ESProducer
record.getRecord< TrackerDigiGeometryRecord >().get( tGeomHandle );
const TrackerGeometry* const theTrackerGeom = tGeomHandle.product();
edm::ESHandle<TrackerTopology> tTopoHandle;
record.getRecord<IdealGeometryRecord>().get(tTopoHandle);
record.getRecord<TrackerTopologyRcd>().get(tTopoHandle);
const TrackerTopology* const theTrackerTopo = tTopoHandle.product();

TTStubAlgorithm< T >* TTStubAlgo = new TTStubAlgorithm_cbc3< T >( theTrackerGeom, theTrackerTopo, mPerformZMatching2S );
Expand Down
Loading