Skip to content

Commit 47a226a

Browse files
cmsbuildcmsbuild
authored
Merge pull request #44576 from emiglior/CMSSW_14_1_X_bigpixel_protoT39
introducing BigPixel for phase-2 InnerTracker in T39 geometry
2 parents c52102f + 01b4af5 commit 47a226a

File tree

200 files changed

+2719
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+2719
-267
lines changed

‎Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
4545
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
4646
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
47+
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
4748
#include "Geometry/Records/interface/MuonGeometryRecord.h"
4849
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
4950
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
@@ -88,6 +89,7 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> {
8889
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> esTokenTTopo_;
8990
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> esTokenGeomDet_;
9091
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> esTokenPTP_;
92+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> esTokenPtitp_;
9193
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> esTokenDT_;
9294
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> esTokenCSC_;
9395
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> esTokenGEM_;
@@ -121,6 +123,7 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet&
121123
esTokenTTopo_(esConsumes()),
122124
esTokenGeomDet_(esConsumes()),
123125
esTokenPTP_(esConsumes()),
126+
esTokenPtitp_(esConsumes()),
124127
esTokenDT_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
125128
esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
126129
esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
@@ -157,8 +160,9 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev
157160

158161
const GeometricDet* geom = &iSetup.getData(esTokenGeomDet_);
159162
const PTrackerParameters& ptp = iSetup.getData(esTokenPTP_);
163+
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(esTokenPtitp_);
160164
TrackerGeomBuilderFromGeometricDet trackerBuilder;
161-
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptp, tTopo));
165+
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptitp, ptp, tTopo));
162166

163167
edm::ESHandle<DTGeometry> theMuonDT = iSetup.getHandle(esTokenDT_);
164168
edm::ESHandle<CSCGeometry> theMuonCSC = iSetup.getHandle(esTokenCSC_);

‎Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyRcd.h"
4545
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyErrorExtendedRcd.h"
4646
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
47+
#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
4748
#include "CondFormats/Common/interface/Time.h"
4849

4950
#include "FWCore/Framework/interface/ESHandle.h"
@@ -59,6 +60,7 @@
5960
#include "Geometry/Records/interface/IdealGeometryRecord.h"
6061
#include "Geometry/Records/interface/MuonGeometryRecord.h"
6162
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
63+
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
6264

6365
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
6466

@@ -254,6 +256,7 @@ class AlignmentProducerBase {
254256
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
255257
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
256258
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
259+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
257260
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
258261
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;
259262
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemGeomToken_;

‎Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed
5151
ttopoToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5252
geomDetToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5353
ptpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
54+
ptitpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5455
dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
5556
cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
5657
gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
@@ -431,8 +432,9 @@ void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, cons
431432
if (doTracker_) {
432433
const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_);
433434
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
435+
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);
434436
TrackerGeomBuilderFromGeometricDet trackerBuilder;
435-
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, *ptp, tTopo));
437+
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, ptitp, *ptp, tTopo));
436438
}
437439

438440
if (doMuon_) {

‎Alignment/LaserAlignment/plugins/LaserAlignment.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ LaserAlignment::LaserAlignment(edm::ParameterSet const& theConf)
2323
geomToken_(esConsumes()),
2424
geomDetToken_(esConsumes()),
2525
ptpToken_(esConsumes()),
26+
ptitpToken_(esConsumes()),
2627
gprToken_(esConsumes()),
2728
stripPedestalsToken_(esConsumes()),
2829
theEvents(0),
@@ -300,9 +301,10 @@ void LaserAlignment::produce(edm::Event& theEvent, edm::EventSetup const& theSet
300301
// the AlignableTracker object is initialized with the ideal geometry
301302
const GeometricDet* theGeometricDet = &theSetup.getData(geomDetToken_);
302303
const PTrackerParameters* ptp = &theSetup.getData(ptpToken_);
304+
const PTrackerAdditionalParametersPerDet* ptitp = &theSetup.getData(ptitpToken_);
303305

304306
TrackerGeomBuilderFromGeometricDet trackerBuilder;
305-
TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo);
307+
TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, &*ptitp, *ptp, tTopo);
306308

