Skip to content

introducing BigPixel for phase-2 InnerTracker in T39 geometry #44576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 10 commits into from
May 21, 2024
Merged

introducing BigPixel for phase-2 InnerTracker in T39 geometry #44576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4eaef34
revert PR 40443 w/o introduction bricked pixels
emiglior Jul 23, 2023
841860c
fix HLT customization to consume PTrackerAdditionalParametersPerDetRcd
emiglior Aug 3, 2023
f00a907
proto implementation of big pixels for phase-2 - test on T33 and T35 …
emiglior Jul 23, 2023
4abd587
Adapt PixelCPE to use phase2 pixel topology
emiglior Dec 1, 2023
fd376ae
implementation of RectangularPhase2Topology mapping
bardellig Jan 27, 2024
8f2e5ad
Add T39/D114 geometry to test IT BigPixels
emiglior Jan 29, 2024
aeb2766
PixelCPE generic_position_formula and new Method for Fraction of Firs…
bardellig Mar 20, 2024
7b84dbd
Fix logic to check presence of a big pixel in Ph2 IT
emiglior Mar 26, 2024
bbc900f
HLT customization for our PR
bardellig Mar 29, 2024
01b4af5
resolve conflicts after PR 44765
emiglior Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
Expand Down Expand Up @@ -88,6 +89,7 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> esTokenTTopo_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> esTokenGeomDet_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> esTokenPTP_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> esTokenPtitp_;
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> esTokenDT_;
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> esTokenCSC_;
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> esTokenGEM_;
Expand Down Expand Up @@ -121,6 +123,7 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet&
esTokenTTopo_(esConsumes()),
esTokenGeomDet_(esConsumes()),
esTokenPTP_(esConsumes()),
esTokenPtitp_(esConsumes()),
esTokenDT_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
Expand Down Expand Up @@ -157,8 +160,9 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev

const GeometricDet* geom = &iSetup.getData(esTokenGeomDet_);
const PTrackerParameters& ptp = iSetup.getData(esTokenPTP_);
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(esTokenPtitp_);
TrackerGeomBuilderFromGeometricDet trackerBuilder;
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptp, tTopo));
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptitp, ptp, tTopo));

edm::ESHandle<DTGeometry> theMuonDT = iSetup.getHandle(esTokenDT_);
edm::ESHandle<CSCGeometry> theMuonCSC = iSetup.getHandle(esTokenCSC_);
Expand Down
3 changes: 3 additions & 0 deletions Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyRcd.h"
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyErrorExtendedRcd.h"
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
#include "CondFormats/Common/interface/Time.h"

#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -59,6 +60,7 @@
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"

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

Expand Down Expand Up @@ -254,6 +256,7 @@ class AlignmentProducerBase {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemGeomToken_;
Expand Down
4 changes: 3 additions & 1 deletion Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed
ttopoToken_(iC.esConsumes<edm::Transition::BeginRun>()),
geomDetToken_(iC.esConsumes<edm::Transition::BeginRun>()),
ptpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
ptitpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
Expand Down Expand Up @@ -431,8 +432,9 @@ void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, cons
if (doTracker_) {
const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_);
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);
TrackerGeomBuilderFromGeometricDet trackerBuilder;
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, *ptp, tTopo));
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, ptitp, *ptp, tTopo));
}

