From aeaa04f24ff5e6508dd54be55a452d217d17d3ee Mon Sep 17 00:00:00 2001 From: Ernesto Migliore Date: Mon, 24 Jul 2023 00:28:43 +0200 Subject: [PATCH 1/2] revert PR 40443 w/o introduction bricked pixels --- .../plugins/AlignmentMonitorAsAnalyzer.cc | 6 +- .../interface/AlignmentProducerBase.h | 3 + .../src/AlignmentProducerBase.cc | 4 +- .../LaserAlignment/plugins/LaserAlignment.cc | 4 +- .../LaserAlignment/plugins/LaserAlignment.h | 1 + .../plugins/MillePedeDQMModule.cc | 4 +- .../plugins/MillePedeDQMModule.h | 2 + .../plugins/TrackerGeometryCompare.cc | 6 +- .../plugins/TrackerGeometryCompare.h | 1 + .../plugins/TrackerGeometryIntoNtuples.cc | 7 +- .../plugins/CreateSurveyRcds.cc | 4 +- .../SurveyAnalysis/plugins/CreateSurveyRcds.h | 4 ++ .../plugins/SurveyInputTrackerFromDB.cc | 4 +- .../plugins/SurveyInputTrackerFromDB.h | 1 + .../plugins/SurveyMisalignmentInput.cc | 4 +- .../plugins/SurveyMisalignmentInput.h | 1 + .../plugins/CreateTrackerAlignmentRcds.cc | 7 +- .../plugins/MCMisalignmentScaler.cc | 7 +- .../plugins/MisalignedTrackerESProducer.cc | 5 +- .../plugins/TrackerSystematicMisalignments.cc | 5 +- .../plugins/TrackerTreeGenerator.cc | 6 +- .../test/TrackerGeometryAnalyzer.cc | 6 +- .../test/TrackerGeometryAnalyzer.h | 2 + ...ckerAdditionalParametersPerDetDBBuilder.cc | 52 +++++++++++++++ .../GeometryDD4hepExtended2017Reco_cff.py | 1 + .../GeometryDD4hepExtended2018Reco_cff.py | 1 + ...pExtended2021FlatMinus05PercentReco_cff.py | 1 + ...pExtended2021FlatMinus10PercentReco_cff.py | 1 + ...epExtended2021FlatPlus05PercentReco_cff.py | 1 + ...epExtended2021FlatPlus10PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2021Reco_cff.py | 1 + ...yDD4hepExtended2021ZeroMaterialReco_cff.py | 1 + ...pExtended2023FlatMinus05PercentReco_cff.py | 1 + ...pExtended2023FlatMinus10PercentReco_cff.py | 1 + ...epExtended2023FlatPlus05PercentReco_cff.py | 1 + ...epExtended2023FlatPlus10PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2023Reco_cff.py | 1 + ...yDD4hepExtended2023ZeroMaterialReco_cff.py | 1 + .../GeometryDD4hepExtended2026D100Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D101Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D86Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D88Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D91Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D92Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D93Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D94Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D95Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D96Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D97Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D98Reco_cff.py | 1 + .../GeometryDD4hepExtended2026D99Reco_cff.py | 1 + .../python/GeometryExtended2017DDDReco_cff.py | 1 + .../GeometryExtended2017Plan0Reco_cff.py | 1 + ...nded2017Plan1FlatMinus05PercentReco_cff.py | 1 + ...nded2017Plan1FlatMinus10PercentReco_cff.py | 1 + ...ended2017Plan1FlatPlus05PercentReco_cff.py | 1 + ...ended2017Plan1FlatPlus10PercentReco_cff.py | 1 + .../GeometryExtended2017Plan1Reco_cff.py | 1 + ...ryExtended2017Plan1ZeroMaterialReco_cff.py | 1 + .../python/GeometryExtended2017Reco_cff.py | 1 + .../python/GeometryExtended2018DDDReco_cff.py | 1 + ...yExtended2018FlatMinus05PercentReco_cff.py | 1 + ...yExtended2018FlatMinus10PercentReco_cff.py | 1 + ...ryExtended2018FlatPlus05PercentReco_cff.py | 1 + ...ryExtended2018FlatPlus10PercentReco_cff.py | 1 + .../GeometryExtended2018Plan36Reco_cff.py | 1 + .../python/GeometryExtended2018Reco_cff.py | 1 + ...eometryExtended2018ZeroMaterialReco_cff.py | 1 + ...yExtended2021FlatMinus05PercentReco_cff.py | 1 + ...yExtended2021FlatMinus10PercentReco_cff.py | 1 + ...ryExtended2021FlatPlus05PercentReco_cff.py | 1 + ...ryExtended2021FlatPlus10PercentReco_cff.py | 1 + .../python/GeometryExtended2021Reco_cff.py | 1 + ...eometryExtended2021ZeroMaterialReco_cff.py | 1 + ...yExtended2023FlatMinus05PercentReco_cff.py | 1 + ...yExtended2023FlatMinus10PercentReco_cff.py | 1 + ...ryExtended2023FlatPlus05PercentReco_cff.py | 1 + ...ryExtended2023FlatPlus10PercentReco_cff.py | 1 + .../python/GeometryExtended2023Reco_cff.py | 1 + ...eometryExtended2023ZeroMaterialReco_cff.py | 1 + .../GeometryExtended2026D100Reco_cff.py | 1 + .../GeometryExtended2026D101Reco_cff.py | 1 + .../python/GeometryExtended2026D86Reco_cff.py | 1 + .../python/GeometryExtended2026D88Reco_cff.py | 1 + .../python/GeometryExtended2026D91Reco_cff.py | 1 + .../python/GeometryExtended2026D92Reco_cff.py | 1 + .../python/GeometryExtended2026D93Reco_cff.py | 1 + .../python/GeometryExtended2026D94Reco_cff.py | 1 + .../python/GeometryExtended2026D95Reco_cff.py | 1 + .../python/GeometryExtended2026D96Reco_cff.py | 1 + .../python/GeometryExtended2026D97Reco_cff.py | 1 + .../python/GeometryExtended2026D98Reco_cff.py | 1 + .../python/GeometryExtended2026D99Reco_cff.py | 1 + .../Geometry/python/GeometryExtended_cff.py | 2 + .../Geometry/python/GeometryIdealAPD1_cff.py | 1 + .../Geometry/python/GeometryIdealNoAPD_cff.py | 1 + .../Geometry/python/GeometryNoCastor_cff.py | 1 + .../Geometry/python/GeometryRecoDB_cff.py | 2 + .../python/GeometryRecoTracker_cff.py | 2 + .../Geometry/python/GeometryReco_cff.py | 2 + .../Geometry/python/GeometrySLHCRecoDB_cff.py | 1 + .../Geometry/python/GeometrySLHCReco_cff.py | 1 + .../Geometry/python/dict2021Geometry.py | 6 ++ .../Geometry/python/dict2026Geometry.py | 6 ++ .../TrackerGeomBuilderFromGeometricDet.h | 7 +- ...ackerAdditionalParametersPerDetESModule.cc | 65 +++++++++++++++++++ .../plugins/TrackerDigiGeometryESModule.cc | 10 ++- .../src/TrackerGeomBuilderFromGeometricDet.cc | 45 +++++++++---- .../test/python/testTrackerMap_cfg.py | 1 + .../python/testTrackerModuleInfoDD4hep_cfg.py | 2 + .../python/testTrackerModuleInfoDDD_cfg.py | 2 + 111 files changed, 343 insertions(+), 29 deletions(-) create mode 100644 CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc create mode 100644 Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc index 3329bf0472341..c134984abf9f4 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc @@ -44,6 +44,7 @@ #include "Geometry/CommonTopologies/interface/GeometryAligner.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" @@ -88,6 +89,7 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> { const edm::ESGetToken esTokenTTopo_; const edm::ESGetToken esTokenGeomDet_; const edm::ESGetToken esTokenPTP_; + const edm::ESGetToken esTokenPtitp_; const edm::ESGetToken esTokenDT_; const edm::ESGetToken esTokenCSC_; const edm::ESGetToken esTokenGEM_; @@ -121,6 +123,7 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet& esTokenTTopo_(esConsumes()), esTokenGeomDet_(esConsumes()), esTokenPTP_(esConsumes()), + esTokenPtitp_(esConsumes()), esTokenDT_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))), esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))), esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))), @@ -157,8 +160,9 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev const GeometricDet* geom = &iSetup.getData(esTokenGeomDet_); const PTrackerParameters& ptp = iSetup.getData(esTokenPTP_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(esTokenPtitp_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - std::shared_ptr theTracker(trackerBuilder.build(geom, ptp, tTopo)); + std::shared_ptr theTracker(trackerBuilder.build(geom, ptitp, ptp, tTopo)); edm::ESHandle theMuonDT = iSetup.getHandle(esTokenDT_); edm::ESHandle theMuonCSC = iSetup.getHandle(esTokenCSC_); diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h index 4caf4d27dbd6d..c3f8ec1660df5 100644 --- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h +++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h @@ -44,6 +44,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerSurveyRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurveyErrorExtendedRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "CondFormats/Common/interface/Time.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -59,6 +60,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" @@ -254,6 +256,7 @@ class AlignmentProducerBase { const edm::ESGetToken ttopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken dtGeomToken_; const edm::ESGetToken cscGeomToken_; const edm::ESGetToken gemGeomToken_; diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc index 1e42ce6e8fa8a..6ad94af7fe247 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc @@ -51,6 +51,7 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed ttopoToken_(iC.esConsumes()), geomDetToken_(iC.esConsumes()), ptpToken_(iC.esConsumes()), + ptitpToken_(iC.esConsumes()), dtGeomToken_(iC.esConsumes(edm::ESInputTag("", "idealForAlignmentProducerBase"))), cscGeomToken_(iC.esConsumes(edm::ESInputTag("", "idealForAlignmentProducerBase"))), gemGeomToken_(iC.esConsumes(edm::ESInputTag("", "idealForAlignmentProducerBase"))), @@ -431,8 +432,9 @@ void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, cons if (doTracker_) { const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters* ptp = &iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - trackerGeometry_ = std::shared_ptr(trackerBuilder.build(geometricDet, *ptp, tTopo)); + trackerGeometry_ = std::shared_ptr(trackerBuilder.build(geometricDet, ptitp, *ptp, tTopo)); } if (doMuon_) { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.cc b/Alignment/LaserAlignment/plugins/LaserAlignment.cc index 25440bb839e49..3dbb91c404054 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.cc @@ -23,6 +23,7 @@ LaserAlignment::LaserAlignment(edm::ParameterSet const& theConf) geomToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), gprToken_(esConsumes()), stripPedestalsToken_(esConsumes()), theEvents(0), @@ -300,9 +301,10 @@ void LaserAlignment::produce(edm::Event& theEvent, edm::EventSetup const& theSet // the AlignableTracker object is initialized with the ideal geometry const GeometricDet* theGeometricDet = &theSetup.getData(geomDetToken_); const PTrackerParameters* ptp = &theSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &theSetup.getData(ptitpToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo); + TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, &*ptitp, *ptp, tTopo); theAlignableTracker = new AlignableTracker(&(*theRefTracker), tTopo); } else { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.h b/Alignment/LaserAlignment/plugins/LaserAlignment.h index 6449f68d11c4e..8622cf61aaaf3 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.h +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.h @@ -132,6 +132,7 @@ class LaserAlignment : public edm::one::EDProducer { const edm::ESGetToken geomToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken gprToken_; const edm::ESGetToken stripPedestalsToken_; diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc index 430d0ed7aa016..ac8ce9c2cbdc2 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc @@ -29,6 +29,7 @@ MillePedeDQMModule ::MillePedeDQMModule(const edm::ParameterSet& config) : tTopoToken_(esConsumes()), gDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliThrToken_(esConsumes()), geomToken_(esConsumes()), mpReaderConfig_(config.getParameter("MillePedeFileReader")), @@ -166,6 +167,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); const GeometricDet* geometricDet = &setup.getData(gDetToken_); const PTrackerParameters* ptp = &setup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); const TrackerGeometry* geom = &setup.getData(geomToken_); pixelTopologyMap_ = std::make_shared(geom, tTopo); @@ -179,7 +181,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup TrackerGeomBuilderFromGeometricDet builder; - const auto trackerGeometry = builder.build(geometricDet, *ptp, tTopo); + const auto trackerGeometry = builder.build(geometricDet, ptitp, *ptp, tTopo); tracker_ = std::make_unique(trackerGeometry, tTopo); const std::string labelerPlugin{"PedeLabeler"}; diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h index c65cedb457496..a9711aafedfe7 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h @@ -41,6 +41,7 @@ /*** Records for ESWatcher ***/ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" @@ -97,6 +98,7 @@ class MillePedeDQMModule : public DQMEDHarvester { const edm::ESGetToken tTopoToken_; const edm::ESGetToken gDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken aliThrToken_; const edm::ESGetToken geomToken_; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index 7a1ea9144cf53..b7579d9407f8d 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -58,6 +58,7 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg) topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), pixQualityToken_(esConsumes()), stripQualityToken_(esConsumes()), referenceTracker(nullptr), @@ -391,10 +392,11 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) { const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters* ptp = &iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; //reference tracker - TrackerGeometry* theRefTracker = trackerBuilder.build(theGeometricDet, *ptp, tTopo); + TrackerGeometry* theRefTracker = trackerBuilder.build(theGeometricDet, ptitp, *ptp, tTopo); if (inputFilename1_ != "IDEAL") { GeometryAligner aligner1; aligner1.applyAlignments( @@ -434,7 +436,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) { } //currernt tracker - TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo); + TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, ptitp, *ptp, tTopo); if (inputFilename2_ != "IDEAL") { GeometryAligner aligner2; aligner2.applyAlignments( diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h index 3a54d14f207c2..1d3089a4b8f29 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -91,6 +91,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> { const edm::ESGetToken topoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken pixQualityToken_; const edm::ESGetToken stripQualityToken_; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc index 5cee54473625e..5e66e54b9ddeb 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc @@ -47,7 +47,9 @@ #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -87,6 +89,7 @@ class TrackerGeometryIntoNtuples : public edm::one::EDAnalyzer<> { const edm::ESGetToken topoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken aliToken_; const edm::ESGetToken aliErrorToken_; const edm::ESGetToken surfDefToken_; @@ -134,6 +137,7 @@ TrackerGeometryIntoNtuples::TrackerGeometryIntoNtuples(const edm::ParameterSet& : topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), surfDefToken_(esConsumes()), @@ -195,10 +199,11 @@ void TrackerGeometryIntoNtuples::analyze(const edm::Event& iEvent, const edm::Ev //accessing the initial geometry const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters* ptp = &iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; //currernt tracker - TrackerGeometry* theCurTracker = trackerBuilder.build(theGeometricDet, *ptp, tTopo); + TrackerGeometry* theCurTracker = trackerBuilder.build(theGeometricDet, ptitp, *ptp, tTopo); //build the tracker const Alignments* alignments = &iSetup.getData(aliToken_); diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc index 118f385299ed5..c46ff1a6fc27f 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -19,6 +19,7 @@ CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrToken_(esConsumes()) { m_inputGeom = cfg.getUntrackedParameter("inputGeom"); @@ -32,7 +33,8 @@ void CreateSurveyRcds::analyze(const edm::Event& event, const edm::EventSetup& s const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); const GeometricDet* geom = &setup.getData(geomDetToken_); const PTrackerParameters& ptp = setup.getData(ptpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); + const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); //take geometry from DB or randomly generate geometry if (m_inputGeom == "sqlite") { diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h index 0aeebe27e3733..dcbe70b4d3d5e 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h @@ -20,6 +20,9 @@ #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" + #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" @@ -53,6 +56,7 @@ class CreateSurveyRcds : public SurveyInputBase { const edm::ESGetToken tTopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken aliToken_; const edm::ESGetToken aliErrToken_; diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc index 87b2ad3ceacfa..e2cedc6c098aa 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc @@ -24,6 +24,7 @@ SurveyInputTrackerFromDB::SurveyInputTrackerFromDB(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), textFileName(cfg.getParameter("textFileName")) {} void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& setup) { @@ -40,7 +41,8 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& const GeometricDet* geom = &setup.getData(geomDetToken_); const PTrackerParameters& ptp = setup.getData(ptpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); + const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); addComponent(new AlignableTracker(tracker, tTopo)); addSurveyInfo(detector()); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h index 4abce6d12599b..6fb8dd062c8f9 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h @@ -30,6 +30,7 @@ class SurveyInputTrackerFromDB : public SurveyInputBase { const edm::ESGetToken tTopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; std::string textFileName; diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc index eca8adc7550ef..54426f512a519 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc @@ -21,6 +21,7 @@ SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), textFileName(cfg.getParameter("textFileName")) {} @@ -30,7 +31,8 @@ void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup& const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); const GeometricDet* geom = &setup.getData(geomDetToken_); const PTrackerParameters& ptp = setup.getData(ptpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); + const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); addComponent(new AlignableTracker(tracker, tTopo)); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h index 566fe3a49b60f..1385a61a883c4 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h @@ -29,6 +29,7 @@ class SurveyMisalignmentInput : public SurveyInputBase { const edm::ESGetToken tTopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken aliToken_; SurveyInputTextReader::MapType uIdMap; diff --git a/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc b/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc index 03410e104cb73..62375d44c1ac2 100644 --- a/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc +++ b/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc @@ -51,6 +51,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" @@ -59,6 +60,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "CLHEP/Vector/RotationInterfaces.h" @@ -88,6 +90,7 @@ class CreateIdealTkAlRecords : public edm::one::EDAnalyzer<> { const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const edm::ESGetToken aliToken_; const edm::ESGetToken aliErrorToken_; @@ -109,6 +112,7 @@ class CreateIdealTkAlRecords : public edm::one::EDAnalyzer<> { CreateIdealTkAlRecords::CreateIdealTkAlRecords(const edm::ParameterSet& iConfig) : geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), @@ -251,11 +255,12 @@ void CreateIdealTkAlRecords::clearAlignmentInfos() { std::unique_ptr CreateIdealTkAlRecords::retrieveGeometry(const edm::EventSetup& iSetup) { const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters& ptp = iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); const TrackerTopology* tTopo = &iSetup.getData(topoToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - return std::unique_ptr{trackerBuilder.build(geometricDet, ptp, tTopo)}; + return std::unique_ptr{trackerBuilder.build(geometricDet, ptitp, ptp, tTopo)}; } void CreateIdealTkAlRecords::addAlignmentInfo(const GeomDet& det) { diff --git a/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc b/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc index a259a2e59ff82..d5565b8366cd2 100644 --- a/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc +++ b/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc @@ -42,6 +42,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" #include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" @@ -52,6 +53,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" // // class declaration @@ -69,6 +71,7 @@ class MCMisalignmentScaler : public edm::one::EDAnalyzer<> { const edm::ESGetToken stripQualityToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const edm::ESGetToken aliToken_; using ScalerMap = std::unordered_map >; @@ -91,6 +94,7 @@ MCMisalignmentScaler::MCMisalignmentScaler(const edm::ParameterSet& iConfig) stripQualityToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), scalers_{decodeSubDetectors(iConfig.getParameter("scalers"))}, @@ -114,10 +118,11 @@ void MCMisalignmentScaler::analyze(const edm::Event&, const edm::EventSetup& iSe // get the tracker geometry const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters& ptp = iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); const TrackerTopology* topology = &iSetup.getData(topoToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - auto tracker = std::unique_ptr{trackerBuilder.build(geometricDet, ptp, topology)}; + auto tracker = std::unique_ptr{trackerBuilder.build(geometricDet, ptitp, ptp, topology)}; auto dets = tracker->dets(); std::sort(dets.begin(), dets.end(), [](const auto& a, const auto& b) { diff --git a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc index ee3c1089387c9..2831c514fc19f 100644 --- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc +++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc @@ -48,6 +48,7 @@ class MisalignedTrackerESProducer : public edm::ESProducer { private: edm::ESGetToken geomDetToken_; edm::ESGetToken ptpToken_; + edm::ESGetToken ptitpToken_; edm::ESGetToken topoToken_; const bool theSaveToDB; /// whether or not writing to DB @@ -71,6 +72,7 @@ MisalignedTrackerESProducer::MisalignedTrackerESProducer(const edm::ParameterSet auto cc = setWhatProduced(this); geomDetToken_ = cc.consumes(); ptpToken_ = cc.consumes(); + ptitpToken_ = cc.consumes(); topoToken_ = cc.consumes(); } @@ -87,9 +89,10 @@ std::unique_ptr MisalignedTrackerESProducer::produce(const Trac // Create the tracker geometry from ideal geometry const GeometricDet* gD = &iRecord.get(geomDetToken_); const PTrackerParameters& ptp = iRecord.get(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iRecord.get(ptitpToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - std::unique_ptr theTracker(trackerBuilder.build(gD, ptp, tTopo)); + std::unique_ptr theTracker(trackerBuilder.build(gD, ptitp, ptp, tTopo)); // Create the alignable hierarchy auto theAlignableTracker = std::make_unique(&(*theTracker), tTopo); diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc index c8a0e7b6425a4..e3fb15766730f 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -60,6 +60,7 @@ class TrackerSystematicMisalignments : public edm::one::EDAnalyzer<> { const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const edm::ESGetToken aliToken_; const edm::ESGetToken aliErrorToken_; @@ -99,6 +100,7 @@ class TrackerSystematicMisalignments : public edm::one::EDAnalyzer<> { TrackerSystematicMisalignments::TrackerSystematicMisalignments(const edm::ParameterSet& cfg) : geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), @@ -171,9 +173,10 @@ void TrackerSystematicMisalignments::analyze(const edm::Event& event, const edm: //Retrieve tracker topology from geometry const GeometricDet* geom = &setup.getData(geomDetToken_); const PTrackerParameters& ptp = setup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); const TrackerTopology* tTopo = &setup.getData(topoToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); //take geometry from DB or randomly generate geometry if (m_fromDBGeom) { diff --git a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc index b95820102cf7f..c8ccbe4113513 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc @@ -48,6 +48,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" @@ -74,6 +75,7 @@ class TrackerTreeGenerator : public edm::one::EDAnalyzer geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const bool createEntryForDoubleSidedModule_; @@ -95,6 +97,7 @@ class TrackerTreeGenerator : public edm::one::EDAnalyzer("createEntryForDoubleSidedModule")), config_(config) { @@ -110,10 +113,11 @@ void TrackerTreeGenerator::analyze(const edm::Event& iEvent, const edm::EventSet // now try to take directly the ideal geometry independent of used geometry in Global Tag const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_); const PTrackerParameters& ptp = iSetup.getData(ptpToken_); + const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_); const TrackerTopology* tTopo = &iSetup.getData(topoToken_); TrackerGeomBuilderFromGeometricDet trackerBuilder; - const TrackerGeometry* tkGeom = trackerBuilder.build(geometricDet, ptp, tTopo); + const TrackerGeometry* tkGeom = trackerBuilder.build(geometricDet, ptitp, ptp, tTopo); AlignableTracker alignableTracker{tkGeom, tTopo}; const auto& ns = alignableTracker.trackerNameSpace(); diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc index a041d661579f0..d8077454e3e78 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc @@ -6,6 +6,7 @@ // for creation of TrackerGeometry #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -28,6 +29,7 @@ TrackerGeometryAnalyzer ::TrackerGeometryAnalyzer(const edm::ParameterSet& confi : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptapToken_(esConsumes()), analyzeAlignables_(config.getParameter("analyzeAlignables")), printTrackerStructure_(config.getParameter("printTrackerStructure")), maxPrintDepth_(config.getParameter("maxPrintDepth")), @@ -71,9 +73,11 @@ void TrackerGeometryAnalyzer ::setTrackerTopology(const edm::EventSetup& setup) void TrackerGeometryAnalyzer ::setTrackerGeometry(const edm::EventSetup& setup) { edm::ESHandle geometricDet = setup.getHandle(geomDetToken_); edm::ESHandle trackerParams = setup.getHandle(ptpToken_); + edm::ESHandle trackerGeometricDetExtra = setup.getHandle(ptapToken_); TrackerGeomBuilderFromGeometricDet trackerGeometryBuilder; - trackerGeometry = trackerGeometryBuilder.build(&(*geometricDet), *trackerParams, trackerTopology); + trackerGeometry = + trackerGeometryBuilder.build(&(*geometricDet), &(*trackerGeometricDetExtra), *trackerParams, trackerTopology); alignableObjectId_ = AlignableObjectId{trackerGeometry, nullptr, nullptr, nullptr}; } diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h index ea7b57e5cc2e1..07f3e67c0c5bb 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h @@ -19,6 +19,7 @@ #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -73,6 +74,7 @@ class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer const edm::ESGetToken tTopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptapToken_; // config-file parameters const bool analyzeAlignables_; diff --git a/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc b/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc new file mode 100644 index 0000000000000..1fafe17fa16d9 --- /dev/null +++ b/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc @@ -0,0 +1,52 @@ +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/ESTransientHandle.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "CondCore/DBOutputService/interface/PoolDBOutputService.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" + +class PTrackerAdditionalParametersPerDetDBBuilder : public edm::one::EDAnalyzer { +public: + PTrackerAdditionalParametersPerDetDBBuilder(const edm::ParameterSet&); + + void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override; + void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {} + void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} + +private: + const edm::ESGetToken geomDetToken_; +}; + +PTrackerAdditionalParametersPerDetDBBuilder::PTrackerAdditionalParametersPerDetDBBuilder( + const edm::ParameterSet& iConfig) + : geomDetToken_(esConsumes()) {} + +void PTrackerAdditionalParametersPerDetDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) { + PTrackerAdditionalParametersPerDet ptitp; + edm::Service mydbservice; + if (!mydbservice.isAvailable()) { + edm::LogError("PTrackerAdditionalParametersPerDetDBBuilder") << "PoolDBOutputService unavailable"; + return; + } + + const GeometricDet* gd = &es.getData(geomDetToken_); + + std::vector comp; + gd->deepComponents(comp); + + for (auto& i : comp) { + ptitp.setGeographicalId(i->geographicalId()); + } + + if (mydbservice->isNewTagRequest("PTrackerAdditionalParametersPerDetRcd")) { + mydbservice->createOneIOV(ptitp, mydbservice->beginOfTime(), "PTrackerAdditionalParametersPerDetRcd"); + } else { + edm::LogError("PTrackerAdditionalParametersPerDetDBBuilder") + << "PTrackerAdditionalParametersPerDet and PTrackerAdditionalParametersPerDetRcd Tag already present"; + } +} + +DEFINE_FWK_MODULE(PTrackerAdditionalParametersPerDetDBBuilder); diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py index c62052f19ec73..39c0d9ceae60d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py @@ -4,6 +4,7 @@ from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py index ef504b16af656..022d54b8556bc 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py @@ -4,6 +4,7 @@ from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py index ffc819a6ce3da..3cc9ae3004e21 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py index 8b185d343b39b..53fdfe55fdf7f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py index ea7c7e80a1ecf..898420b813bc8 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py index 9850b83058148..ac606c5857577 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py index 279642b473bae..bb0eed90f8e97 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py index 8d223d6f65189..2b687c4b806f1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py index 79d2ebe74afad..e787c6240a938 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py index 12b5418ff4552..41e4a10f3c253 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py index 14b2624744bdb..c45437fe8d538 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py index 253cdee74db99..6fb4dd7c4b014 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py index c1a383e934136..c6a55e498eb2d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py index 04ece77ee0989..830bec2e788d5 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py index 0cfb78fe7cf77..4242b8b9cfe07 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py index 26cf6705791f7..a6386d7d64394 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py index 3059ebb6657bb..b8a8e9e3e0f62 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py index c60afdf36eb3d..0c41b9dd08d77 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py index fa2c90a73b242..f055159035310 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py index bf6caa873c423..52a1585c94946 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py index a5d4c48bfa920..29a3792173fb9 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py index cc4607e55b67c..6f32998764d59 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py index 1994dea5c0666..ffbd37300d2ef 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py index 18e54d9163f2c..7044c6cfcc25d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py index 41133d0811c03..1edd1599de2af 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py index 306b4427eabb7..2a2a1a1c1fada 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py index b40b91e3a646d..a94cab656d651 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py index 08ebc74515a81..c15157642f0b2 100644 --- a/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py index 4aa830931fc6f..8c40f1dfd9c02 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py index 26822276c2505..c438936acee56 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py @@ -9,6 +9,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py index 1843399b3279b..ceb33fcdcf4ac 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py @@ -9,6 +9,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py index 4b88ecd1cd364..e1bf2f1041eec 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py @@ -9,6 +9,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py index 73d37e33728dd..d7d985407b6a7 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py @@ -9,6 +9,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py index 1230045ea7d6e..057b0382ee8c6 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py index 6bf538b23155a..b4caab42cdee3 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py index 81b00b6b765f2..471116dc918d5 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py @@ -9,6 +9,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py index ddb2adb5af5a1..4565dfff3ada3 100644 --- a/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py @@ -11,6 +11,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py index acd5b40ee93a2..649f873830d59 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py index b199febc3d8e1..3edc5fd30a3af 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py index 8b34163ec9edc..99f20fb09662e 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py index 0551a6f017b7d..992f6549a7fb0 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py index afaa8a42450a4..9987e82e4d75b 100644 --- a/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py @@ -11,6 +11,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py index 5b9054885cbdb..fead9ffeabffa 100644 --- a/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py @@ -11,6 +11,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py index c51b9536e0606..ce407b3d0c0ff 100644 --- a/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py @@ -11,6 +11,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py index 8cfa217ebbc24..c98b17ff1dce4 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py index 1760f0fbe5665..0d20e27f047ab 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py index 70ea11f077a39..ca96a5b16ec9b 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py index d6734a4180280..14a33b3afc6f8 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py index ff8be7f114bb2..f573869340ef1 100644 --- a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py index fd7b1d3a66f26..31be348f0238c 100644 --- a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py index 798dad5a607a1..283c604c27a30 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py index 5b3396e6eef19..55e793ecc6982 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py index b6f1ba3b47b66..aedcdbb6bb6e7 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py index 454ba75e5a7af..ef0a8f48dd663 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py index b0d5b066b20ec..5cbb0c59ed92e 100644 --- a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py index c25ebe6d850a6..c41c147c59a1f 100644 --- a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py index f2eaf271c0726..0181649198193 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py index 2b5bdd4fd7f80..fd27ef456b9fe 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py index a0ea4fbbe6e2b..b713d55193265 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py index e83a7343aaf53..93408b8d39b2f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py index 9fbbad2f716e9..5d0c7e966619d 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py index a20cac81f72c3..97bcb6b24dd3d 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py index 9c4d4871e6c8a..157e84c5887e3 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py index f9dd889bd1c83..5d22d5753daf3 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py index 214fb8191edec..96b87f413d155 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py index 62219e3b5b02a..e642a47c6434f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py index 0585f67f837e7..c7b2222eb565d 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py index 66a3677c3e207..bdccdab1a30dc 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py index b0c0bdd259182..241752d0d3e68 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py @@ -8,6 +8,7 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended_cff.py b/Configuration/Geometry/python/GeometryExtended_cff.py index 8b5d12fdadfb1..77b38da07f654 100644 --- a/Configuration/Geometry/python/GeometryExtended_cff.py +++ b/Configuration/Geometry/python/GeometryExtended_cff.py @@ -9,6 +9,8 @@ # Ideal geometry, needed for simulation from Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * +# TrackerAdditionalParametersPerDet contains only default values, needed for consistency with Phase 2 +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * diff --git a/Configuration/Geometry/python/GeometryIdealAPD1_cff.py b/Configuration/Geometry/python/GeometryIdealAPD1_cff.py index 16b3416ad84af..deaa4202705c4 100644 --- a/Configuration/Geometry/python/GeometryIdealAPD1_cff.py +++ b/Configuration/Geometry/python/GeometryIdealAPD1_cff.py @@ -12,6 +12,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * #Muon from Geometry.MuonNumbering.muonGeometryConstants_cff import * diff --git a/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py b/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py index b2243859583b4..84261d80b01c0 100644 --- a/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py +++ b/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py @@ -12,6 +12,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * #Muon from Geometry.MuonNumbering.muonGeometryConstants_cff import * diff --git a/Configuration/Geometry/python/GeometryNoCastor_cff.py b/Configuration/Geometry/python/GeometryNoCastor_cff.py index 26a0440b454cd..d5ddac7f51a25 100644 --- a/Configuration/Geometry/python/GeometryNoCastor_cff.py +++ b/Configuration/Geometry/python/GeometryNoCastor_cff.py @@ -12,6 +12,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * #Muon from Geometry.MuonNumbering.muonGeometryConstants_cff import * diff --git a/Configuration/Geometry/python/GeometryRecoDB_cff.py b/Configuration/Geometry/python/GeometryRecoDB_cff.py index 818a174abe9ed..a62a12eeb66e8 100644 --- a/Configuration/Geometry/python/GeometryRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometryRecoDB_cff.py @@ -5,6 +5,8 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +# TrackerAdditionalParametersPerDet contains only default values, needed for consistency with Phase 2 +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryRecoTracker_cff.py b/Configuration/Geometry/python/GeometryRecoTracker_cff.py index d85de3012c48b..e035a22b4681b 100644 --- a/Configuration/Geometry/python/GeometryRecoTracker_cff.py +++ b/Configuration/Geometry/python/GeometryRecoTracker_cff.py @@ -6,6 +6,8 @@ # Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +# TrackerAdditionalParametersPerDet contains only default values, needed for consistency with Phase 2 +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * # Alignment from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryReco_cff.py b/Configuration/Geometry/python/GeometryReco_cff.py index 1a583d69c9ac9..b4d5a14599dfe 100644 --- a/Configuration/Geometry/python/GeometryReco_cff.py +++ b/Configuration/Geometry/python/GeometryReco_cff.py @@ -6,6 +6,8 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +# TrackerAdditionalParametersPerDet contains only default values, needed for consistency with Phase 2 +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * diff --git a/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py b/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py index c9b3be08bf616..d65fba5f52889 100644 --- a/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py @@ -5,6 +5,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import * trackerGeometryDB.applyAlignment = cms.bool(False) # diff --git a/Configuration/Geometry/python/GeometrySLHCReco_cff.py b/Configuration/Geometry/python/GeometrySLHCReco_cff.py index c772c2d9429fe..66712a79e6f4e 100644 --- a/Configuration/Geometry/python/GeometrySLHCReco_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCReco_cff.py @@ -10,6 +10,7 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * #Muon from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index 64d854d1bca93..a26f932452b95 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -290,6 +290,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -492,6 +493,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -695,6 +697,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -898,6 +901,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -1101,6 +1105,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -1304,6 +1309,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index 08ab863c105a6..2bbeefdb21995 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -93,6 +93,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -128,6 +129,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -163,6 +165,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -199,6 +202,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -235,6 +239,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', @@ -270,6 +275,7 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', diff --git a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h index cf4f7c5a5b1c1..16636dc5d8660 100644 --- a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h @@ -7,6 +7,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/PlaneBuilderFromGeometricDet.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" class TrackerGeometry; class TrackerTopology; @@ -16,10 +17,14 @@ class PTrackerParameters; class TrackerGeomBuilderFromGeometricDet { public: - TrackerGeometry* build(const GeometricDet* gd, const PTrackerParameters& ptp, const TrackerTopology* tTopo); + TrackerGeometry* build(const GeometricDet* gd, + const PTrackerAdditionalParametersPerDet* ptitp, + const PTrackerParameters& ptp, + const TrackerTopology* tTopo); private: void buildPixel(std::vector const&, + const PTrackerAdditionalParametersPerDet* const&, TrackerGeometry*, GeomDetType::SubDetector det, bool upgradeGeometry, diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc new file mode 100644 index 0000000000000..a9c36ef0c6e35 --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc @@ -0,0 +1,65 @@ +#include "FWCore/Framework/interface/ESProducer.h" +#include "FWCore/Framework/interface/ModuleFactory.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/ESTransientHandle.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" + +#include + +namespace edm { + class ConfigurationDescriptions; +} +class PTrackerAdditionalParametersPerDet; +class PTrackerAdditionalParametersPerDetRcd; + +class TrackerAdditionalParametersPerDetESModule : public edm::ESProducer { +public: + TrackerAdditionalParametersPerDetESModule(const edm::ParameterSet&); + + using ReturnType = std::unique_ptr; + + static void fillDescriptions(edm::ConfigurationDescriptions&); + + ReturnType produce(const PTrackerAdditionalParametersPerDetRcd&); + +private: + edm::ESGetToken geometricDetToken_; +}; + +TrackerAdditionalParametersPerDetESModule::TrackerAdditionalParametersPerDetESModule(const edm::ParameterSet& ps) { + auto cc = setWhatProduced(this); + geometricDetToken_ = cc.consumesFrom(edm::ESInputTag()); +} + +void TrackerAdditionalParametersPerDetESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.add("TrackerAdditionalParametersPerDet", desc); +} + +TrackerAdditionalParametersPerDetESModule::ReturnType TrackerAdditionalParametersPerDetESModule::produce( + const PTrackerAdditionalParametersPerDetRcd& iRecord) { + edm::LogInfo("TrackerAdditionalParametersPerDet") + << "TrackerAdditionalParametersPerDetESModule::produce(const PTrackerAdditionalParametersPerDetRcd& iRecord)"; + + auto ptitp = std::make_unique(); + + edm::ESTransientHandle gd = iRecord.getTransientHandle(geometricDetToken_); + + std::vector comp; + gd->deepComponents(comp); + + for (auto& i : comp) { + ptitp->setGeographicalId(i->geographicalId()); + } + + return ptitp; +} + +DEFINE_FWK_EVENTSETUP_MODULE(TrackerAdditionalParametersPerDetESModule); diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc index fae0da2827ef8..9d8a3e9c0d5e8 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc @@ -15,10 +15,12 @@ #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "Geometry/CommonTopologies/interface/GeometryAligner.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -44,6 +46,8 @@ class TrackerDigiGeometryESModule : public edm::ESProducer { edm::ESGetToken geometricDetToken_; edm::ESGetToken trackerTopoToken_; edm::ESGetToken trackerParamsToken_; + edm::ESGetToken + trackerGeometricDetExtraToken_; edm::ESGetToken globalAlignmentToken_; edm::ESGetToken trackerAlignmentToken_; @@ -64,6 +68,8 @@ TrackerDigiGeometryESModule::TrackerDigiGeometryESModule(const edm::ParameterSet geometricDetToken_ = cc.consumesFrom(kEmptyTag); trackerTopoToken_ = cc.consumesFrom(kEmptyTag); trackerParamsToken_ = cc.consumesFrom(kEmptyTag); + trackerGeometricDetExtraToken_ = + cc.consumesFrom(kEmptyTag); if (applyAlignment_) { const edm::ESInputTag kAlignTag{"", alignmentsLabel_}; @@ -109,8 +115,10 @@ std::unique_ptr TrackerDigiGeometryESModule::produce(const Trac auto const& ptp = iRecord.get(trackerParamsToken_); + auto const& ptitp = iRecord.get(trackerGeometricDetExtraToken_); + TrackerGeomBuilderFromGeometricDet builder; - std::unique_ptr tracker(builder.build(&gD, ptp, &tTopo)); + std::unique_ptr tracker(builder.build(&gD, &ptitp, ptp, &tTopo)); if (applyAlignment_) { // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_! diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index b464a094b4323..801daa90960fa 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -12,6 +12,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/StripTopologyBuilder.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" @@ -42,6 +43,7 @@ namespace { } // namespace TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* gd, + const PTrackerAdditionalParametersPerDet* ptitpx, const PTrackerParameters& ptp, const TrackerTopology* tTopo) { if (ptp.vpars.size() != 6) { @@ -101,26 +103,46 @@ TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* g // now building the Pixel-like subdetectors for (unsigned int i = 0; i < 6; ++i) { if (gdsubdetmap[i] == GeometricDet::PixelBarrel) - buildPixel( - dets[i], tracker, GeomDetEnumerators::SubDetector::PixelBarrel, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], + ptitpx, + tracker, + GeomDetEnumerators::SubDetector::PixelBarrel, + false, + BIG_PIX_PER_ROC_X, + BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::PixelPhase1Barrel) - buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P1PXB, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P1PXB, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); // Phase2 case if (gdsubdetmap[i] == GeometricDet::PixelPhase2Barrel) - buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2PXB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2PXB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); // if (gdsubdetmap[i] == GeometricDet::PixelEndCap) - buildPixel( - dets[i], tracker, GeomDetEnumerators::SubDetector::PixelEndcap, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], + ptitpx, + tracker, + GeomDetEnumerators::SubDetector::PixelEndcap, + false, + BIG_PIX_PER_ROC_X, + BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::PixelPhase1EndCap) - buildPixel( - dets[i], tracker, GeomDetEnumerators::SubDetector::P1PXEC, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], + ptitpx, + tracker, + GeomDetEnumerators::SubDetector::P1PXEC, + false, + BIG_PIX_PER_ROC_X, + BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::PixelPhase2EndCap) - buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2PXEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2PXEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::OTPhase2Barrel) - buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2OTB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2OTB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::OTPhase2EndCap) - buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2OTEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2OTEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); } //now building Strips for (unsigned int i = 0; i < 6; ++i) { @@ -152,6 +174,7 @@ TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* g void TrackerGeomBuilderFromGeometricDet::buildPixel( std::vector const& gdv, + const PTrackerAdditionalParametersPerDet* const& ptitp, TrackerGeometry* tracker, GeomDetType::SubDetector det, bool upgradeGeometry, diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py index 860ee01da7ba4..d4265a9b5d25b 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py @@ -8,6 +8,7 @@ process.load("Geometry.TrackerNumberingBuilder.trackerTopology_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") +process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi") process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py index daea66e3e9a05..04ceeb6230cc1 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py @@ -15,6 +15,8 @@ process.es_prefer_geomdet = cms.ESPrefer("TrackerGeometricDetESModule","") +process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") + process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py index 343f1f18b639a..27fc74a1bc1e2 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py @@ -16,6 +16,8 @@ process.es_prefer_geomdet = cms.ESPrefer("TrackerGeometricDetESModule","") +process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") + process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") From 7ff94d8b66eecc3845226214c03c97a4a1fe6e06 Mon Sep 17 00:00:00 2001 From: Ernesto Migliore Date: Thu, 3 Aug 2023 13:28:56 +0200 Subject: [PATCH 2/2] fix HLT customization to consume PTrackerAdditionalParametersPerDetRcd --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index b3c0b20700909..5627132667935 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -268,6 +268,11 @@ def customizeHLTfor42410(process): return process +def customizeHLTFor42454(process): + """Ensure TrackerAdditionalParametersPerDetRcd ESProducer is run""" + process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") + return process + # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -282,4 +287,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = customizeHLTfor41632(process) process = customizeHLTfor42410(process) + if menuType in ["GRun","HIon","PIon","PRef"]: + process = customizeHLTFor42454(process) + return process