From b1502b79cc8a65cf9c515a8994b8a32d07b765c5 Mon Sep 17 00:00:00 2001 From: Tamas Date: Fri, 6 Jan 2023 22:51:39 +0100 Subject: [PATCH] Remove Phase-2 IT bricked design from digitizer and local reco --- .../plugins/AlignmentMonitorAsAnalyzer.cc | 6 +- .../interface/AlignmentProducerBase.h | 3 - .../src/AlignmentProducerBase.cc | 4 +- .../LaserAlignment/plugins/LaserAlignment.cc | 4 +- .../LaserAlignment/plugins/LaserAlignment.h | 1 - .../plugins/MillePedeDQMModule.cc | 4 +- .../plugins/MillePedeDQMModule.h | 2 - .../plugins/TrackerGeometryCompare.cc | 6 +- .../plugins/TrackerGeometryCompare.h | 1 - .../plugins/TrackerGeometryIntoNtuples.cc | 7 +- .../plugins/CreateSurveyRcds.cc | 4 +- .../SurveyAnalysis/plugins/CreateSurveyRcds.h | 4 - .../plugins/SurveyInputTrackerFromDB.cc | 4 +- .../plugins/SurveyInputTrackerFromDB.h | 1 - .../plugins/SurveyMisalignmentInput.cc | 4 +- .../plugins/SurveyMisalignmentInput.h | 1 - .../plugins/CreateTrackerAlignmentRcds.cc | 7 +- .../plugins/MCMisalignmentScaler.cc | 7 +- .../plugins/MisalignedTrackerESProducer.cc | 5 +- .../plugins/TrackerSystematicMisalignments.cc | 5 +- .../plugins/TrackerTreeGenerator.cc | 6 +- .../test/TrackerGeometryAnalyzer.cc | 6 +- .../test/TrackerGeometryAnalyzer.h | 2 - .../PTrackerAdditionalParametersPerDet.h | 5 +- .../src/PTrackerAdditionalParametersPerDet.cc | 11 - .../SiPixelTransient/interface/SiPixelUtils.h | 28 +-- .../SiPixelTransient/src/SiPixelUtils.cc | 73 +----- ...ckerAdditionalParametersPerDetDBBuilder.cc | 53 ---- ...eometryDD4hepExtended2017DD4hepReco_cff.py | 1 - ...eometryDD4hepExtended2018DD4hepReco_cff.py | 1 - ...pExtended2021FlatMinus05PercentReco_cff.py | 1 - ...pExtended2021FlatMinus10PercentReco_cff.py | 1 - ...epExtended2021FlatPlus05PercentReco_cff.py | 1 - ...epExtended2021FlatPlus10PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2021Reco_cff.py | 1 - ...yDD4hepExtended2021ZeroMaterialReco_cff.py | 1 - .../GeometryDD4hepExtended2026D86Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D88Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D91Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D92Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D93Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D94Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D95Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D96Reco_cff.py | 1 - .../GeometryDD4hepExtended2026D97Reco_cff.py | 1 - .../python/GeometryExtended2016Reco_cff.py | 1 - .../python/GeometryExtended2016devReco_cff.py | 1 - .../python/GeometryExtended2017DDDReco_cff.py | 1 - .../GeometryExtended2017Plan0Reco_cff.py | 1 - ...nded2017Plan1FlatMinus05PercentReco_cff.py | 1 - ...nded2017Plan1FlatMinus10PercentReco_cff.py | 1 - ...ended2017Plan1FlatPlus05PercentReco_cff.py | 1 - ...ended2017Plan1FlatPlus10PercentReco_cff.py | 1 - .../GeometryExtended2017Plan1Reco_cff.py | 1 - ...ryExtended2017Plan1ZeroMaterialReco_cff.py | 1 - .../python/GeometryExtended2017Reco_cff.py | 1 - .../python/GeometryExtended2018DDDReco_cff.py | 1 - ...yExtended2018FlatMinus05PercentReco_cff.py | 1 - ...yExtended2018FlatMinus10PercentReco_cff.py | 1 - ...ryExtended2018FlatPlus05PercentReco_cff.py | 1 - ...ryExtended2018FlatPlus10PercentReco_cff.py | 1 - .../GeometryExtended2018Plan36Reco_cff.py | 1 - .../python/GeometryExtended2018Reco_cff.py | 1 - ...eometryExtended2018ZeroMaterialReco_cff.py | 1 - ...yExtended2021FlatMinus05PercentReco_cff.py | 1 - ...yExtended2021FlatMinus10PercentReco_cff.py | 1 - ...ryExtended2021FlatPlus05PercentReco_cff.py | 1 - ...ryExtended2021FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryExtended2021Reco_cff.py | 1 - ...eometryExtended2021ZeroMaterialReco_cff.py | 1 - .../python/GeometryExtended2026D86Reco_cff.py | 1 - .../python/GeometryExtended2026D88Reco_cff.py | 1 - .../python/GeometryExtended2026D91Reco_cff.py | 1 - .../python/GeometryExtended2026D92Reco_cff.py | 1 - .../python/GeometryExtended2026D93Reco_cff.py | 1 - .../python/GeometryExtended2026D94Reco_cff.py | 1 - .../python/GeometryExtended2026D95Reco_cff.py | 1 - .../python/GeometryExtended2026D96Reco_cff.py | 1 - .../python/GeometryExtended2026D97Reco_cff.py | 1 - .../Geometry/python/GeometryExtended_cff.py | 2 - .../Geometry/python/GeometryIdealAPD1_cff.py | 1 - .../Geometry/python/GeometryIdealNoAPD_cff.py | 1 - .../Geometry/python/GeometryNoCastor_cff.py | 1 - .../Geometry/python/GeometryRecoDB_cff.py | 2 - .../python/GeometryRecoTracker_cff.py | 2 - .../Geometry/python/GeometryReco_cff.py | 2 - .../Geometry/python/GeometrySLHCRecoDB_cff.py | 1 - .../Geometry/python/GeometrySLHCReco_cff.py | 1 - .../Geometry/python/dict2021Geometry.py | 6 - .../Geometry/python/dict2026Geometry.py | 7 - .../interface/PixelTopology.h | 1 - .../interface/ProxyPixelTopology.h | 1 - .../interface/ProxyMTDTopology.h | 1 - .../interface/RectangularMTDTopology.h | 1 - .../interface/PixelTopologyBuilder.h | 1 - .../interface/RectangularPixelTopology.h | 8 +- .../TrackerGeomBuilderFromGeometricDet.h | 7 +- ...ackerAdditionalParametersPerDetESModule.cc | 66 ----- .../plugins/TrackerDigiGeometryESModule.cc | 10 +- .../src/PixelTopologyBuilder.cc | 2 - .../src/TrackerGeomBuilderFromGeometricDet.cc | 55 +---- .../test/TrackerDigiGeometryAnalyzer.cc | 3 +- .../test/python/testTrackerMap_cfg.py | 1 - .../python/testTrackerModuleInfoDD4hep_cfg.py | 2 - .../python/testTrackerModuleInfoDDD_cfg.py | 2 - .../interface/GeometricDet.h | 2 - .../src/GeometricDet.cc | 2 - .../python/customizeHLTforCMSSW.py | 6 + .../SiPixelRecHits/src/PixelCPEGeneric.cc | 4 +- .../plugins/Phase2TrackerDigitizer.cc | 21 +- .../plugins/Phase2TrackerDigitizer.h | 2 +- .../plugins/PixelBrickedDigitizerAlgorithm.cc | 230 ------------------ .../plugins/PixelBrickedDigitizerAlgorithm.h | 28 --- .../python/phase2TrackerDigitizer_cfi.py | 2 - 114 files changed, 52 insertions(+), 747 deletions(-) delete mode 100644 CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc delete mode 100644 Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc delete mode 100644 SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.cc delete mode 100644 SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc index c134984abf9f4..3329bf0472341 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc @@ -44,7 +44,6 @@ #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" @@ -89,7 +88,6 @@ 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_; @@ -123,7 +121,6 @@ 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"))), @@ -160,9 +157,8 @@ 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, ptitp, ptp, tTopo)); + std::shared_ptr theTracker(trackerBuilder.build(geom, 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 c3f8ec1660df5..4caf4d27dbd6d 100644 --- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h +++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h @@ -44,7 +44,6 @@ #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" @@ -60,7 +59,6 @@ #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" @@ -256,7 +254,6 @@ 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 6ad94af7fe247..1e42ce6e8fa8a 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc @@ -51,7 +51,6 @@ 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"))), @@ -432,9 +431,8 @@ 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, ptitp, *ptp, tTopo)); + trackerGeometry_ = std::shared_ptr(trackerBuilder.build(geometricDet, *ptp, tTopo)); } if (doMuon_) { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.cc b/Alignment/LaserAlignment/plugins/LaserAlignment.cc index 3dbb91c404054..25440bb839e49 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.cc @@ -23,7 +23,6 @@ LaserAlignment::LaserAlignment(edm::ParameterSet const& theConf) geomToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), gprToken_(esConsumes()), stripPedestalsToken_(esConsumes()), theEvents(0), @@ -301,10 +300,9 @@ 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, &*ptitp, *ptp, tTopo); + TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo); theAlignableTracker = new AlignableTracker(&(*theRefTracker), tTopo); } else { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.h b/Alignment/LaserAlignment/plugins/LaserAlignment.h index 8622cf61aaaf3..6449f68d11c4e 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.h +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.h @@ -132,7 +132,6 @@ 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 ac8ce9c2cbdc2..430d0ed7aa016 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc @@ -29,7 +29,6 @@ MillePedeDQMModule ::MillePedeDQMModule(const edm::ParameterSet& config) : tTopoToken_(esConsumes()), gDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), aliThrToken_(esConsumes()), geomToken_(esConsumes()), mpReaderConfig_(config.getParameter("MillePedeFileReader")), @@ -167,7 +166,6 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); const GeometricDet* geometricDet = &setup.getData(gDetToken_); const PTrackerParameters* ptp = &setup.getData(ptpToken_); - const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); const TrackerGeometry* geom = &setup.getData(geomToken_); pixelTopologyMap_ = std::make_shared(geom, tTopo); @@ -181,7 +179,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup TrackerGeomBuilderFromGeometricDet builder; - const auto trackerGeometry = builder.build(geometricDet, ptitp, *ptp, tTopo); + const auto trackerGeometry = builder.build(geometricDet, *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 a9711aafedfe7..c65cedb457496 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h @@ -41,7 +41,6 @@ /*** Records for ESWatcher ***/ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" -#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" @@ -98,7 +97,6 @@ class MillePedeDQMModule : public DQMEDHarvester { const edm::ESGetToken tTopoToken_; const edm::ESGetToken gDetToken_; const edm::ESGetToken ptpToken_; - const edm::ESGetToken ptitpToken_; const edm::ESGetToken aliThrToken_; const edm::ESGetToken geomToken_; diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index 7b6e8fa932e4c..838118769bd49 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -58,7 +58,6 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg) topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), pixQualityToken_(esConsumes()), stripQualityToken_(esConsumes()), referenceTracker(nullptr), @@ -370,11 +369,10 @@ 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, ptitp, *ptp, tTopo); + TrackerGeometry* theRefTracker = trackerBuilder.build(theGeometricDet, *ptp, tTopo); if (inputFilename1_ != "IDEAL") { GeometryAligner aligner1; aligner1.applyAlignments( @@ -414,7 +412,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) { } //currernt tracker - TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, ptitp, *ptp, tTopo); + TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo); if (inputFilename2_ != "IDEAL") { GeometryAligner aligner2; aligner2.applyAlignments( diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h index 335114fef210f..c10c9fa33e16b 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -89,7 +89,6 @@ 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 c1d57d3ef07c3..81ea9b5d01044 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc @@ -47,9 +47,7 @@ #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" -#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" -#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -87,7 +85,6 @@ 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_; @@ -135,7 +132,6 @@ TrackerGeometryIntoNtuples::TrackerGeometryIntoNtuples(const edm::ParameterSet& : topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), surfDefToken_(esConsumes()), @@ -188,11 +184,10 @@ 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, ptitp, *ptp, tTopo); + TrackerGeometry* theCurTracker = trackerBuilder.build(theGeometricDet, *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 c46ff1a6fc27f..118f385299ed5 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -19,7 +19,6 @@ CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), aliToken_(esConsumes()), aliErrToken_(esConsumes()) { m_inputGeom = cfg.getUntrackedParameter("inputGeom"); @@ -33,8 +32,7 @@ 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_); - const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, 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 dcbe70b4d3d5e..0aeebe27e3733 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h @@ -20,9 +20,6 @@ #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" @@ -56,7 +53,6 @@ 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 e2cedc6c098aa..87b2ad3ceacfa 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc @@ -24,7 +24,6 @@ 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) { @@ -41,8 +40,7 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& const GeometricDet* geom = &setup.getData(geomDetToken_); const PTrackerParameters& ptp = setup.getData(ptpToken_); - const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); addComponent(new AlignableTracker(tracker, tTopo)); addSurveyInfo(detector()); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h index 6fb8dd062c8f9..4abce6d12599b 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h @@ -30,7 +30,6 @@ 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 54426f512a519..eca8adc7550ef 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc @@ -21,7 +21,6 @@ SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), aliToken_(esConsumes()), textFileName(cfg.getParameter("textFileName")) {} @@ -31,8 +30,7 @@ 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_); - const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_); - TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); addComponent(new AlignableTracker(tracker, tTopo)); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h index 1385a61a883c4..566fe3a49b60f 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h @@ -29,7 +29,6 @@ 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 62375d44c1ac2..03410e104cb73 100644 --- a/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc +++ b/Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc @@ -51,7 +51,6 @@ #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" @@ -60,7 +59,6 @@ #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" @@ -90,7 +88,6 @@ 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_; @@ -112,7 +109,6 @@ class CreateIdealTkAlRecords : public edm::one::EDAnalyzer<> { CreateIdealTkAlRecords::CreateIdealTkAlRecords(const edm::ParameterSet& iConfig) : geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), @@ -255,12 +251,11 @@ 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, ptitp, ptp, tTopo)}; + return std::unique_ptr{trackerBuilder.build(geometricDet, ptp, tTopo)}; } void CreateIdealTkAlRecords::addAlignmentInfo(const GeomDet& det) { diff --git a/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc b/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc index d5565b8366cd2..a259a2e59ff82 100644 --- a/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc +++ b/Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc @@ -42,7 +42,6 @@ #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" @@ -53,7 +52,6 @@ #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 @@ -71,7 +69,6 @@ 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 >; @@ -94,7 +91,6 @@ MCMisalignmentScaler::MCMisalignmentScaler(const edm::ParameterSet& iConfig) stripQualityToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), scalers_{decodeSubDetectors(iConfig.getParameter("scalers"))}, @@ -118,11 +114,10 @@ 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, ptitp, ptp, topology)}; + auto tracker = std::unique_ptr{trackerBuilder.build(geometricDet, 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 2831c514fc19f..ee3c1089387c9 100644 --- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc +++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc @@ -48,7 +48,6 @@ 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 @@ -72,7 +71,6 @@ MisalignedTrackerESProducer::MisalignedTrackerESProducer(const edm::ParameterSet auto cc = setWhatProduced(this); geomDetToken_ = cc.consumes(); ptpToken_ = cc.consumes(); - ptitpToken_ = cc.consumes(); topoToken_ = cc.consumes(); } @@ -89,10 +87,9 @@ 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, ptitp, ptp, tTopo)); + std::unique_ptr theTracker(trackerBuilder.build(gD, 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 e3fb15766730f..c8a0e7b6425a4 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -60,7 +60,6 @@ class TrackerSystematicMisalignments : public edm::one::EDAnalyzer<> { const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; - const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const edm::ESGetToken aliToken_; const edm::ESGetToken aliErrorToken_; @@ -100,7 +99,6 @@ class TrackerSystematicMisalignments : public edm::one::EDAnalyzer<> { TrackerSystematicMisalignments::TrackerSystematicMisalignments(const edm::ParameterSet& cfg) : geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptitpToken_(esConsumes()), topoToken_(esConsumes()), aliToken_(esConsumes()), aliErrorToken_(esConsumes()), @@ -173,10 +171,9 @@ 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, ptitp, ptp, tTopo); + TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo); //take geometry from DB or randomly generate geometry if (m_fromDBGeom) { diff --git a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc index c8ccbe4113513..b95820102cf7f 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc @@ -48,7 +48,6 @@ #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" @@ -75,7 +74,6 @@ class TrackerTreeGenerator : public edm::one::EDAnalyzer geomDetToken_; const edm::ESGetToken ptpToken_; - const edm::ESGetToken ptitpToken_; const edm::ESGetToken topoToken_; const bool createEntryForDoubleSidedModule_; @@ -97,7 +95,6 @@ class TrackerTreeGenerator : public edm::one::EDAnalyzer("createEntryForDoubleSidedModule")), config_(config) { @@ -113,11 +110,10 @@ 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, ptitp, ptp, tTopo); + const TrackerGeometry* tkGeom = trackerBuilder.build(geometricDet, 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 d8077454e3e78..a041d661579f0 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc @@ -6,7 +6,6 @@ // 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" @@ -29,7 +28,6 @@ TrackerGeometryAnalyzer ::TrackerGeometryAnalyzer(const edm::ParameterSet& confi : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), - ptapToken_(esConsumes()), analyzeAlignables_(config.getParameter("analyzeAlignables")), printTrackerStructure_(config.getParameter("printTrackerStructure")), maxPrintDepth_(config.getParameter("maxPrintDepth")), @@ -73,11 +71,9 @@ void TrackerGeometryAnalyzer ::setTrackerTopology(const edm::EventSetup& setup) void TrackerGeometryAnalyzer ::setTrackerGeometry(const edm::EventSetup& setup) { edm::ESHandle geometricDet = setup.getHandle(geomDetToken_); edm::ESHandle trackerParams = setup.getHandle(ptpToken_); - edm::ESHandle trackerGeometricDetExtra = setup.getHandle(ptapToken_); TrackerGeomBuilderFromGeometricDet trackerGeometryBuilder; - trackerGeometry = - trackerGeometryBuilder.build(&(*geometricDet), &(*trackerGeometricDetExtra), *trackerParams, trackerTopology); + trackerGeometry = trackerGeometryBuilder.build(&(*geometricDet), *trackerParams, trackerTopology); alignableObjectId_ = AlignableObjectId{trackerGeometry, nullptr, nullptr, nullptr}; } diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h index 07f3e67c0c5bb..ea7b57e5cc2e1 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h @@ -19,7 +19,6 @@ #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" @@ -74,7 +73,6 @@ class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer const edm::ESGetToken tTopoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; - const edm::ESGetToken ptapToken_; // config-file parameters const bool analyzeAlignables_; diff --git a/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h index 84d8cec89d2d1..e07c84c4334e1 100644 --- a/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h +++ b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h @@ -16,16 +16,13 @@ class PTrackerAdditionalParametersPerDet { ~PTrackerAdditionalParametersPerDet(){}; enum IntParamIndex { GEOGRAPHICAL_ID = 0, ISIZE = 1 }; - enum BoolParamIndex { BRICKEDNESS = 0, BSIZE = 1 }; + enum BoolParamIndex { 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_; diff --git a/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc b/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc index cd552ca3741be..aadfda5b777af 100644 --- a/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc +++ b/CondFormats/GeometryObjects/src/PTrackerAdditionalParametersPerDet.cc @@ -35,19 +35,8 @@ std::vector PTrackerAdditionalParametersPerDet::getAllGeographicalIds() con 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/SiPixelTransient/interface/SiPixelUtils.h b/CondFormats/SiPixelTransient/interface/SiPixelUtils.h index fb814a23c74a8..0aa16a3869ea7 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelUtils.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelUtils.h @@ -1,8 +1,7 @@ -#ifndef CondFormatsSiPixelTransientSiPixelUtils_h -#define CondFormatsSiPixelTransientSiPixelUtils_h 1 - -namespace SiPixelUtils { +#ifndef CondFormats_SiPixelTransient_SiPixelUtils_h +#define CondFormats_SiPixelTransient_SiPixelUtils_h +namespace siPixelUtils { float generic_position_formula(int size, //!< Size of this projection. int q_f, //!< Charge in the first pixel. int q_l, //!< Charge in the last pixel. @@ -18,25 +17,6 @@ namespace SiPixelUtils { float eff_charge_cut_high, //!< Use edge if < W_eff (in pix) &&& float size_cut //!< Use edge when size == cuts ); - - float generic_position_formula_y_bricked( - int size, //!< Size of this projection. - int q_f, //!< Charge in the first pixel. - int q_l, //!< Charge in the last pixel. - int q_f_b, //!< Charge in pixels that are "dented" compared to the lowest pixel of the cluster. - int q_l_b, //!< Charge in pixels that are "dented" compared to the highest pixel of the cluster. - float upper_edge_first_pix, //!< As the name says. - float lower_edge_last_pix, //!< As the name says. - float lorentz_shift, //!< L-width - float theThickness, //detector thickness - float cot_angle, //!< cot of alpha_ or beta_ - float pitch, //!< thePitchX or thePitchY - bool first_is_big, //!< true if the first is big - bool last_is_big, //!< true if the last is big - float eff_charge_cut_low, //!< Use edge if > W_eff (in pix) &&& - float eff_charge_cut_high, //!< Use edge if < W_eff (in pix) &&& - float size_cut //!< Use edge when size == cuts - ); -} // namespace SiPixelUtils +} // namespace siPixelUtils #endif diff --git a/CondFormats/SiPixelTransient/src/SiPixelUtils.cc b/CondFormats/SiPixelTransient/src/SiPixelUtils.cc index 734fc13804870..f9c9a57f8f6cf 100644 --- a/CondFormats/SiPixelTransient/src/SiPixelUtils.cc +++ b/CondFormats/SiPixelTransient/src/SiPixelUtils.cc @@ -6,7 +6,7 @@ #include -namespace SiPixelUtils { +namespace siPixelUtils { //----------------------------------------------------------------------------- //! A generic version of the position formula. Since it works for both @@ -78,73 +78,4 @@ namespace SiPixelUtils { return hit_pos; } - - float generic_position_formula_y_bricked( - int size, //!< Size of this projection. - int q_f, //!< Charge in the first pixel. - int q_l, //!< Charge in the last pixel. - int q_f_b, //!< Charge in pixels that are "dented" compared to the lowest pixel of the cluster. - int q_l_b, //!< Charge in pixels that are "dented" compared to the highest pixel of the cluster. - float upper_edge_first_pix, //!< As the name says. - float lower_edge_last_pix, //!< As the name says. - float lorentz_shift, //!< L-shift at half thickness - float theThickness, //detector thickness - float cot_angle, //!< cot of alpha_ or beta_ - float pitch, //!< thePitchX or thePitchY - bool first_is_big, //!< true if the first is big - bool last_is_big, //!< true if the last is big - float eff_charge_cut_low, //!< Use edge if > w_eff &&& - float eff_charge_cut_high, //!< Use edge if < w_eff &&& - float size_cut //!< Use edge when size == cuts - ) { - const auto geom_center = 0.5f * (upper_edge_first_pix + lower_edge_last_pix); - - //--- The case of only one pixel in this projection is separate. Note that - //--- here first_pix == last_pix, so the average of the two is still the - //--- center of the pixel. - - //--- Width of the clusters minus the edge (first and last) pixels. - //--- In the note, they are denoted x_F and x_L (and y_F and y_L) - const auto w_inner = lower_edge_last_pix - upper_edge_first_pix; // in cm - - //--- Predicted charge width from geometry - const auto w_pred = theThickness * cot_angle // geometric correction (in cm) - - lorentz_shift; // (in cm) &&& check fpix! - - //--- Total length of the two edge pixels (first+last) - auto sum_of_edge = 2.0f; - if (first_is_big) - sum_of_edge += 1.0f; - if (last_is_big) - sum_of_edge += 1.0f; - - //--- The `effective' charge width -- particle's path in first and last pixels only - auto w_eff = std::abs(w_pred) - std::abs(w_inner); - - //--- If the observed charge width is inconsistent with the expectations - //--- based on the track, do *not* use w_pred-w_innner. Instead, replace - //--- it with an *average* effective charge width, which is the average - //--- length of the edge pixels. - // - // bool usedEdgeAlgo = false; - //Modified cut to make use of the w_eff in the bricked geometry - if (size >= size_cut) { - w_eff = pitch * 0.5f * sum_of_edge; // ave. length of edge pixels (first+last) (cm) - // usedEdgeAlgo = true; - } - - //--- Finally, compute the position in this projection - const auto q_diff = q_l - q_f; - auto q_sum = q_l + q_f; - const auto q_b_corr = q_l_b + q_f_b; - - //--- Temporary fix for clusters with both first and last pixel with charge = 0 - if (q_sum == 0) - q_sum = 1.0f; - - float hit_pos = - geom_center + 0.5f * (q_diff / q_sum) * w_eff + 0.5f * (q_b_corr / q_sum) * w_eff; //bricked correction - - return hit_pos; - } -} // namespace SiPixelUtils +} // namespace siPixelUtils diff --git a/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc b/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc deleted file mode 100644 index 23d9a0d811486..0000000000000 --- a/CondTools/Geometry/plugins/PTrackerAdditionalParametersPerDetDBBuilder.cc +++ /dev/null @@ -1,53 +0,0 @@ -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/ESTransientHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ServiceRegistry/interface/Service.h" -#include "CondCore/DBOutputService/interface/PoolDBOutputService.h" -#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" - -class PTrackerAdditionalParametersPerDetDBBuilder : public edm::one::EDAnalyzer { -public: - PTrackerAdditionalParametersPerDetDBBuilder(const edm::ParameterSet&); - - void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override; - void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {} - void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} - -private: - const edm::ESGetToken geomDetToken_; -}; - -PTrackerAdditionalParametersPerDetDBBuilder::PTrackerAdditionalParametersPerDetDBBuilder( - const edm::ParameterSet& iConfig) - : geomDetToken_(esConsumes()) {} - -void PTrackerAdditionalParametersPerDetDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) { - PTrackerAdditionalParametersPerDet ptitp; - edm::Service mydbservice; - if (!mydbservice.isAvailable()) { - edm::LogError("PTrackerAdditionalParametersPerDetDBBuilder") << "PoolDBOutputService unavailable"; - return; - } - - const GeometricDet* gd = &es.getData(geomDetToken_); - - std::vector comp; - gd->deepComponents(comp); - - for (auto& i : comp) { - ptitp.setGeographicalId(i->geographicalId()); - ptitp.setBricked(i->isBricked()); - } - - if (mydbservice->isNewTagRequest("PTrackerAdditionalParametersPerDetRcd")) { - mydbservice->createOneIOV(ptitp, mydbservice->beginOfTime(), "PTrackerAdditionalParametersPerDetRcd"); - } else { - edm::LogError("PTrackerAdditionalParametersPerDetDBBuilder") - << "PTrackerAdditionalParametersPerDet and PTrackerAdditionalParametersPerDetRcd Tag already present"; - } -} - -DEFINE_FWK_MODULE(PTrackerAdditionalParametersPerDetDBBuilder); diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2017DD4hepReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2017DD4hepReco_cff.py index 39c0d9ceae60d..c62052f19ec73 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2017DD4hepReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2017DD4hepReco_cff.py @@ -4,7 +4,6 @@ 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/GeometryDD4hepExtended2018DD4hepReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2018DD4hepReco_cff.py index 022d54b8556bc..ef504b16af656 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2018DD4hepReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2018DD4hepReco_cff.py @@ -4,7 +4,6 @@ from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py index 3cc9ae3004e21..ffc819a6ce3da 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 53fdfe55fdf7f..8b185d343b39b 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 898420b813bc8..ea7c7e80a1ecf 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 ac606c5857577..9850b83058148 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 bb0eed90f8e97..279642b473bae 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py @@ -8,7 +8,6 @@ # 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 2b687c4b806f1..8d223d6f65189 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py @@ -8,7 +8,6 @@ # 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 0ab35a0a6c059..2712ffacc1c2e 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py index 953090e22e112..7fcab9de749a8 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py index 070b2c145093c..3d0e021360343 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py index 6b08e017a8b09..5c0f82c3d2914 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py index 91016979ae2a6..aa6452f2f6fc1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py index ee147b37ed46e..0b5d9943ec323 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py index b6886f971dafd..5ce5dbf6c2ebd 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py index 381586b9d19d0..e833f5a82ac59 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py index f10672ca90e18..32845a07e7d95 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py @@ -8,7 +8,6 @@ # 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/GeometryExtended2016Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py index 5149abb927c50..c56cb2f2cfd2c 100644 --- a/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2016Reco_cff.py @@ -12,7 +12,6 @@ #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 a6876295d618a..46d1757fef861 100644 --- a/Configuration/Geometry/python/GeometryExtended2016devReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2016devReco_cff.py @@ -12,7 +12,6 @@ #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/GeometryExtended2017DDDReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py index c15157642f0b2..08ebc74515a81 100644 --- a/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017DDDReco_cff.py @@ -10,7 +10,6 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py index 8c40f1dfd9c02..4aa830931fc6f 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan0Reco_cff.py @@ -10,7 +10,6 @@ #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 c438936acee56..26822276c2505 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05PercentReco_cff.py @@ -9,7 +9,6 @@ #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 ceb33fcdcf4ac..1843399b3279b 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10PercentReco_cff.py @@ -9,7 +9,6 @@ #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 e1bf2f1041eec..4b88ecd1cd364 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05PercentReco_cff.py @@ -9,7 +9,6 @@ #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 d7d985407b6a7..73d37e33728dd 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10PercentReco_cff.py @@ -9,7 +9,6 @@ #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 057b0382ee8c6..1230045ea7d6e 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1Reco_cff.py @@ -10,7 +10,6 @@ #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 b4caab42cdee3..6bf538b23155a 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterialReco_cff.py @@ -10,7 +10,6 @@ #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 471116dc918d5..81b00b6b765f2 100644 --- a/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2017Reco_cff.py @@ -9,7 +9,6 @@ #Tracker from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * #Muon diff --git a/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py b/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py index 4565dfff3ada3..ddb2adb5af5a1 100644 --- a/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py @@ -11,7 +11,6 @@ #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 649f873830d59..acd5b40ee93a2 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatMinus05PercentReco_cff.py @@ -10,7 +10,6 @@ #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 3edc5fd30a3af..b199febc3d8e1 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatMinus10PercentReco_cff.py @@ -10,7 +10,6 @@ #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 99f20fb09662e..8b34163ec9edc 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatPlus05PercentReco_cff.py @@ -10,7 +10,6 @@ #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 992f6549a7fb0..0551a6f017b7d 100644 --- a/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018FlatPlus10PercentReco_cff.py @@ -10,7 +10,6 @@ #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 9987e82e4d75b..afaa8a42450a4 100644 --- a/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018Plan36Reco_cff.py @@ -11,7 +11,6 @@ #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 fead9ffeabffa..5b9054885cbdb 100644 --- a/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018Reco_cff.py @@ -11,7 +11,6 @@ #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 ce407b3d0c0ff..c51b9536e0606 100644 --- a/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2018ZeroMaterialReco_cff.py @@ -11,7 +11,6 @@ #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 c98b17ff1dce4..8cfa217ebbc24 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 0d20e27f047ab..1760f0fbe5665 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 ca96a5b16ec9b..70ea11f077a39 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 14a33b3afc6f8..d6734a4180280 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py @@ -8,7 +8,6 @@ # 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 f573869340ef1..ff8be7f114bb2 100644 --- a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py @@ -8,7 +8,6 @@ # 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 31be348f0238c..fd7b1d3a66f26 100644 --- a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py @@ -8,7 +8,6 @@ # 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 7a19b39c6a7f8..9a614649da882 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py index d16ef32140916..6764289fb6d58 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py index 1e1ae1b23e747..bc424138b8e59 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py index f996138a8c552..657effe4aa7bc 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py index c01e5c7a218a3..969526bf90505 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py index ba6752d6aa7a7..568b96f3dc9a7 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py index c423983556af5..8df0608d7b219 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py index db0f82690fe73..c54f7a5c4adc0 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py index e8735d9008fdf..e2dfdf4f7927d 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py @@ -8,7 +8,6 @@ # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended_cff.py b/Configuration/Geometry/python/GeometryExtended_cff.py index 77b38da07f654..8b5d12fdadfb1 100644 --- a/Configuration/Geometry/python/GeometryExtended_cff.py +++ b/Configuration/Geometry/python/GeometryExtended_cff.py @@ -9,8 +9,6 @@ # 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 deaa4202705c4..16b3416ad84af 100644 --- a/Configuration/Geometry/python/GeometryIdealAPD1_cff.py +++ b/Configuration/Geometry/python/GeometryIdealAPD1_cff.py @@ -12,7 +12,6 @@ #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 84261d80b01c0..b2243859583b4 100644 --- a/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py +++ b/Configuration/Geometry/python/GeometryIdealNoAPD_cff.py @@ -12,7 +12,6 @@ #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 d5ddac7f51a25..26a0440b454cd 100644 --- a/Configuration/Geometry/python/GeometryNoCastor_cff.py +++ b/Configuration/Geometry/python/GeometryNoCastor_cff.py @@ -12,7 +12,6 @@ #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 a62a12eeb66e8..818a174abe9ed 100644 --- a/Configuration/Geometry/python/GeometryRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometryRecoDB_cff.py @@ -5,8 +5,6 @@ #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 e035a22b4681b..d85de3012c48b 100644 --- a/Configuration/Geometry/python/GeometryRecoTracker_cff.py +++ b/Configuration/Geometry/python/GeometryRecoTracker_cff.py @@ -6,8 +6,6 @@ # 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 b4d5a14599dfe..1a583d69c9ac9 100644 --- a/Configuration/Geometry/python/GeometryReco_cff.py +++ b/Configuration/Geometry/python/GeometryReco_cff.py @@ -6,8 +6,6 @@ #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 d65fba5f52889..c9b3be08bf616 100644 --- a/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCRecoDB_cff.py @@ -5,7 +5,6 @@ #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 66712a79e6f4e..c772c2d9429fe 100644 --- a/Configuration/Geometry/python/GeometrySLHCReco_cff.py +++ b/Configuration/Geometry/python/GeometrySLHCReco_cff.py @@ -10,7 +10,6 @@ #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 ccdfdb2441b97..9a8e7e9b1b5d2 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -290,7 +290,6 @@ "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 *', @@ -493,7 +492,6 @@ "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 *', @@ -697,7 +695,6 @@ "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 *', @@ -901,7 +898,6 @@ "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 *', @@ -1105,7 +1101,6 @@ "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 *', @@ -1309,7 +1304,6 @@ "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 dc987d734488e..f2305b5a27dc6 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -93,7 +93,6 @@ "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 *', @@ -130,7 +129,6 @@ "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 *', @@ -167,7 +165,6 @@ "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 *', @@ -203,7 +200,6 @@ "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 *', @@ -239,7 +235,6 @@ "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 *', @@ -275,7 +270,6 @@ "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,7 +306,6 @@ "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', diff --git a/Geometry/CommonTopologies/interface/PixelTopology.h b/Geometry/CommonTopologies/interface/PixelTopology.h index b990dbd104f97..05da3de01a1f7 100644 --- a/Geometry/CommonTopologies/interface/PixelTopology.h +++ b/Geometry/CommonTopologies/interface/PixelTopology.h @@ -33,7 +33,6 @@ 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 bdb6162f12976..4d86cfe6f5fd9 100644 --- a/Geometry/CommonTopologies/interface/ProxyPixelTopology.h +++ b/Geometry/CommonTopologies/interface/ProxyPixelTopology.h @@ -61,7 +61,6 @@ 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 150ffa846e3ff..348fd12ae13e1 100644 --- a/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h +++ b/Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h @@ -65,7 +65,6 @@ 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 1b4667c887619..dbba18a8e6aaf 100644 --- a/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h +++ b/Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h @@ -170,7 +170,6 @@ 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/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h b/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h index 957dc41f44bd0..0b8b5dcbc191c 100644 --- a/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h +++ b/Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h @@ -15,7 +15,6 @@ 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 8eaa3efe25d40..42a75794942e9 100644 --- a/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h +++ b/Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h @@ -44,7 +44,6 @@ 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 @@ -59,8 +58,7 @@ 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_isBricked(isBricked) { + m_upgradeGeometry(upgradeGeometry) { // Calculate the edge of the active sensor with respect to the center, // that is simply the half-size. // Take into account large pixels @@ -73,7 +71,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 << ", isBricked " << m_isBricked; + << ", NCOL " << m_COLS_PER_ROC * m_ROCS_Y; } // Topology interface, go from Masurement to Local corrdinates @@ -165,7 +163,6 @@ 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; @@ -179,7 +176,6 @@ 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 16636dc5d8660..cf4f7c5a5b1c1 100644 --- a/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h @@ -7,7 +7,6 @@ #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; @@ -17,14 +16,10 @@ class PTrackerParameters; class TrackerGeomBuilderFromGeometricDet { public: - TrackerGeometry* build(const GeometricDet* gd, - const PTrackerAdditionalParametersPerDet* ptitp, - const PTrackerParameters& ptp, - const TrackerTopology* tTopo); + TrackerGeometry* build(const GeometricDet* gd, 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 deleted file mode 100644 index de60a6c713019..0000000000000 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerAdditionalParametersPerDetESModule.cc +++ /dev/null @@ -1,66 +0,0 @@ -#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 9d8a3e9c0d5e8..fae0da2827ef8 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc @@ -15,12 +15,10 @@ #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" @@ -46,8 +44,6 @@ class TrackerDigiGeometryESModule : public edm::ESProducer { edm::ESGetToken geometricDetToken_; edm::ESGetToken trackerTopoToken_; edm::ESGetToken trackerParamsToken_; - edm::ESGetToken - trackerGeometricDetExtraToken_; edm::ESGetToken globalAlignmentToken_; edm::ESGetToken trackerAlignmentToken_; @@ -68,8 +64,6 @@ 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_}; @@ -115,10 +109,8 @@ 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, &ptitp, ptp, &tTopo)); + std::unique_ptr tracker(builder.build(&gD, 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 8767e1b67a874..78ca799c7ef77 100644 --- a/Geometry/TrackerGeometryBuilder/src/PixelTopologyBuilder.cc +++ b/Geometry/TrackerGeometryBuilder/src/PixelTopologyBuilder.cc @@ -8,7 +8,6 @@ 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 @@ -33,7 +32,6 @@ 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 9356b38014aa2..f995eeb14ad41 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -11,7 +11,6 @@ #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/StripTopologyBuilder.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" -#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" @@ -42,7 +41,6 @@ namespace { } // namespace TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* gd, - const PTrackerAdditionalParametersPerDet* ptitpx, const PTrackerParameters& ptp, const TrackerTopology* tTopo) { if (ptp.vpars.size() != 6) { @@ -102,46 +100,26 @@ 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], - ptitpx, - tracker, - GeomDetEnumerators::SubDetector::PixelBarrel, - false, - BIG_PIX_PER_ROC_X, - BIG_PIX_PER_ROC_Y); - if (gdsubdetmap[i] == GeometricDet::PixelPhase1Barrel) buildPixel( - dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P1PXB, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + dets[i], 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); // Phase2 case if (gdsubdetmap[i] == GeometricDet::PixelPhase2Barrel) - buildPixel( - dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2PXB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2PXB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); // if (gdsubdetmap[i] == GeometricDet::PixelEndCap) - buildPixel(dets[i], - ptitpx, - tracker, - GeomDetEnumerators::SubDetector::PixelEndcap, - false, - BIG_PIX_PER_ROC_X, - BIG_PIX_PER_ROC_Y); + buildPixel( + dets[i], tracker, GeomDetEnumerators::SubDetector::PixelEndcap, false, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::PixelPhase1EndCap) - 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], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2PXEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + dets[i], 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); if (gdsubdetmap[i] == GeometricDet::OTPhase2Barrel) - buildPixel( - dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2OTB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], tracker, GeomDetEnumerators::SubDetector::P2OTB, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); if (gdsubdetmap[i] == GeometricDet::OTPhase2EndCap) - buildPixel( - dets[i], ptitpx, tracker, GeomDetEnumerators::SubDetector::P2OTEC, true, BIG_PIX_PER_ROC_X, BIG_PIX_PER_ROC_Y); + buildPixel(dets[i], 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) { @@ -173,7 +151,6 @@ TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* g void TrackerGeomBuilderFromGeometricDet::buildPixel( std::vector const& gdv, - const PTrackerAdditionalParametersPerDet* const& ptitp, TrackerGeometry* tracker, GeomDetType::SubDetector det, bool upgradeGeometry, @@ -188,22 +165,12 @@ 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 319d74308ae78..4bc83d4253eb6 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc @@ -99,8 +99,7 @@ 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() - << " isBricked " << p.isBricked() << " Rows " << p.nrows() - << " Columns " << p.ncolumns() << '\n'; + << " 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 d4265a9b5d25b..860ee01da7ba4 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerMap_cfg.py @@ -8,7 +8,6 @@ process.load("Geometry.TrackerNumberingBuilder.trackerTopology_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi") -process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi") process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py index 04ceeb6230cc1..daea66e3e9a05 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py @@ -15,8 +15,6 @@ process.es_prefer_geomdet = cms.ESPrefer("TrackerGeometricDetESModule","") -process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") - process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py index 27fc74a1bc1e2..343f1f18b639a 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py @@ -16,8 +16,6 @@ process.es_prefer_geomdet = cms.ESPrefer("TrackerGeometricDetESModule","") -process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") - process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") diff --git a/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h index ff5a04d354d32..b4a99f34e046d 100644 --- a/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h +++ b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h @@ -130,7 +130,6 @@ 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_; } @@ -189,7 +188,6 @@ 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 cd51ef67bc3b2..1000033349137 100644 --- a/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc +++ b/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc @@ -89,7 +89,6 @@ 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); @@ -124,7 +123,6 @@ 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 5aca943b85192..a397019aa12e4 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -265,6 +265,11 @@ def customizeHLTfor40465(process): pass return process +def customizeHLTfor40443(process): + for producer in [producers for producers in esproducers_by_type(process, "TrackerAdditionalParametersPerDetESModule")]: + delattr(process, producer.label()) + return process + # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -277,5 +282,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = customizeHLTfor40264(process) process = customizeHLTfor40334(process) process = customizeHLTfor40465(process) + process = customizeHLTfor40443(process) return process diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc index 707b2c15d79c6..c425467127c42 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc @@ -253,7 +253,7 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa cout << "\t >>> Generic:: processing X" << endl; #endif - float xPos = SiPixelUtils::generic_position_formula( + float xPos = siPixelUtils::generic_position_formula( theClusterParam.theCluster->sizeX(), q_f_X, q_l_X, @@ -277,7 +277,7 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa cout << "\t >>> Generic:: processing Y" << endl; #endif - float yPos = SiPixelUtils::generic_position_formula( + float yPos = siPixelUtils::generic_position_formula( theClusterParam.theCluster->sizeY(), q_f_Y, q_l_Y, diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 6e1ade0997c0a..63dd0e3dc0712 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -23,7 +23,6 @@ #include "SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h" #include "SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.h" #include "SimTracker/SiPhase2Digitizer/plugins/Pixel3DDigitizerAlgorithm.h" -#include "SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h" #include "SimTracker/Common/interface/DigitizerUtility.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -91,7 +90,6 @@ namespace cms { } // creating algorithm objects and pushing them into the map algomap_[AlgorithmType::InnerPixel] = std::make_unique(iConfig, iC); - algomap_[AlgorithmType::InnerPixelBricked] = std::make_unique(iConfig, iC); algomap_[AlgorithmType::InnerPixel3D] = std::make_unique(iConfig, iC); algomap_[AlgorithmType::PixelinPS] = std::make_unique(iConfig, iC); algomap_[AlgorithmType::StripinPS] = std::make_unique(iConfig, iC); @@ -235,9 +233,6 @@ namespace cms { moduleTypeCache_.emplace(detId_raw, mType); } - auto detUnit = detectorUnits_.find(detId_raw); - const Phase2TrackerGeomDetUnit* pixdet = dynamic_cast(detUnit->second); - const Phase2TrackerTopology* topol = &pixdet->specificTopology(); AlgorithmType algotype = AlgorithmType::Unknown; switch (mType) { case TrackerGeometry::ModuleType::Ph1PXB: @@ -247,16 +242,10 @@ namespace cms { algotype = AlgorithmType::InnerPixel; break; case TrackerGeometry::ModuleType::Ph2PXB: - if (topol->isBricked()) - algotype = AlgorithmType::InnerPixelBricked; - else - algotype = AlgorithmType::InnerPixel; + algotype = AlgorithmType::InnerPixel; break; case TrackerGeometry::ModuleType::Ph2PXF: - if (topol->isBricked()) - algotype = AlgorithmType::InnerPixelBricked; - else - algotype = AlgorithmType::InnerPixel; + algotype = AlgorithmType::InnerPixel; break; case TrackerGeometry::ModuleType::Ph2PXB3D: algotype = AlgorithmType::InnerPixel3D; @@ -292,8 +281,7 @@ namespace cms { continue; // Decide if we want analog readout for Outer Tracker. - if (!ot_analog && algotype != AlgorithmType::InnerPixel && algotype != AlgorithmType::InnerPixel3D && - algotype != AlgorithmType::InnerPixelBricked) + if (!ot_analog && algotype != AlgorithmType::InnerPixel && algotype != AlgorithmType::InnerPixel3D) continue; std::map digi_map; @@ -356,8 +344,7 @@ namespace cms { auto algotype = getAlgoType(rawId); auto fiter = algomap_.find(algotype); - if (fiter == algomap_.end() || algotype == AlgorithmType::InnerPixel || algotype == AlgorithmType::InnerPixel3D || - algotype == AlgorithmType::InnerPixelBricked) + if (fiter == algomap_.end() || algotype == AlgorithmType::InnerPixel || algotype == AlgorithmType::InnerPixel3D) continue; std::map digi_map; diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h index 17817420fd90e..7a8889959700a 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h @@ -73,7 +73,7 @@ namespace cms { using vstring = std::vector; // constants of different algorithm types - enum class AlgorithmType { InnerPixel, InnerPixelBricked, InnerPixel3D, PixelinPS, StripinPS, TwoStrip, Unknown }; + enum class AlgorithmType { InnerPixel, InnerPixel3D, PixelinPS, StripinPS, TwoStrip, Unknown }; AlgorithmType getAlgoType(uint32_t idet); void accumulatePixelHits(edm::Handle >, size_t globalSimHitIndex, const uint32_t tofBin); diff --git a/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.cc deleted file mode 100644 index 612923cfc282f..0000000000000 --- a/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.cc +++ /dev/null @@ -1,230 +0,0 @@ -#include -#include - -#include "SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h" -#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" - -#include "FWCore/Framework/interface/ConsumesCollector.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ServiceRegistry/interface/Service.h" -#include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h" - -#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h" -#include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h" -#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" -#include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h" - -// Geometry -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonTopologies/interface/PixelTopology.h" - -using namespace edm; -using namespace sipixelobjects; - -PixelBrickedDigitizerAlgorithm::PixelBrickedDigitizerAlgorithm(const edm::ParameterSet& conf, edm::ConsumesCollector iC) - : PixelDigitizerAlgorithm(conf, iC) -/* odd_row_interchannelCoupling_next_row_(conf.getParameter("PixelBrickedDigitizerAlgorithm") - .getParameter("Odd_row_interchannelCoupling_next_row")) - even_row_interchannelCoupling_next_row_(conf.getParameter("PixelBrickedDigitizerAlgorithm") - .getParameter("Even_row_interchannelCoupling_next_row")), - odd_column_interchannelCoupling_next_column_( - conf.getParameter("PixelBrickedDigitizerAlgorithm") - .getParameter("Odd_column_interchannelCoupling_next_column")), - even_column_interchannelCoupling_next_column_( - conf.getParameter("PixelBrickedDigitizerAlgorithm") - .getParameter("Even_column_interchannelCoupling_next_column"))*/ -{ - even_row_interchannelCoupling_next_row_ = conf.getParameter("PixelBrickedDigitizerAlgorithm") - .getParameter("Even_row_interchannelCoupling_next_row"); - pixelFlag_ = true; - LogDebug("PixelBrickedDigitizerAlgorithm") - << "Algorithm constructed " - << "Configuration parameters:" - << "Threshold/Gain = " - << "threshold in electron Endcap = " << theThresholdInE_Endcap_ - << "threshold in electron Barrel = " << theThresholdInE_Barrel_ << " " << theElectronPerADC_ << " " - << theAdcFullScale_ << " The delta cut-off is set to " << tMax_ << " pix-inefficiency " << addPixelInefficiency_; -} -PixelBrickedDigitizerAlgorithm::~PixelBrickedDigitizerAlgorithm() { - LogDebug("PixelBrickedDigitizerAlgorithm") << "Algorithm deleted"; -} -void PixelBrickedDigitizerAlgorithm::induce_signal(std::vector::const_iterator inputBegin, - const PSimHit& hit, - const size_t hitIndex, - const size_t firstHitIndex, - const uint32_t tofBin, - const Phase2TrackerGeomDetUnit* pixdet, - const std::vector& collection_points) { - // X - Rows, Left-Right, 160, (1.6cm) for barrel - // Y - Columns, Down-Up, 416, (6.4cm) - const Phase2TrackerTopology* topol = &pixdet->specificTopology(); - uint32_t detID = pixdet->geographicalId().rawId(); - signal_map_type& theSignal = _signal[detID]; - - // local map to store pixels hit by 1 Hit. - using hit_map_type = std::map >; - hit_map_type hit_signal; - - // Assign signals to readout channels and store sorted by channel number - // Iterate over collection points on the collection plane - for (auto const& v : collection_points) { - float CloudCenterX = v.position().x(); // Charge position in x - float CloudCenterY = v.position().y(); // in y - float SigmaX = v.sigma_x(); // Charge spread in x - float SigmaY = v.sigma_y(); // in y - float Charge = v.amplitude(); // Charge amplitude - - // Find the maximum cloud spread in 2D plane , assume 3*sigma - float CloudRight = CloudCenterX + clusterWidth_ * SigmaX; - float CloudLeft = CloudCenterX - clusterWidth_ * SigmaX; - float CloudUp = CloudCenterY + clusterWidth_ * SigmaY; - float CloudDown = CloudCenterY - clusterWidth_ * SigmaY; - - // Define 2D cloud limit points - LocalPoint PointRightUp = LocalPoint(CloudRight, CloudUp); - LocalPoint PointLeftDown = LocalPoint(CloudLeft, CloudDown); - - // This points can be located outside the sensor area. - // The conversion to measurement point does not check for that - // so the returned pixel index might be wrong (outside range). - // We rely on the limits check below to fix this. - // But remember whatever we do here THE CHARGE OUTSIDE THE ACTIVE - // PIXEL AREA IS LOST, it should not be collected. - - // Convert the 2D points to pixel indices - MeasurementPoint mp = topol->measurementPosition(PointRightUp); - //MeasurementPoint mp_bricked = topol->measurementPosition(PointRightUp); - int IPixRightUpX = static_cast(std::floor(mp.x())); // cast reqd. - //int IPixRightUpY = static_cast(std::floor(mp.y())); - - int numColumns = topol->ncolumns(); // det module number of cols&rows - int numRows = topol->nrows(); - IPixRightUpX = numRows > IPixRightUpX ? IPixRightUpX : numRows - 1; - - //Specific to bricked geometry - int IPixRightUpY = static_cast(mp.y() - 0.5 * (IPixRightUpX % 2)); - - mp = topol->measurementPosition(PointLeftDown); - - int IPixLeftDownX = static_cast(std::floor(mp.x())); - - IPixLeftDownX = 0 < IPixLeftDownX ? IPixLeftDownX : 0; - - //Specific to bricked geometry - int IPixLeftDownY = static_cast(mp.y() - 0.5 * (IPixLeftDownX % 2)); //changed in case negative value - - IPixRightUpY = numColumns > IPixRightUpY ? IPixRightUpY : numColumns - 1; - IPixLeftDownY = 0 < IPixLeftDownY ? IPixLeftDownY : 0; - - // First integrate charge strips in x - hit_map_type x; - for (int ix = IPixLeftDownX; ix <= IPixRightUpX; ++ix) { // loop over x index - float xLB, LowerBound; - // Why is set to 0 if ix=0, does it meen that we accept charge - // outside the sensor? - if (ix == 0 || SigmaX == 0.) { // skip for surface segemnts - LowerBound = 0.; - } else { - mp = MeasurementPoint(ix, 0.0); - xLB = topol->localPosition(mp).x(); - LowerBound = 1 - calcQ((xLB - CloudCenterX) / SigmaX); - } - - float xUB, UpperBound; - if (ix == numRows - 1 || SigmaX == 0.) { - UpperBound = 1.; - } else { - mp = MeasurementPoint(ix + 1, 0.0); - xUB = topol->localPosition(mp).x(); - UpperBound = 1. - calcQ((xUB - CloudCenterX) / SigmaX); - } - float TotalIntegrationRange = UpperBound - LowerBound; // get strip - x.emplace(ix, TotalIntegrationRange); // save strip integral - } - - // Now integrate strips in y. Two maps will be filled: y and y_bricked which will both be used for the induced signal. - int IPixLeftDownY_bricked = IPixLeftDownY; - int IPixRightUpY_bricked = IPixRightUpY; - - //Specific to bricked geometry - IPixRightUpY = std::min(IPixRightUpY + int((IPixRightUpX % 2)), numColumns - 1); - - //This map will be twice as large as the non-bricked hit map in y to harbor both the integrated charge from the bricked and non-bricked columns. - hit_map_type y; - for (int iy = IPixLeftDownY; iy <= IPixRightUpY; ++iy) { // loop over y index - float yLB, LowerBound; - if (iy == 0 || SigmaY == 0.) { - LowerBound = 0.; - } else { - mp = MeasurementPoint(0.0, iy); - yLB = topol->localPosition(mp).y(); - LowerBound = 1. - calcQ((yLB - CloudCenterY) / SigmaY); - } - - float yUB, UpperBound; - if (iy >= numColumns - 1 || SigmaY == 0.) { - UpperBound = 1.; - } else { - mp = MeasurementPoint(0.0, iy + 1); - yUB = topol->localPosition(mp).y(); - UpperBound = 1. - calcQ((yUB - CloudCenterY) / SigmaY); - } - - float TotalIntegrationRange = UpperBound - LowerBound; - - //Even indices correspond to the non-bricked columns - y.emplace(2 * iy, TotalIntegrationRange); // save strip integral - } - - IPixLeftDownY_bricked = std::max(IPixLeftDownY_bricked - int((!(IPixLeftDownX % 2))), 0); - for (int iy = IPixLeftDownY_bricked; iy <= IPixRightUpY_bricked; ++iy) { // loop over y index - float yLB, LowerBound; - if (iy == 0 || SigmaY == 0.) { - LowerBound = 0.; - } else { - mp = MeasurementPoint(0.0, iy + 0.5); - yLB = topol->localPosition(mp).y(); - LowerBound = 1. - calcQ((yLB - CloudCenterY) / SigmaY); - } - - float yUB, UpperBound; - if (iy >= numColumns || SigmaY == 0.) { // This was changed for bricked pixels - UpperBound = 1.; - } else { - mp = MeasurementPoint(0.0, iy + 1.5); - yUB = topol->localPosition(mp).y(); - UpperBound = 1. - calcQ((yUB - CloudCenterY) / SigmaY); - } - - float TotalIntegrationRange = UpperBound - LowerBound; - //Odd indices correspond to bricked columns - y.emplace(2 * iy + 1, TotalIntegrationRange); // save strip integral - } //loop over y index - - // Get the 2D charge integrals by folding x and y strips - for (int ix = IPixLeftDownX; ix <= IPixRightUpX; ++ix) { // loop over x index - for (int iy = std::max(0, IPixLeftDownY - int((ix % 2))); iy <= IPixRightUpY; ++iy) { // loop over y index - int iy_considered = iy * 2 + ix % 2; - float ChargeFraction = Charge * x[ix] * y[iy_considered]; - - int chanFired = -1; - if (ChargeFraction > 0.) { - chanFired = - pixelFlag_ ? PixelDigi::pixelToChannel(ix, iy) : Phase2TrackerDigi::pixelToChannel(ix, iy); // Get index - // Load the ampl - hit_signal[chanFired] += ChargeFraction; - } - } - } //x loop - } //collection loop - // Fill the global map with all hit pixels from this event - float corr_time = hit.tof() - pixdet->surface().toGlobal(hit.localPosition()).mag() * c_inv; - for (auto const& hit_s : hit_signal) { - int chan = hit_s.first; - theSignal[chan] += (makeDigiSimLinks_ ? digitizerUtility::Ph2Amplitude( - hit_s.second, &hit, hit_s.second, corr_time, hitIndex, tofBin) - : digitizerUtility::Ph2Amplitude(hit_s.second, nullptr, hit_s.second)); - } -} diff --git a/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h b/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h deleted file mode 100644 index 7446eb4d8e665..0000000000000 --- a/SimTracker/SiPhase2Digitizer/plugins/PixelBrickedDigitizerAlgorithm.h +++ /dev/null @@ -1,28 +0,0 @@ - -#ifndef _SimTracker_SiPhase2Digitizer_PixelBrickedDigitizerAlgorithm_h -#define _SimTracker_SiPhase2Digitizer_PixelBrickedDigitizerAlgorithm_h - -#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h" -#include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h" -#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" -#include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h" -#include "FWCore/Utilities/interface/ESGetToken.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.h" - -class PixelBrickedDigitizerAlgorithm : public PixelDigitizerAlgorithm { -private: -public: - PixelBrickedDigitizerAlgorithm(const edm::ParameterSet& conf, edm::ConsumesCollector iC); - ~PixelBrickedDigitizerAlgorithm() override; - - // Specific for bricked pixel - void induce_signal(std::vector::const_iterator inputBegin, - const PSimHit& hit, - const size_t hitIndex, - const size_t firstHitIndex, - const unsigned int tofBin, - const Phase2TrackerGeomDetUnit* pixdet, - const std::vector& collection_points) override; -}; -#endif diff --git a/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py b/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py index 8768b3e707ed1..d42d88a1446d1 100644 --- a/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py +++ b/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py @@ -93,8 +93,6 @@ NPColumnGap = cms.double(46.0), UseReweighting = cms.bool(False), # will be True for realistic simulations ), -#Pixel-Bricked Digitizer Algorithm - PixelBrickedDigitizerAlgorithm = PixelDigitizerAlgorithmCommon.clone(), #Pixel in PS Module PSPDigitizerAlgorithm = cms.PSet( ElectronPerAdc = cms.double(135.0),