if (doMuon_) {
Expand Down
4 changes: 3 additions & 1 deletion Alignment/LaserAlignment/plugins/LaserAlignment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ LaserAlignment::LaserAlignment(edm::ParameterSet const& theConf)
geomToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
gprToken_(esConsumes()),
stripPedestalsToken_(esConsumes()),
theEvents(0),
Expand Down Expand Up @@ -300,9 +301,10 @@ void LaserAlignment::produce(edm::Event& theEvent, edm::EventSetup const& theSet
// the AlignableTracker object is initialized with the ideal geometry
const GeometricDet* theGeometricDet = &theSetup.getData(geomDetToken_);
const PTrackerParameters* ptp = &theSetup.getData(ptpToken_);
const PTrackerAdditionalParametersPerDet* ptitp = &theSetup.getData(ptitpToken_);

TrackerGeomBuilderFromGeometricDet trackerBuilder;
TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo);
TrackerGeometry* theRefTracker = trackerBuilder.build(&*theGeometricDet, &*ptitp, *ptp, tTopo);

theAlignableTracker = new AlignableTracker(&(*theRefTracker), tTopo);
} else {
Expand Down
1 change: 1 addition & 0 deletions Alignment/LaserAlignment/plugins/LaserAlignment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class LaserAlignment : public edm::one::EDProducer<edm::EndRunProducer> {
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<Alignments, GlobalPositionRcd> gprToken_;
const edm::ESGetToken<SiStripPedestals, SiStripPedestalsRcd> stripPedestalsToken_;

Expand Down
4 changes: 3 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ MillePedeDQMModule ::MillePedeDQMModule(const edm::ParameterSet& config)
: tTopoToken_(esConsumes<edm::Transition::BeginRun>()),
gDetToken_(esConsumes<edm::Transition::BeginRun>()),
ptpToken_(esConsumes<edm::Transition::BeginRun>()),
ptitpToken_(esConsumes<edm::Transition::BeginRun>()),
aliThrToken_(esConsumes<edm::Transition::BeginRun>()),
geomToken_(esConsumes<edm::Transition::BeginRun>()),
outputFolder_(config.getParameter<std::string>("outputFolder")),
Expand Down Expand Up @@ -177,6 +178,7 @@ void MillePedeDQMModule ::beginRun(const edm::Run&, const edm::EventSetup& setup
const TrackerTopology* const tTopo = &setup.getData(tTopoToken_);
const GeometricDet* geometricDet = &setup.getData(gDetToken_);
const PTrackerParameters* ptp = &setup.getData(ptpToken_);
const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_);
const TrackerGeometry* geom = &setup.getData(geomToken_);

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

TrackerGeomBuilderFromGeometricDet builder;

const auto trackerGeometry = builder.build(geometricDet, *ptp, tTopo);
const auto trackerGeometry = builder.build(geometricDet, ptitp, *ptp, tTopo);
tracker_ = std::make_unique<AlignableTracker>(trackerGeometry, tTopo);

const std::string labelerPlugin{"PedeLabeler"};
Expand Down
2 changes: 2 additions & 0 deletions Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
/*** Records for ESWatcher ***/
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

Expand Down Expand Up @@ -97,6 +98,7 @@ class MillePedeDQMModule : public DQMEDHarvester {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> gDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<AlignPCLThresholdsHG, AlignPCLThresholdsHGRcd> aliThrToken_;
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;

Expand Down
1 change: 0 additions & 1 deletion Alignment/OfflineValidation/plugins/OverlapValidation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
Expand Down
6 changes: 4 additions & 2 deletions Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg)
topoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
pixQualityToken_(esConsumes()),
stripQualityToken_(esConsumes()),
referenceTracker(nullptr),
Expand Down Expand Up @@ -392,10 +393,11 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) {

const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_);
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);
TrackerGeomBuilderFromGeometricDet trackerBuilder;

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