307309
theAlignableTracker = new AlignableTracker(&(*theRefTracker), tTopo);
308310
} else {

‎Alignment/LaserAlignment/plugins/LaserAlignment.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class LaserAlignment : public edm::one::EDProducer<edm::EndRunProducer> {
132132
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
133133
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
134134
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
135+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
135136
const edm::ESGetToken<Alignments, GlobalPositionRcd> gprToken_;
136137
const edm::ESGetToken<SiStripPedestals, SiStripPedestalsRcd> stripPedestalsToken_;
137138

‎Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ MillePedeDQMModule ::MillePedeDQMModule(const edm::ParameterSet& config)
2929
: tTopoToken_(esConsumes<edm::Transition::BeginRun>()),
3030
gDetToken_(esConsumes<edm::Transition::BeginRun>()),
3131
ptpToken_(esConsumes<edm::Transition::BeginRun>()),
32+
ptitpToken_(esConsumes<edm::Transition::BeginRun>()),
3233
aliThrToken_(esConsumes<edm::Transition::BeginRun>()),
3334
geomToken_(esConsumes<edm::Transition::BeginRun>()),
3435
outputFolder_(config.getParameter<std::string>("outputFolder")),
@@ -177,6 +178,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup
177178
const TrackerTopology* const tTopo = &setup.getData(tTopoToken_);
178179
const GeometricDet* geometricDet = &setup.getData(gDetToken_);
179180
const PTrackerParameters* ptp = &setup.getData(ptpToken_);
181+
const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_);
180182
const TrackerGeometry* geom = &setup.getData(geomToken_);
181183

182184
pixelTopologyMap_ = std::make_shared<PixelTopologyMap>(geom, tTopo);
@@ -190,7 +192,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup
190192

191193
TrackerGeomBuilderFromGeometricDet builder;
192194

193-
const auto trackerGeometry = builder.build(geometricDet, *ptp, tTopo);
195+
const auto trackerGeometry = builder.build(geometricDet, ptitp, *ptp, tTopo);
194196
tracker_ = std::make_unique<AlignableTracker>(trackerGeometry, tTopo);
195197

196198
const std::string labelerPlugin{"PedeLabeler"};

‎Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
/*** Records for ESWatcher ***/
4242
#include "Geometry/Records/interface/IdealGeometryRecord.h"
4343
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
44+
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
4445
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
4546
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
4647

@@ -97,6 +98,7 @@ class MillePedeDQMModule : public DQMEDHarvester {
9798
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
9899
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> gDetToken_;
99100
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
101+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
100102
const edm::ESGetToken<AlignPCLThresholdsHG, AlignPCLThresholdsHGRcd> aliThrToken_;
101103
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
102104

‎Alignment/OfflineValidation/plugins/OverlapValidation.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
5555
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
5656
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
57-
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
5857
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
5958
#include "MagneticField/Engine/interface/MagneticField.h"
6059
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

‎Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg)
5959
topoToken_(esConsumes()),
6060
geomDetToken_(esConsumes()),
6161
ptpToken_(esConsumes()),
62+
ptitpToken_(esConsumes()),
6263
pixQualityToken_(esConsumes()),
6364
stripQualityToken_(esConsumes()),
6465
referenceTracker(nullptr),
@@ -392,10 +393,11 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) {
392393

393394
const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_);
394395
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
396+
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);
395397
TrackerGeomBuilderFromGeometricDet trackerBuilder;
396398

397399
//reference tracker
398-
TrackerGeometry* theRefTracker = trackerBuilder.build(theGeometricDet, *ptp, tTopo);
400+
TrackerGeometry* theRefTracker = trackerBuilder.build(theGeometricDet, ptitp, *ptp, tTopo);
399401
if (inputFilename1_ != "IDEAL") {
400402
GeometryAligner aligner1;
401403
aligner1.applyAlignments<TrackerGeometry>(
@@ -444,7 +446,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) {
444446
}
445447

446448
//currernt tracker
447-
TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo);
449+
TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, ptitp, *ptp, tTopo);
448450
if (inputFilename2_ != "IDEAL") {
449451
GeometryAligner aligner2;
450452
aligner2.applyAlignments<TrackerGeometry>(

‎Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> {
9191
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
9292
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
9393
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
94+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
9495
const edm::ESGetToken<SiPixelQuality, SiPixelQualityRcd> pixQualityToken_;
9596
const edm::ESGetToken<SiStripQuality, SiStripQualityRcd> stripQualityToken_;
9697

0 commit comments

Comments
 (0)