diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc index 806fd1aac4b0a..48bf8b041dc29 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_; @@ -120,6 +122,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"))), @@ -155,8 +158,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 54a6bd2075d64..60816aea033d6 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" @@ -253,6 +255,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 a14d053678e2c..1a8681b8ff496 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc @@ -50,6 +50,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"))), @@ -430,8 +431,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 ee7702b9dd1e5..7045fb9b91d39 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.cc @@ -11,7 +11,9 @@ #include "FWCore/Framework/interface/Run.h" #include "Geometry/Records/interface/TrackerTopologyRcd.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" /// /// @@ -21,6 +23,7 @@ LaserAlignment::LaserAlignment(edm::ParameterSet const& theConf) geomToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), gprToken_(esConsumes()), stripPedestalsToken_(esConsumes()), theEvents(0), @@ -298,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 94615694e0d4b..3424d31129229 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()), mpReaderConfig_(config.getParameter("MillePedeFileReader")) { consumes(config.getParameter("alignmentTokenSrc")); @@ -87,6 +88,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_); // take the thresholds from DB const auto& thresholds_ = &setup.getData(aliThrToken_); @@ -96,7 +98,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 8cb177afdc002..cb05faa56c1ad 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h @@ -39,6 +39,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" /*** MillePede ***/ @@ -80,6 +81,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::ParameterSet mpReaderConfig_; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index 409141aa94417..db2bb31492f23 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), @@ -367,10 +368,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( @@ -410,7 +412,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 d51082367c01e..33547a383fe6b 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -89,6 +89,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 81ea9b5d01044..c1d57d3ef07c3 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" @@ -85,6 +87,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_; @@ -132,6 +135,7 @@ TrackerGeometryIntoNtuples::TrackerGeometryIntoNtuples(const edm::ParameterSet& : topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), surfDefToken_(esConsumes()), @@ -184,10 +188,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 13de2f54e007c..e4ace6f218dcc 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -1,5 +1,6 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -22,6 +23,7 @@ CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrToken_(esConsumes()) { m_inputGeom = cfg.getUntrackedParameter("inputGeom"); @@ -35,7 +37,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 275b9fd1b102f..342b3dd4777fe 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc @@ -8,6 +8,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" // Database #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" @@ -23,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) { @@ -39,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 e7856dede25b1..54426f512a519 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc @@ -4,6 +4,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" @@ -20,6 +21,7 @@ SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), aliToken_(esConsumes()), textFileName(cfg.getParameter("textFileName")) {} @@ -29,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 5e2b593aee35f..e0c1d6fd127cb 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 b74c1c9340e5c..f83072cf70c84 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 14eff34040714..f34bbf13010ef 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 0b43bc30556ec..472207cb1b932 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -41,6 +41,7 @@ TrackerSystematicMisalignments::TrackerSystematicMisalignments(const edm::ParameterSet& cfg) : geomDetToken_(esConsumes()), ptpToken_(esConsumes()), + ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), @@ -113,9 +114,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/TrackerSystematicMisalignments.h b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h index 19b25880ad02f..1a4fddeacf4eb 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h @@ -39,6 +39,7 @@ class TrackerSystematicMisalignments : public edm::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_; 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 5dc9d448e6478..9669061419194 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" @@ -76,8 +77,12 @@ void TrackerGeometryAnalyzer ::setTrackerGeometry(const edm::EventSetup& setup) edm::ESHandle trackerParams; setup.get().get(trackerParams); + edm::ESHandle trackerGeometricDetExtra; + setup.get().get(trackerGeometricDetExtra); + TrackerGeomBuilderFromGeometricDet trackerGeometryBuilder; - trackerGeometry = trackerGeometryBuilder.build(&(*geometricDet), *trackerParams, trackerTopology); + trackerGeometry = + trackerGeometryBuilder.build(&(*geometricDet), &(*trackerGeometricDetExtra), *trackerParams, trackerTopology); alignableObjectId_ = AlignableObjectId{trackerGeometry, nullptr, nullptr, nullptr}; } diff --git a/CondCore/GeometryPlugins/plugins/plugin.cc b/CondCore/GeometryPlugins/plugins/plugin.cc index ae09f944fd533..ed76701100c2d 100644 --- a/CondCore/GeometryPlugins/plugins/plugin.cc +++ b/CondCore/GeometryPlugins/plugins/plugin.cc @@ -29,6 +29,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 "CondFormats/GeometryObjects/interface/HcalParameters.h" #include "Geometry/Records/interface/HcalParametersRcd.h" @@ -41,6 +44,7 @@ REGISTER_PLUGIN(GeometryFileRcd, FileBlob); REGISTER_PLUGIN(IdealGeometryRecord, PGeometricDet); REGISTER_PLUGIN(PTrackerParametersRcd, PTrackerParameters); +REGISTER_PLUGIN(PTrackerAdditionalParametersPerDetRcd, PTrackerAdditionalParametersPerDet); REGISTER_PLUGIN(PEcalBarrelRcd, PCaloGeometry); REGISTER_PLUGIN(PEcalEndcapRcd, PCaloGeometry); REGISTER_PLUGIN(PEcalPreshowerRcd, PCaloGeometry); diff --git a/CondCore/Utilities/plugins/Module_2XML.cc b/CondCore/Utilities/plugins/Module_2XML.cc index 29315adf8f158..deae196480a72 100644 --- a/CondCore/Utilities/plugins/Module_2XML.cc +++ b/CondCore/Utilities/plugins/Module_2XML.cc @@ -212,6 +212,7 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) { PAYLOAD_2XML_CLASS(PGeometricDet); PAYLOAD_2XML_CLASS(PHGCalParameters); PAYLOAD_2XML_CLASS(PTrackerParameters); + PAYLOAD_2XML_CLASS(PTrackerAdditionalParametersPerDet); PAYLOAD_2XML_CLASS(PerformancePayloadFromBinnedTFormula); PAYLOAD_2XML_CLASS(PerformancePayloadFromTFormula); PAYLOAD_2XML_CLASS(PerformancePayloadFromTable); diff --git a/CondCore/Utilities/src/CondDBFetch.cc b/CondCore/Utilities/src/CondDBFetch.cc index 65487da430c1b..d950d7145e5ce 100644 --- a/CondCore/Utilities/src/CondDBFetch.cc +++ b/CondCore/Utilities/src/CondDBFetch.cc @@ -243,6 +243,7 @@ namespace cond { FETCH_PAYLOAD_CASE(HcalParameters) FETCH_PAYLOAD_CASE(PGeometricDet) FETCH_PAYLOAD_CASE(PTrackerParameters) + FETCH_PAYLOAD_CASE(PTrackerAdditionalParametersPerDet) FETCH_PAYLOAD_CASE(PHGCalParameters) //FETCH_PAYLOAD_CASE( PerformancePayload ) FETCH_PAYLOAD_CASE(PerformancePayloadFromTable) diff --git a/CondCore/Utilities/src/CondDBImport.cc b/CondCore/Utilities/src/CondDBImport.cc index 051cded7514cd..06f2569ff44a2 100644 --- a/CondCore/Utilities/src/CondDBImport.cc +++ b/CondCore/Utilities/src/CondDBImport.cc @@ -266,6 +266,7 @@ namespace cond { IMPORT_PAYLOAD_CASE(HcalParameters) IMPORT_PAYLOAD_CASE(PGeometricDet) IMPORT_PAYLOAD_CASE(PTrackerParameters) + IMPORT_PAYLOAD_CASE(PTrackerAdditionalParametersPerDet) IMPORT_PAYLOAD_CASE(PHGCalParameters) //IMPORT_PAYLOAD_CASE( PerformancePayload ) IMPORT_PAYLOAD_CASE(PerformancePayloadFromTable) diff --git a/CondCore/Utilities/src/CondFormats.h b/CondCore/Utilities/src/CondFormats.h index 831d7b5551621..ef04fcb0035bf 100644 --- a/CondCore/Utilities/src/CondFormats.h +++ b/CondCore/Utilities/src/CondFormats.h @@ -117,6 +117,7 @@ #include "CondFormats/PhysicsToolsObjects/interface/PhysicsTFormulaPayload.h" #include "CondFormats/GeometryObjects/interface/PGeometricDet.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "CondFormats/GeometryObjects/interface/PHGCalParameters.h" #include "CondFormats/RPCObjects/interface/RPCEMap.h" #include "CondFormats/RPCObjects/interface/RPCObFebmap.h" diff --git a/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h new file mode 100644 index 0000000000000..84d8cec89d2d1 --- /dev/null +++ b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h @@ -0,0 +1,37 @@ +#ifndef CondFormats_PTrackerAdditionalParametersPerDet_h +#define CondFormats_PTrackerAdditionalParametersPerDet_h + +#include "CondFormats/Serialization/interface/Serializable.h" + +#include +#include + +class PTrackerAdditionalParametersPerDet { +public: + PTrackerAdditionalParametersPerDet() { + intParams_.resize(ISIZE, std::vector(0, 0)); + floatParams_.resize(FSIZE, std::vector(0, 0.)); + boolParams_.resize(BSIZE, std::vector(0, false)); + }; + ~PTrackerAdditionalParametersPerDet(){}; + + enum IntParamIndex { GEOGRAPHICAL_ID = 0, ISIZE = 1 }; + enum BoolParamIndex { BRICKEDNESS = 0, BSIZE = 1 }; + enum FloatParamIndex { FSIZE = 0 }; + + int getGeographicalId(int theIndex) const; + bool getBricked(int theIndex) const; + std::vector getAllGeographicalIds() const; + std::vector getAllBricked() const; + + void setGeographicalId(int geographicalId); + void setBricked(bool isBricked); + + std::vector> intParams_; + std::vector> boolParams_; + std::vector> floatParams_; + + COND_SERIALIZABLE; +}; + +#endif diff --git a/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc b/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc new file mode 100644 index 0000000000000..cd552ca3741be --- /dev/null +++ b/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc @@ -0,0 +1,53 @@ +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" +#include + +namespace { + template + const T getThisParam(const std::vector>& params, size_t index_outer, size_t index_inner) { + if (index_outer >= params.size()) + throw std::out_of_range("Parameter with index " + std::to_string(index_outer) + " is out of range."); + if (index_inner >= params[index_outer].size()) + throw std::out_of_range("Parameter with index " + std::to_string(index_inner) + " is out of range."); + return params[index_outer][index_inner]; + } + + template + void setThisParam(std::vector>& params, size_t index_outer, const T& value) { + if (index_outer >= params.size()) + throw std::out_of_range("Parameter with index " + std::to_string(index_outer) + " is out of range."); + params[index_outer].push_back(value); + } + + template + const std::vector& getAllParams(const std::vector>& params, size_t index_outer) { + if (index_outer >= params.size()) + throw std::out_of_range("Parameter with index " + std::to_string(index_outer) + " is out of range."); + return params[index_outer]; + } + +} // namespace + +int PTrackerAdditionalParametersPerDet::getGeographicalId(int theIndex) const { + return getThisParam(intParams_, GEOGRAPHICAL_ID, theIndex); +} + +std::vector PTrackerAdditionalParametersPerDet::getAllGeographicalIds() const { + return getAllParams(intParams_, GEOGRAPHICAL_ID); +} + +bool PTrackerAdditionalParametersPerDet::getBricked(int theIndex) const { + return getThisParam(boolParams_, BRICKEDNESS, theIndex); +} + +std::vector PTrackerAdditionalParametersPerDet::getAllBricked() const { + return getAllParams(boolParams_, BRICKEDNESS); +} + +void PTrackerAdditionalParametersPerDet::setGeographicalId(int geographicalId) { + setThisParam(intParams_, GEOGRAPHICAL_ID, geographicalId); +} + +void PTrackerAdditionalParametersPerDet::setBricked(bool isBricked) { + setThisParam(boolParams_, BRICKEDNESS, isBricked); +} +//This doesn't work properly because intParams_ and boolParams_ are vectors of vecotrs - the outer vector should be the number of parameters and the inner vector the number of geometricDets. diff --git a/CondFormats/GeometryObjects/src/T_EventSetup_PTrackerAdditionalParametersPerDet.cc b/CondFormats/GeometryObjects/src/T_EventSetup_PTrackerAdditionalParametersPerDet.cc new file mode 100644 index 0000000000000..f45ed09534a73 --- /dev/null +++ b/CondFormats/GeometryObjects/src/T_EventSetup_PTrackerAdditionalParametersPerDet.cc @@ -0,0 +1,4 @@ +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" +#include "FWCore/Utilities/interface/typelookup.h" + +TYPELOOKUP_DATA_REG(PTrackerAdditionalParametersPerDet); diff --git a/CondFormats/GeometryObjects/src/classes.h b/CondFormats/GeometryObjects/src/classes.h index 61ce321662866..d9bdb8416abc7 100644 --- a/CondFormats/GeometryObjects/src/classes.h +++ b/CondFormats/GeometryObjects/src/classes.h @@ -1,4 +1,5 @@ #include "CondFormats/GeometryObjects/interface/PGeometricDet.h" +#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "CondFormats/GeometryObjects/interface/PGeometricTimingDet.h" #include "CondFormats/GeometryObjects/interface/PCaloGeometry.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" diff --git a/CondFormats/GeometryObjects/src/classes_def.xml b/CondFormats/GeometryObjects/src/classes_def.xml index 4321391cca018..e5a7a66f9abfb 100644 --- a/CondFormats/GeometryObjects/src/classes_def.xml +++ b/CondFormats/GeometryObjects/src/classes_def.xml @@ -5,6 +5,8 @@ + + diff --git a/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp b/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp index fa49f925ad475..e75b3bb658978 100644 --- a/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp +++ b/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp @@ -7,6 +7,7 @@ int main() { testSerialization(); testSerialization(); //testSerialization(); has uninitialized booleans + testSerialization(); testSerialization(); testSerialization>(); testSerialization(); diff --git a/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc b/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc new file mode 100644 index 0000000000000..670dff3696d55 --- /dev/null +++ b/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc @@ -0,0 +1,54 @@ +#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 = new PTrackerAdditionalParametersPerDet; + 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()); + ptitp->setBricked(i->isBricked()); + } + + if (mydbservice->isNewTagRequest("PTrackerAdditionalParametersPerDetRcd")) { + mydbservice->createNewIOV( + ptitp, mydbservice->beginOfTime(), mydbservice->endOfTime(), "PTrackerAdditionalParametersPerDetRcd"); + } else { + edm::LogError("PTrackerAdditionalParametersPerDetDBBuilder") + << "PTrackerAdditionalParametersPerDet and PTrackerAdditionalParametersPerDetRcd Tag already present"; + } +} + +DEFINE_FWK_MODULE(PTrackerAdditionalParametersPerDetDBBuilder); diff --git a/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py index 312b007e15c31..aec94dc15bc42 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py @@ -30,6 +30,7 @@ process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(False)) process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(False)) +process.TrackerAdditionalParametersPerDetWriter = cms.EDAnalyzer("PTrackerAdditionalParametersPerDetDBBuilder") process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder", EcalE = cms.untracked.bool(False), @@ -53,6 +54,7 @@ toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'), tag = cms.string('XMLFILE_Geometry_TagXX_Extended2026D41_mc')), cms.PSet(record = cms.string('IdealGeometryRecord'), tag = cms.string('TKRECO_Geometry_TagXX')), cms.PSet(record = cms.string('PTrackerParametersRcd'), tag = cms.string('TKParameters_Geometry_TagXX')), + cms.PSet(record = cms.string('PTrackerAdditionalParametersPerDetRcd'), tag = cms.string('TKAdditionalParametersPerDet_Geometry_TagXX')), cms.PSet(record = cms.string('PEcalBarrelRcd'), tag = cms.string('EBRECO_Geometry_TagXX')), cms.PSet(record = cms.string('PHcalRcd'), tag = cms.string('HCALRECO_Geometry_TagXX')), cms.PSet(record = cms.string('HcalParametersRcd'), tag = cms.string('HCALParameters_Geometry_TagXX')), @@ -74,4 +76,4 @@ input = cms.untracked.int32(1) ) -process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerParametersWriter+process.CaloGeometryWriter+process.HcalParametersWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter+process.GEMGeometryWriter+process.ME0GeometryWriter) +process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerParametersWriter+process.TrackerAdditionalParametersPerDetWriter+process.CaloGeometryWriter+process.HcalParametersWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter+process.GEMGeometryWriter+process.ME0GeometryWriter) diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index c7962d37f9835..cf3d19a1e2092 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -31,6 +31,7 @@ 'T23' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_v1_mc' ,SiPixelLARecord,connectionString, "", "2020-02-23 14:00:00.000"] ), ), #uH = 0.053/T (TBPX L3,L4), uH=0.0/T (TBPX L1,L2, TEPX+TFPX) 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T25_v0_mc' ,SiPixelLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T26' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T25_v0_mc' ,SiPixelLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) + 'T27' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T25_v0_mc' ,SiPixelLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) } allTags["LAWidth"] = { @@ -40,6 +41,7 @@ 'T23' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T26' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T27' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) } allTags["LAfromAlignment"] = { @@ -49,6 +51,7 @@ 'T23' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) 'T26' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T27' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) } allTags["SimLA"] = { @@ -58,6 +61,7 @@ 'T23' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T19_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2020-02-23 14:00:00.000"] ), ), #uH = 0.053/T (TBPX L3,L4), uH=0.0/T (TBPX L1,L2, TEPX+TFPX) 'T25' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T25_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T26' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T25_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) + 'T27' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T25_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) } allTags["GenError"] = { @@ -90,6 +94,7 @@ 'T23' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T 'T25' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T 'T26' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T27' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } allTags["SimOTLA"] = { @@ -99,6 +104,7 @@ 'T23' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T 'T25' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T 'T26' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T27' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } ''' ## @@ -117,7 +123,7 @@ activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"]#,"SimOTLA","OTLA"] # list of geometries supported -activeDets = ["T15","T21","T22","T23","T25","T26"] +activeDets = ["T15","T21","T22","T23","T25","T26","T27"] phase2GTs = {} for det in activeDets: appendedTags = () diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 30b72ed9467bc..eda01e110afeb 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -51,8 +51,9 @@ Tracker: * T22: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T21. Inner Tracker: Based on (v6.1.5) (T21), but with 50x50 pixel aspect ratio everywhere. * T23: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T21. Inner Tracker: Based on (v6.1.5) (T21), but with 3D sensors in TBPX L1 + TBPX L2 + TFPX R1. * T24: Phase2 tilted tracker. Tracker detector description itself is identical to T21 (OT800 IT615). Change of paradigm, entire description reworked to be compatible with DD4hep library. -* T25: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.2): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1. -* T26: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.3): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1 and 50x50 pixel aspect ratio in TFPX and TEPX. +* T25: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.2): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1. Compatible with DD4hep library. +* T26: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.3): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1 and 50x50 pixel aspect ratio in TFPX and TEPX. Compatible with DD4hep library. +* T27: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v8.0.0): Based on (v7.0.2) (T25), but with bricked pixels in the central rod of TBPX L2 and in the central 3 rods of TBPX L3+4. All pixels in TFPX and TEPX are bricked. Compatible with DD4hep library. Calorimeters: * C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables @@ -109,4 +110,5 @@ Several detector combinations have been generated: * D83 = T24+C16+M9+I13+O7+F6 * D84 = T24+C13+M7+I11+O6+F6 (For HGCAL study on evolution of HGCal replacing D70) * D85 = T24+C14+M9+I14+O7+F6 -* D86 = T24+C17+M10+I14+O8+F6 \ No newline at end of file +* D86 = T24+C17+M10+I14+O8+F6 +* D87 = T27+C14+M9+I13+O7+F6 diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py index baa90c588d4bb..0e921c0acea74 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 df54dc50f4562..469e47feb7236 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 ccba5634ea627..19aac45a7d9e7 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 c6ca65066ff16..6ca4b2f0b6b6c 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 b7ca5eb79df82..8b94a6b3d9f79 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 f4c7ef1005ee3..b9ae26ff64194 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/GeometryDD4hepExtended2026D49Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D49Reco_cff.py index 8724f49d64209..2a407dd9f45a2 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D49Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D49Reco_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/GeometryDD4hepExtended2026D60Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D60Reco_cff.py index 1509a59fa7e52..9beab803c850f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D60Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D60Reco_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/GeometryDD4hepExtended2026D68Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D68Reco_cff.py index 54931462fe6e4..49c7461d921c7 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D68Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D68Reco_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/GeometryDD4hepExtended2026D70Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D70Reco_cff.py index a4e6303452e2d..2b5d540cb37eb 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D70Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D70Reco_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/GeometryDD4hepExtended2026D76Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D76Reco_cff.py index 90a139dd82fd6..57ebeb5391ae1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D76Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D76Reco_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/GeometryDD4hepExtended2026D77Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D77Reco_cff.py index ac04bc34bc21f..3133a4ccb83fd 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D77Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D77Reco_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/GeometryDD4hepExtended2026D78Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D78Reco_cff.py index 4a15652363de3..6ab175121e537 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D78Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D78Reco_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/GeometryDD4hepExtended2026D79Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D79Reco_cff.py index 5746f21245a91..dc300d8aff237 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D79Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D79Reco_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/GeometryDD4hepExtended2026D80Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D80Reco_cff.py index 27a4a56f61932..5444cbb72efe4 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D80Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D80Reco_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/GeometryDD4hepExtended2026D81Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D81Reco_cff.py index 7cb0e40af2cce..315e8655cf47e 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D81Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D81Reco_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/GeometryDD4hepExtended2026D82Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D82Reco_cff.py index a75e1525a9f8b..389461abd3a9d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D82Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D82Reco_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/GeometryDD4hepExtended2026D83Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D83Reco_cff.py index 20938526fdef8..f40fd3529e3ad 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D83Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D83Reco_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/GeometryDD4hepExtended2026D84Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D84Reco_cff.py index 39f8ce3c75ffc..289d5f2f053e3 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D84Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D84Reco_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/GeometryDD4hepExtended2026D85Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D85Reco_cff.py index 3b386ec37e9da..cd1d8c5d01ebe 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D85Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D85Reco_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 30929387d7953..bc2dc4f82c481 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/GeometryDD4hepExtended2026D87Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D87Reco_cff.py new file mode 100644 index 0000000000000..a729fa1ac0655 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D87Reco_cff.py @@ -0,0 +1,60 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generate2026Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryDD4hepExtended2026D87_cff import * + +# 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 * +trackerGeometry.applyAlignment = cms.bool(False) + +# calo +from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * +from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * +CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", + SelectedCalos = cms.vstring("HCAL", + "ZDC", + "EcalBarrel", + "TOWER", + "HGCalEESensitive", + "HGCalHESiliconSensitive", + "HGCalHEScintillatorSensitive" + ) +) +from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * +from Geometry.HcalEventSetup.HcalGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * +from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * +from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * +from Geometry.EcalMapping.EcalMapping_cfi import * +from Geometry.EcalMapping.EcalMappingRecord_cfi import * + +# muon +from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * +from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * +from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * + +# forward +from Geometry.ForwardGeometry.ForwardGeometry_cfi import * + +# timing +from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * +from Geometry.MTDGeometryBuilder.mtdParameters_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * +from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * +from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * +from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * +mtdGeometry.applyAlignment = cms.bool(False) + diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D87_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D87_cff.py new file mode 100644 index 0000000000000..d6d6d81c9ec89 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D87_cff.py @@ -0,0 +1,16 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generate2026Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryDD4hep_cff import * +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml") + +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * +from Geometry.EcalCommonData.ecalSimulationParameters_cff import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * +from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * +from Geometry.MuonNumbering.muonGeometryConstants_cff import * +from Geometry.MuonNumbering.muonOffsetESProducer_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py index c56cb2f2cfd2c..5149abb927c50 100644 --- a/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py @@ -12,6 +12,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/GeometryExtended2016devReco_cff.py b/Configuration/Geometry/python/GeometryExtended2016devReco_cff.py index 46d1757fef861..a6876295d618a 100644 --- a/Configuration/Geometry/python/GeometryExtended2016devReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2016devReco_cff.py @@ -12,6 +12,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 42aaddf71f8aa..50de751ffa961 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Reco_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/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 c53844ea4c3d4..2457ac1b060ba 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 ed15597f8f3b2..83ada461b0a85 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 a7e1f216b0fc1..82b4c2cf5f218 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 3285feb4a19db..52faf9264acfd 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 db2635433a24a..792748585f995 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 b140d3e3843d2..d80bc32f051fb 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/GeometryExtended2026D49Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D49Reco_cff.py index 779d69f9f7c24..0f575c4c7ebff 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D49Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D49Reco_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/GeometryExtended2026D53Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py index e20dcaf402bfb..e6c2ae1928a75 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D53Reco_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/GeometryExtended2026D60Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D60Reco_cff.py index 2010058b0d0a5..216dda0d85d4f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D60Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D60Reco_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/GeometryExtended2026D68Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D68Reco_cff.py index ac74dfda489c9..154ef13f65f3f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D68Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D68Reco_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/GeometryExtended2026D70Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D70Reco_cff.py index ba550135188b7..d54d5e2ede022 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D70Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D70Reco_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/GeometryExtended2026D76Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D76Reco_cff.py index c20edae6c093d..4e5c31cc9267a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D76Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D76Reco_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/GeometryExtended2026D77Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D77Reco_cff.py index b3ca0f86cbe6b..66b5544854dcd 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D77Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D77Reco_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/GeometryExtended2026D78Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D78Reco_cff.py index a3d69d5167bca..6e37ce19b3de0 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D78Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D78Reco_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/GeometryExtended2026D79Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D79Reco_cff.py index feaaab90d27cf..7a5cecd17376a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D79Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D79Reco_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/GeometryExtended2026D80Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D80Reco_cff.py index b89c9fcec4087..ee2c5eac769d8 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D80Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D80Reco_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/GeometryExtended2026D81Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D81Reco_cff.py index 177ee4000d5cc..13037aaef6459 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D81Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D81Reco_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/GeometryExtended2026D82Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D82Reco_cff.py index 3d2e43b66af90..e6f05b4b9430c 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D82Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D82Reco_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/GeometryExtended2026D83Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D83Reco_cff.py index 077457796a218..c5a456239d960 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D83Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D83Reco_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/GeometryExtended2026D84Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D84Reco_cff.py index cd929ff734969..ac3abcad970f2 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D84Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D84Reco_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/GeometryExtended2026D85Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D85Reco_cff.py index fac137417c8bd..cd08ae51d1888 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D85Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D85Reco_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 eade1af12d435..1b3724c0b4d73 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/GeometryExtended2026D87Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D87Reco_cff.py new file mode 100644 index 0000000000000..7825217b9b3de --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2026D87Reco_cff.py @@ -0,0 +1,60 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generate2026Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryExtended2026D87_cff import * + +# 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 * +trackerGeometry.applyAlignment = cms.bool(False) + +# calo +from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * +from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * +CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", + SelectedCalos = cms.vstring("HCAL", + "ZDC", + "EcalBarrel", + "TOWER", + "HGCalEESensitive", + "HGCalHESiliconSensitive", + "HGCalHEScintillatorSensitive" + ) +) +from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * +from Geometry.HcalEventSetup.HcalGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * +from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * +from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * +from Geometry.EcalMapping.EcalMapping_cfi import * +from Geometry.EcalMapping.EcalMappingRecord_cfi import * + +# muon +from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * +from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * +from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * + +# forward +from Geometry.ForwardGeometry.ForwardGeometry_cfi import * + +# timing +from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * +from Geometry.MTDGeometryBuilder.mtdParameters_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * +from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * +from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * +from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * +mtdGeometry.applyAlignment = cms.bool(False) + diff --git a/Configuration/Geometry/python/GeometryExtended2026D87_cff.py b/Configuration/Geometry/python/GeometryExtended2026D87_cff.py new file mode 100644 index 0000000000000..ab9ecb70ccc18 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2026D87_cff.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generate2026Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Geometry.CMSCommonData.cmsExtendedGeometry2026D87XML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * +from Geometry.EcalCommonData.ecalSimulationParameters_cff import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * +from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * +from Geometry.MuonNumbering.muonGeometryConstants_cff import * +from Geometry.MuonNumbering.muonOffsetESProducer_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_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 155b4c0e4015a..46936c6ef792a 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -346,6 +346,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 *', @@ -548,6 +549,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 *', @@ -751,6 +753,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 *', @@ -954,6 +957,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 *', @@ -1158,6 +1162,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 *', @@ -1362,6 +1367,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 *', @@ -1566,6 +1572,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 *', @@ -1770,6 +1777,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 c95570b7846cd..d450ab5c3b596 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -173,6 +173,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 *', @@ -208,6 +209,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 *', @@ -243,6 +245,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 *', @@ -277,6 +280,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 *', @@ -312,6 +316,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 *', @@ -346,6 +351,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 *', @@ -380,12 +386,48 @@ "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 *', 'trackerGeometry.applyAlignment = cms.bool(False)', ], "era" : "phase2_tracker, phase2_squarePixels, trackingPhase2PU140", + }, + "T27" : { + 1 : [ + 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixel.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixelStructureTopology.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml', + 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + ], + "sim" : [ + 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', + ], + "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 *', + 'trackerGeometry.applyAlignment = cms.bool(False)', + ], + "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", } } @@ -1518,6 +1560,7 @@ ("O6","T24","C13","M7","F6","I11") : "D84", ("O7","T24","C14","M9","F6","I14") : "D85", ("O8","T24","C17","M10","F6","I14") : "D86", + ("O7","T27","C14","M9","F6","I13") : "D87", } deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75"]) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index d9700ed127c13..7a06ac66c7ce7 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -36,6 +36,7 @@ numWFIB.extend([37834.0]) #2026D84 numWFIB.extend([38234.0]) #2026D85 numWFIB.extend([38634.0]) #2026D86 +numWFIB.extend([39034.0]) #2026D87 for numWF in numWFIB: workflows[numWF] = _upgrade_workflows[numWF] diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d883afcf94f94..a77ed03c611c7 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -57,6 +57,8 @@ '2026D85PU', '2026D86', '2026D86PU', + '2026D87', + '2026D87PU', ] # pre-generation of WF numbers @@ -1260,6 +1262,13 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Era' : 'Phase2C11I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'], }, + '2026D87' : { + 'Geom' : 'Extended2026D87', # N.B.: Geometry with 3D pixels in the Inner Tracker L1. + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T27', + 'Era' : 'Phase2C11I13T25M9', # customized for 3D pixels and Muon M9 + 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger'], + }, } # standard PU sequences diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index 6cb457c3629f6..ac1f6fb5df72c 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -65,4 +65,5 @@ 'Extended2026D84' : 'Extended2026D84,Extended2026D84Reco', 'Extended2026D85' : 'Extended2026D85,Extended2026D85Reco', 'Extended2026D86' : 'Extended2026D86,Extended2026D86Reco', + 'Extended2026D87' : 'Extended2026D87,Extended2026D87Reco', } diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml new file mode 100644 index 0000000000000..861e7276ec8b1 --- /dev/null +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py new file mode 100644 index 0000000000000..8603d3dae5d0f --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py @@ -0,0 +1,129 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generate2026Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring( + 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', + 'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml', + 'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml', + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + 'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml', + 'Geometry/CMSCommonData/data/cmsCalo.xml', + 'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml', + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml', + 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', + 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixel.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixelStructureTopology.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml', + 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', + 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', + 'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml', + 'Geometry/EcalCommonData/data/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v14/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v14/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v14/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v14/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v14/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v13/hgcalConsData.xml', + 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', + 'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml', + 'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml', + 'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml', + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml', + 'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml', + 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', + 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml', + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', + 'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml', + 'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml', + 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml', + 'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml', + 'Geometry/ForwardCommonData/data/zdcmaterials.xml', + 'Geometry/ForwardCommonData/data/lumimaterials.xml', + 'Geometry/ForwardCommonData/data/zdcrotations.xml', + 'Geometry/ForwardCommonData/data/lumirotations.xml', + 'Geometry/ForwardCommonData/data/zdc.xml', + 'Geometry/ForwardCommonData/data/zdclumi.xml', + 'Geometry/ForwardCommonData/data/cmszdc.xml', + 'Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml', + 'Geometry/MTDCommonData/data/btl/v1/btl.xml', + 'Geometry/MTDCommonData/data/etl/v5/etl.xml', + 'Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml', + 'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml', + )+ + cms.vstring( + 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', + 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', + 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml', + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + 'Geometry/MTDSimData/data/v2/mtdsens.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/MTDSimData/data/v2/mtdProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml', + ), + rootNodeName = cms.string('cms:OCMS') +) diff --git a/Geometry/CommonTopologies/interface/PixelTopology.h b/Geometry/CommonTopologies/interface/PixelTopology.h index 05da3de01a1f7..b990dbd104f97 100644 --- a/Geometry/CommonTopologies/interface/PixelTopology.h +++ b/Geometry/CommonTopologies/interface/PixelTopology.h @@ -33,6 +33,7 @@ class PixelTopology : public Topology { virtual int rocsX() const = 0; virtual int rowsperroc() const = 0; virtual int colsperroc() const = 0; + virtual bool isBricked() const = 0; virtual float localX(float mpX) const = 0; virtual float localY(float mpY) const = 0; diff --git a/Geometry/CommonTopologies/interface/ProxyPixelTopology.h b/Geometry/CommonTopologies/interface/ProxyPixelTopology.h index 4d86cfe6f5fd9..bdb6162f12976 100644 --- a/Geometry/CommonTopologies/interface/ProxyPixelTopology.h +++ b/Geometry/CommonTopologies/interface/ProxyPixelTopology.h @@ -61,6 +61,7 @@ class ProxyPixelTopology final : public PixelTopology { int rocsX() const override { return specificTopology().rocsX(); } int rowsperroc() const override { return specificTopology().rowsperroc(); } int colsperroc() const override { return specificTopology().colsperroc(); } + bool isBricked() const override { return specificTopology().isBricked(); } float localX(const float mpX) const override; float localX(const float mpX, const Topology::LocalTrackPred &trkPred) const override; float localY(const float mpY) const override; diff --git a/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h b/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h index 348fd12ae13e1..150ffa846e3ff 100644 --- a/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h +++ b/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h @@ -65,6 +65,7 @@ class ProxyMTDTopology final : public PixelTopology { float localX(const float mpX, const Topology::LocalTrackPred &trkPred) const override; float localY(const float mpY) const override; float localY(const float mpY, const Topology::LocalTrackPred &trkPred) const override; + bool isBricked() const override { return false; } bool isItBigPixelInX(const int ixbin) const override { return specificTopology().isItBigPixelInX(ixbin); } bool isItBigPixelInY(const int iybin) const override { return specificTopology().isItBigPixelInY(iybin); } diff --git a/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h b/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h index dbba18a8e6aaf..1b4667c887619 100644 --- a/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h +++ b/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h @@ -170,6 +170,7 @@ class RectangularMTDTopology final : public PixelTopology { float gapyInterpadFrac() const { return m_GAPyInterpadFrac; } float gapxBorderFrac() const { return m_GAPxBorderFrac; } float gapyBorderFrac() const { return m_GAPyBorderFrac; } + bool isBricked() const override { return false; } private: float m_pitchx; diff --git a/Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h b/Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h new file mode 100644 index 0000000000000..7dc8057e136e0 --- /dev/null +++ b/Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h @@ -0,0 +1,12 @@ +#ifndef PTrackerAdditionalParametersPerDetRcd_H +#define PTrackerAdditionalParametersPerDetRcd_H + +#include "FWCore/Framework/interface/EventSetupRecordImplementation.h" +#include "FWCore/Framework/interface/DependentRecordImplementation.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "FWCore/Utilities/interface/mplVector.h" + +class PTrackerAdditionalParametersPerDetRcd + : public edm::eventsetup::DependentRecordImplementation> {}; +#endif diff --git a/Geometry/Records/interface/TrackerDigiGeometryRecord.h b/Geometry/Records/interface/TrackerDigiGeometryRecord.h index 4c4637d76ded2..cd1ff4c97d4f1 100644 --- a/Geometry/Records/interface/TrackerDigiGeometryRecord.h +++ b/Geometry/Records/interface/TrackerDigiGeometryRecord.h @@ -10,6 +10,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 "FWCore/Utilities/interface/mplVector.h" class TrackerDigiGeometryRecord @@ -20,6 +21,8 @@ class TrackerDigiGeometryRecord TrackerSurfaceDeformationRcd, GlobalPositionRcd, TrackerTopologyRcd, - PTrackerParametersRcd> > {}; + PTrackerParametersRcd, + PTrackerAdditionalParametersPerDetRcd> > { +}; #endif /* RECORDS_TRACKERDIGIGEOMETRYRECORD_H */ diff --git a/Geometry/Records/src/PTrackerAdditionalParametersPerDetRcd.cc b/Geometry/Records/src/PTrackerAdditionalParametersPerDetRcd.cc new file mode 100644 index 0000000000000..a91a9c818730f --- /dev/null +++ b/Geometry/Records/src/PTrackerAdditionalParametersPerDetRcd.cc @@ -0,0 +1,4 @@ +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" +#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" + +EVENTSETUP_RECORD_REG(PTrackerAdditionalParametersPerDetRcd); diff --git a/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixel.xml b/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixel.xml new file mode 100644 index 0000000000000..a61c94e0291f2 --- /dev/null +++ b/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixel.xml @@ -0,0 +1,13759 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + 0*mm, 0*mm, 0*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 2.75*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, -4*mm + + + + + + + + + + + + + + 0*mm, 0*mm, 4*mm + + + + + + diff --git a/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixelStructureTopology.xml b/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixelStructureTopology.xml new file mode 100644 index 0000000000000..113abf2877428 --- /dev/null +++ b/Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT800_2021_06/pixelStructureTopology.xml @@ -0,0 +1,749 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h b/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h index 0b8b5dcbc191c..957dc41f44bd0 100644 --- a/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h +++ b/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h @@ -15,6 +15,7 @@ class PixelTopologyBuilder { PixelTopology* build(const Bounds* bounds, bool upgradeGeometry, + bool isBricked, int ROWS_PER_ROC, // Num of Rows per ROC int COLS_PER_ROC, // Num of Cols per ROC int BIG_PIX_PER_ROC_X, // in x direction, rows. BIG_PIX_PER_ROC_X = 0 for SLHC diff --git a/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h b/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h index 82f5fc9473bbf..d11b649a93b98 100644 --- a/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h +++ b/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h @@ -44,6 +44,7 @@ class RectangularPixelTopology final : public PixelTopology { float pitchx, float pitchy, bool upgradeGeometry, + bool isBricked, int ROWS_PER_ROC, // Num of Rows per ROC int COLS_PER_ROC, // Num of Cols per ROC int BIG_PIX_PER_ROC_X, // in x direction, rows. BIG_PIX_PER_ROC_X = 0 for SLHC @@ -58,7 +59,8 @@ class RectangularPixelTopology final : public PixelTopology { m_COLS_PER_ROC(COLS_PER_ROC), // Num of Cols per ROC m_ROCS_X(ROCS_X), // 2 for SLHC m_ROCS_Y(ROCS_Y), // 8 for SLHC - m_upgradeGeometry(upgradeGeometry) { + m_upgradeGeometry(upgradeGeometry), + m_isBricked(isBricked) { // Calculate the edge of the active sensor with respect to the center, // that is simply the half-size. // Take into account large pixels @@ -71,7 +73,7 @@ class RectangularPixelTopology final : public PixelTopology { << ", BIG_PIX_PER_ROC_Y " << BIG_PIX_PER_ROC_Y << ", ROWS_PER_ROC " << ROWS_PER_ROC << ", COLS_PER_ROC " << COLS_PER_ROC << ", ROCS_X " << ROCS_X << ", ROCS_Y " << ROCS_Y << "\nNROWS " << m_ROWS_PER_ROC * m_ROCS_X - << ", NCOL " << m_COLS_PER_ROC * m_ROCS_Y; + << ", NCOL " << m_COLS_PER_ROC * m_ROCS_Y << ", isBricked " << m_isBricked; } // Topology interface, go from Masurement to Local corrdinates @@ -163,6 +165,7 @@ class RectangularPixelTopology final : public PixelTopology { int colsperroc() const override { return m_COLS_PER_ROC; } float xoffset() const { return m_xoffset; } float yoffset() const { return m_yoffset; } + bool isBricked() const override { return m_isBricked; } private: float m_pitchx; @@ -176,6 +179,7 @@ class RectangularPixelTopology final : public PixelTopology { int m_ROCS_X; int m_ROCS_Y; bool m_upgradeGeometry; + bool m_isBricked; }; #endif 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..de60a6c713019 --- /dev/null +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc @@ -0,0 +1,66 @@ +#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()); + ptitp->setBricked(i->isBricked()); + } + + 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/PixelTopologyBuilder.cc b/Geometry/TrackerGeometryBuilder/src/PixelTopologyBuilder.cc index 78ca799c7ef77..8767e1b67a874 100644 --- a/Geometry/TrackerGeometryBuilder/src/PixelTopologyBuilder.cc +++ b/Geometry/TrackerGeometryBuilder/src/PixelTopologyBuilder.cc @@ -8,6 +8,7 @@ PixelTopologyBuilder::PixelTopologyBuilder(void) {} PixelTopology* PixelTopologyBuilder::build( const Bounds* bs, bool upgradeGeometry, + bool isBricked, int pixelROCRows, // Num of Rows per ROC int pixelROCCols, // Num of Cols per ROC int BIG_PIX_PER_ROC_X, // in x direction, rows. BIG_PIX_PER_ROC_X = 0 for SLHC @@ -32,6 +33,7 @@ PixelTopology* PixelTopologyBuilder::build( pitchX, pitchY, upgradeGeometry, + isBricked, pixelROCRows, // (int)rocRow pixelROCCols, // (int)rocCol BIG_PIX_PER_ROC_X, diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index f995eeb14ad41..9356b38014aa2 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -11,6 +11,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" @@ -41,6 +42,7 @@ namespace { } // namespace TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* gd, + const PTrackerAdditionalParametersPerDet* ptitpx, const PTrackerParameters& ptp, const TrackerTopology* tTopo) { if (ptp.vpars.size() != 6) { @@ -100,26 +102,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) { @@ -151,6 +173,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, @@ -165,12 +188,22 @@ void TrackerGeomBuilderFromGeometricDet::buildPixel( tracker->setOffsetDU(GeomDetEnumerators::subDetGeom[det]); + std::map brickedness_map; + + std::vector brickedParams = ptitp->getAllBricked(); + std::vector geographicalIdParams = ptitp->getAllGeographicalIds(); + + for (unsigned int i = 0; i < geographicalIdParams.size(); i++) { + brickedness_map[geographicalIdParams.at(i)] = brickedParams.at(i); + } + for (auto const& i : gdv) { std::string const& detName = i->name(); if (thePixelDetTypeMap.find(detName) == thePixelDetTypeMap.end()) { std::unique_ptr bounds(i->bounds()); PixelTopology* t = PixelTopologyBuilder().build(bounds.get(), upgradeGeometry, + brickedness_map[i->geographicalId()], (int)i->pixROCRows(), (int)i->pixROCCols(), BIG_PIX_PER_ROC_X, diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc index b3fe3c3760ed0..88251f7f901c4 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc @@ -104,7 +104,8 @@ void TrackerDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::E if (dynamic_cast((it)) != nullptr) { const PixelTopology& p = (dynamic_cast((it)))->specificTopology(); PRINT("TrackerDigiGeometryAnalyzer") << " PIXEL Det " // << it->geographicalId() - << " Rows " << p.nrows() << " Columns " << p.ncolumns() << '\n'; + << " isBricked " << p.isBricked() << " Rows " << p.nrows() + << " Columns " << p.ncolumns() << '\n'; } else { const StripTopology& p = (dynamic_cast((it)))->specificTopology(); PRINT("TrackerDigiGeometryAnalyzer") << " STRIP Det " // << it->geographicalId() diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py index 5547cc51b3073..d4265a9b5d25b 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py @@ -8,7 +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/TrackerNumberingBuilder/interface/GeometricDet.h b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h index 3ab96a5251a03..4bfa6158506a1 100644 --- a/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h +++ b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h @@ -128,6 +128,7 @@ class GeometricDet { // SENSOR INFO // Only return meaningful results for pixels. + bool isBricked() const { return isBricked_; } double pixROCRows() const { return pixROCRows_; } double pixROCCols() const { return pixROCCols_; } double pixROCx() const { return pixROCx_; } @@ -183,6 +184,7 @@ class GeometricDet { double radLength_ = 0.; double xi_ = 0.; + bool isBricked_ = false; double pixROCRows_ = 0.; double pixROCCols_ = 0.; double pixROCx_ = 0.; diff --git a/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc b/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc index 5d6fd88573eb8..78f3043879967 100644 --- a/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc +++ b/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc @@ -87,6 +87,7 @@ GeometricDet::GeometricDet(DDFilteredView* fv, GeometricEnumType type) if (type_ == DetUnit) { radLength_ = getDouble("TrackerRadLength", *fv); xi_ = getDouble("TrackerXi", *fv); + isBricked_ = (getString("isBricked", *fv) == strue); pixROCRows_ = getDouble("PixelROCRows", *fv); pixROCCols_ = getDouble("PixelROCCols", *fv); pixROCx_ = getDouble("PixelROC_X", *fv); @@ -115,6 +116,7 @@ GeometricDet::GeometricDet(cms::DDFilteredView* fv, GeometricEnumType type) // Only look for sensor-related info on sensor volumes! if (type_ == DetUnit) { // IT sensors only (NB: hence could add a branch here, but not a critical part on perf) + isBricked_ = (fv->get("isBricked") == strue); pixROCRows_ = fv->get("PixelROCRows"); pixROCCols_ = fv->get("PixelROCCols"); pixROCx_ = fv->get("PixelROC_X"); diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 104df35b34944..918d903c0be12 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -129,6 +129,10 @@ def customiseFor2018Input(process): return process +def customiseFor34120(process): + """Ensure TrackerAdditionalParametersPerDetRcd ESProducer is run""" + process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") + return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -136,4 +140,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) + if menuType in ["GRun","HIon","PIon","PRef"]: + process = customiseFor34120(process) + return process