//currernt tracker
TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, *ptp, tTopo);
TrackerGeometry* theCurTracker = trackerBuilder.build(&*theGeometricDet, ptitp, *ptp, tTopo);
if (inputFilename2_ != "IDEAL") {
GeometryAligner aligner2;
aligner2.applyAlignments<TrackerGeometry>(
Expand Down
1 change: 1 addition & 0 deletions Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<SiPixelQuality, SiPixelQualityRcd> pixQualityToken_;
const edm::ESGetToken<SiStripQuality, SiStripQualityRcd> stripQualityToken_;

Expand Down
7 changes: 6 additions & 1 deletion Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@
#include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"

#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
Expand Down Expand Up @@ -87,6 +89,7 @@ class TrackerGeometryIntoNtuples : public edm::one::EDAnalyzer<> {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<Alignments, TrackerAlignmentRcd> aliToken_;
const edm::ESGetToken<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd> aliErrorToken_;
const edm::ESGetToken<AlignmentSurfaceDeformations, TrackerSurfaceDeformationRcd> surfDefToken_;
Expand Down Expand Up @@ -134,6 +137,7 @@ TrackerGeometryIntoNtuples::TrackerGeometryIntoNtuples(const edm::ParameterSet&
: topoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
aliToken_(esConsumes()),
aliErrorToken_(esConsumes()),
surfDefToken_(esConsumes()),
Expand Down Expand Up @@ -195,10 +199,11 @@ void TrackerGeometryIntoNtuples::analyze(const edm::Event& iEvent, const edm::Ev
//accessing the initial geometry
const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_);
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);

TrackerGeomBuilderFromGeometricDet trackerBuilder;
//currernt tracker
TrackerGeometry* theCurTracker = trackerBuilder.build(theGeometricDet, *ptp, tTopo);
TrackerGeometry* theCurTracker = trackerBuilder.build(theGeometricDet, ptitp, *ptp, tTopo);

//build the tracker
const Alignments* alignments = &iSetup.getData(aliToken_);
Expand Down
4 changes: 3 additions & 1 deletion Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg)
: tTopoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
aliToken_(esConsumes()),
aliErrToken_(esConsumes()) {
m_inputGeom = cfg.getUntrackedParameter<std::string>("inputGeom");
Expand All @@ -32,7 +33,8 @@ void CreateSurveyRcds::analyze(const edm::Event& event, const edm::EventSetup& s
const TrackerTopology* const tTopo = &setup.getData(tTopoToken_);
const GeometricDet* geom = &setup.getData(geomDetToken_);
const PTrackerParameters& ptp = setup.getData(ptpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo);
const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo);

//take geometry from DB or randomly generate geometry
if (m_inputGeom == "sqlite") {
Expand Down
4 changes: 4 additions & 0 deletions Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"

#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"

#include "Alignment/CommonAlignment/interface/SurveyDet.h"
#include "Alignment/TrackerAlignment/interface/AlignableTracker.h"

Expand Down Expand Up @@ -53,6 +56,7 @@ class CreateSurveyRcds : public SurveyInputBase {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<Alignments, TrackerAlignmentRcd> aliToken_;
const edm::ESGetToken<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd> aliErrToken_;

Expand Down
4 changes: 3 additions & 1 deletion Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SurveyInputTrackerFromDB::SurveyInputTrackerFromDB(const edm::ParameterSet& cfg)
: tTopoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
textFileName(cfg.getParameter<std::string>("textFileName")) {}

void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& setup) {
Expand All @@ -40,7 +41,8 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup&

const GeometricDet* geom = &setup.getData(geomDetToken_);
const PTrackerParameters& ptp = setup.getData(ptpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo);
const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo);

addComponent(new AlignableTracker(tracker, tTopo));
addSurveyInfo(detector());
Expand Down
1 change: 1 addition & 0 deletions Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class SurveyInputTrackerFromDB : public SurveyInputBase {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;

std::string textFileName;

Expand Down
4 changes: 3 additions & 1 deletion Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg)
: tTopoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
ptitpToken_(esConsumes()),
aliToken_(esConsumes()),
textFileName(cfg.getParameter<std::string>("textFileName")) {}

Expand All @@ -30,7 +31,8 @@ void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup&
const TrackerTopology* const tTopo = &setup.getData(tTopoToken_);
const GeometricDet* geom = &setup.getData(geomDetToken_);
const PTrackerParameters& ptp = setup.getData(ptpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptp, tTopo);
const PTrackerAdditionalParametersPerDet* ptitp = &setup.getData(ptitpToken_);
TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(geom, ptitp, ptp, tTopo);

addComponent(new AlignableTracker(tracker, tTopo));

Expand Down
1 change: 1 addition & 0 deletions Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class SurveyMisalignmentInput : public SurveyInputBase {
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
const edm::ESGetToken<Alignments, TrackerAlignmentRcd> aliToken_;

SurveyInputTextReader::MapType uIdMap;
Expand Down
Loading