Skip to content
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.

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

remove more CMSDEPRECATED_X warnings from RecoTracker #36980

Merged
merged 9 commits into from Feb 23, 2022
Expand Up @@ -17,31 +17,30 @@
//

#include <memory>
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "DataFormats/Math/interface/deltaPhi.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
#include "TrackingTools/PatternTools/interface/Trajectory.h"
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "DataFormats/Math/interface/deltaPhi.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "TrackingTools/PatternTools/interface/Trajectory.h"
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"

class ConversionSeedFilter : public edm::stream::EDProducer<> {
public:
explicit ConversionSeedFilter(const edm::ParameterSet&);
~ConversionSeedFilter() override;
~ConversionSeedFilter() override = default;

private:
void produce(edm::Event&, const edm::EventSetup&) override;
Expand All @@ -65,19 +64,23 @@ class ConversionSeedFilter : public edm::stream::EDProducer<> {
TrajectoryStateOnSurface getTSOS(const reco::Track& tk);
TrajectoryStateOnSurface getTSOS(const Trajectory& tj, const TrajectorySeed& ts);

edm::EDGetTokenT<TrajectorySeedCollection> inputCollSeedPos;
edm::EDGetTokenT<TrajectorySeedCollection> inputCollSeedNeg;
edm::EDGetTokenT<TrajTrackAssociationCollection> inputTrajectory;
double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut;
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken;
const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> mfToken;
const edm::EDGetTokenT<TrajectorySeedCollection> inputCollSeedPos;
const edm::EDGetTokenT<TrajectorySeedCollection> inputCollSeedNeg;
const edm::EDGetTokenT<TrajTrackAssociationCollection> inputTrajectory;
const double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut;

edm::ESHandle<TrackerGeometry> theG;
edm::ESHandle<MagneticField> theMF;
const TrackerGeometry* theG;
const MagneticField* theMF;
uint32_t maxInputSeeds;
bool takeAll;
};

ConversionSeedFilter::ConversionSeedFilter(const edm::ParameterSet& cfg)
: //inputCollTkPos(cfg.getParameter<edm::InputTag>("tkCollectionPos")),
: geomToken(esConsumes()),
mfToken(esConsumes()),
//inputCollTkPos(cfg.getParameter<edm::InputTag>("tkCollectionPos")),
inputCollSeedPos(consumes<TrajectorySeedCollection>(cfg.getParameter<edm::InputTag>("seedCollectionPos"))),
//inputCollTkNeg(cfg.getParameter<edm::InputTag>("tkCollectionNeg")),
inputCollSeedNeg(consumes<TrajectorySeedCollection>(cfg.getParameter<edm::InputTag>("seedCollectionNeg"))),
Expand All @@ -91,8 +94,6 @@ ConversionSeedFilter::ConversionSeedFilter(const edm::ParameterSet& cfg)
produces<TrajectorySeedCollection>();
}

ConversionSeedFilter::~ConversionSeedFilter() {}

void ConversionSeedFilter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
using namespace std;
Expand All @@ -107,8 +108,8 @@ void ConversionSeedFilter::produce(edm::Event& iEvent, const edm::EventSetup& iS
edm::Handle<TrajTrackAssociationCollection> trajTrackAssociations;
iEvent.getByToken(inputTrajectory, trajTrackAssociations);

iSetup.get<TrackerDigiGeometryRecord>().get(theG);
iSetup.get<IdealMagneticFieldRecord>().get(theMF);
theG = &iSetup.getData(geomToken);
theMF = &iSetup.getData(mfToken);

auto result = std::make_unique<TrajectorySeedCollection>();

Expand Down Expand Up @@ -242,11 +243,11 @@ void ConversionSeedFilter::SearchAmongTrajectories(const TrajectorySeedCollectio
TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const TrajectorySeed& ts) {
PTrajectoryStateOnDet state = ts.startingState();
DetId detId(state.detId());
return trajectoryStateTransform::transientState(state, &(theG->idToDet(detId)->surface()), theMF.product());
return trajectoryStateTransform::transientState(state, &(theG->idToDet(detId)->surface()), theMF);
}

TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const reco::Track& tk) {
return trajectoryStateTransform::innerStateOnSurface(tk, *theG.product(), theMF.product());
return trajectoryStateTransform::innerStateOnSurface(tk, *theG, theMF);
}

TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const Trajectory& tj, const TrajectorySeed& ts) {
Expand Down
Expand Up @@ -17,30 +17,32 @@
//

#include <memory>
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "DataFormats/Math/interface/deltaPhi.h"
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "DataFormats/Math/interface/deltaPhi.h"

class ConversionSeedFilterCharge : public edm::global::EDProducer<> {
public:
explicit ConversionSeedFilterCharge(const edm::ParameterSet&);
~ConversionSeedFilterCharge() override;
~ConversionSeedFilterCharge() override = default;

private:
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken;
const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> mfToken;

edm::EDGetTokenT<TrajectorySeedCollection> inputCollPos;
edm::EDGetTokenT<TrajectorySeedCollection> inputCollNeg;
const double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut;
Expand All @@ -49,7 +51,9 @@ class ConversionSeedFilterCharge : public edm::global::EDProducer<> {
};

ConversionSeedFilterCharge::ConversionSeedFilterCharge(const edm::ParameterSet& cfg)
: inputCollPos(consumes<TrajectorySeedCollection>(cfg.getParameter<edm::InputTag>("seedCollectionPos"))),
: geomToken(esConsumes()),
mfToken(esConsumes()),
inputCollPos(consumes<TrajectorySeedCollection>(cfg.getParameter<edm::InputTag>("seedCollectionPos"))),
inputCollNeg(consumes<TrajectorySeedCollection>(cfg.getParameter<edm::InputTag>("seedCollectionNeg"))),
deltaPhiCut(cfg.getParameter<double>("deltaPhiCut")),
deltaCotThetaCut(cfg.getParameter<double>("deltaCotThetaCut")),
Expand All @@ -59,8 +63,6 @@ ConversionSeedFilterCharge::ConversionSeedFilterCharge(const edm::ParameterSet&
produces<TrajectorySeedCollection>();
}

ConversionSeedFilterCharge::~ConversionSeedFilterCharge() {}

void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
using namespace edm;
using namespace std;
Expand All @@ -69,10 +71,8 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons
Handle<TrajectorySeedCollection> pInNeg;
iEvent.getByToken(inputCollNeg, pInNeg);

edm::ESHandle<TrackerGeometry> theG;
iSetup.get<TrackerDigiGeometryRecord>().get(theG);
edm::ESHandle<MagneticField> theMF;
iSetup.get<IdealMagneticFieldRecord>().get(theMF);
const TrackerGeometry* theG = &iSetup.getData(geomToken);
const MagneticField* theMF = &iSetup.getData(mfToken);

auto result = std::make_unique<TrajectorySeedCollection>();
result->reserve(pInPos->size());
Expand All @@ -86,7 +86,7 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons
PTrajectoryStateOnDet state1 = iS1->startingState();
DetId detId1(state1.detId());
TrajectoryStateOnSurface tsos1 =
trajectoryStateTransform::transientState(state1, &(theG->idToDet(detId1)->surface()), theMF.product());
trajectoryStateTransform::transientState(state1, &(theG->idToDet(detId1)->surface()), theMF);
double phi1 = tsos1.globalMomentum().phi();
double cotTheta1 = 1 / tan(tsos1.globalMomentum().theta());
double r1 = tsos1.globalPosition().perp();
Expand All @@ -98,7 +98,7 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons
PTrajectoryStateOnDet state2 = iS2->startingState();
DetId detId2(state2.detId());
TrajectoryStateOnSurface tsos2 =
trajectoryStateTransform::transientState(state2, &(theG->idToDet(detId2)->surface()), theMF.product());
trajectoryStateTransform::transientState(state2, &(theG->idToDet(detId2)->surface()), theMF);

double deltaPhi = fabs(reco::deltaPhi(phi1, tsos2.globalMomentum().phi()));
double deltaCotTheta = fabs(cotTheta1 - 1 / tan(tsos2.globalMomentum().theta()));
Expand Down
Expand Up @@ -2,7 +2,6 @@
#define PhotonConversionFinderFromTracks_H

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down
21 changes: 9 additions & 12 deletions RecoTracker/GeometryESProducer/test/TrackerRecoGeometryAnalyzer.cc
Expand Up @@ -2,15 +2,13 @@
#include <memory>

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
#include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"

Expand All @@ -19,25 +17,24 @@ using namespace std;
class TrackerRecoGeometryAnalyzer : public edm::one::EDAnalyzer<> {
public:
TrackerRecoGeometryAnalyzer(const edm::ParameterSet&);
~TrackerRecoGeometryAnalyzer();
~TrackerRecoGeometryAnalyzer() = default;

void beginJob() override {}
void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
void endJob() override {}
};

TrackerRecoGeometryAnalyzer::TrackerRecoGeometryAnalyzer(const edm::ParameterSet& iConfig) {}
private:
const edm::ESGetToken<GeometricSearchTracker, TrackerRecoGeometryRecord> theGSTToken_;
};

TrackerRecoGeometryAnalyzer::~TrackerRecoGeometryAnalyzer() {}
TrackerRecoGeometryAnalyzer::TrackerRecoGeometryAnalyzer(const edm::ParameterSet& iConfig)
: theGSTToken_(esConsumes()) {}

void TrackerRecoGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;

//
// get the GeometricSearchDet
//
edm::ESHandle<GeometricSearchTracker> track;
iSetup.get<TrackerRecoGeometryRecord>().get(track);
const GeometricSearchTracker* track = &iSetup.getData(theGSTToken_);

//---- testing access to barrelLayers ----
vector<const BarrelDetLayer*> theBarrelLayers = track->barrelLayers();
Expand Down
76 changes: 33 additions & 43 deletions RecoTracker/MeasurementDet/test/MeasurementTrackerTest.cc
@@ -1,39 +1,29 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"

#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/GeometrySurface/interface/PlaneBuilder.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include <FWCore/MessageLogger/interface/MessageLogger.h>

#include <RecoTracker/MeasurementDet/interface/MeasurementTracker.h>
#include <RecoTracker/Record/interface/CkfComponentsRecord.h>
#include "TrackingTools/DetLayers/interface/NavigationSchool.h"
#include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"

#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
#include "MagneticField/VolumeGeometry/interface/MagVolumeOutsideValidity.h"
#include "DataFormats/GeometrySurface/interface/PlaneBuilder.h"

#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
#include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
#include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
#include "TrackPropagation/RungeKutta/interface/defaultRKPropagator.h"
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"

#include "TrackingTools/DetLayers/interface/NavigationSchool.h"
#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"

#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"

namespace {

Expand All @@ -46,33 +36,37 @@ namespace {

} // namespace

class MeasurementTrackerTest : public edm::EDAnalyzer {
class MeasurementTrackerTest : public edm::one::EDAnalyzer<> {
public:
explicit MeasurementTrackerTest(const edm::ParameterSet&);
~MeasurementTrackerTest();
~MeasurementTrackerTest() override = default;

private:
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;

const edm::ESGetToken<MeasurementTracker, CkfComponentsRecord> measTkToken;
const edm::ESGetToken<NavigationSchool, NavigationSchoolRecord> navSchoolToken;
const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> mfToken;
const edm::ESGetToken<Propagator, TrackingComponentsRecord> propToken;

std::string theMeasurementTrackerName;
std::string theNavigationSchoolName;
};

MeasurementTrackerTest::MeasurementTrackerTest(const edm::ParameterSet& iConfig)
: theMeasurementTrackerName(iConfig.getParameter<std::string>("measurementTracker")),
: measTkToken(esConsumes()),
navSchoolToken(esConsumes()),
mfToken(esConsumes()),
propToken(esConsumes(edm::ESInputTag("", "PropagatorWithMaterial"))),
theMeasurementTrackerName(iConfig.getParameter<std::string>("measurementTracker")),
theNavigationSchoolName(iConfig.getParameter<std::string>("navigationSchool")) {}

MeasurementTrackerTest::~MeasurementTrackerTest() {}

void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;

//get the measurementtracker
edm::ESHandle<MeasurementTracker> measurementTracker;
edm::ESHandle<NavigationSchool> navSchool;

iSetup.get<CkfComponentsRecord>().get(theMeasurementTrackerName, measurementTracker);
iSetup.get<NavigationSchoolRecord>().get(theNavigationSchoolName, navSchool);
const MeasurementTracker* measurementTracker = &iSetup.getData(measTkToken);
const NavigationSchool* navSchool = &iSetup.getData(navSchoolToken);

auto const& geom = *(TrackerGeometry const*)(*measurementTracker).geomTracker();
auto const& searchGeom = *(*measurementTracker).geometricSearchTracker();
Expand All @@ -84,12 +78,8 @@ void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventS
std::cout << "number of dets " << dus.size() << std::endl;
std::cout << "Bl/Fw loc " << firstBarrel << '/' << firstForward << std::endl;

edm::ESHandle<MagneticField> magfield;
iSetup.get<IdealMagneticFieldRecord>().get(magfield);

edm::ESHandle<Propagator> propagatorHandle;
iSetup.get<TrackingComponentsRecord>().get("PropagatorWithMaterial", propagatorHandle);
auto const& ANprop = *propagatorHandle;
const MagneticField* magfield = &iSetup.getData(mfToken);
const Propagator& ANprop = iSetup.getData(propToken);

// error (very very small)
ROOT::Math::SMatrixIdentity id;
Expand Down Expand Up @@ -128,7 +118,7 @@ void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventS

for (auto mom : moms) {
TrajectoryStateOnSurface startingStateP(
GlobalTrajectoryParameters(startingPosition, mom, 1, magfield.product()), err, *startingPlane);
GlobalTrajectoryParameters(startingPosition, mom, 1, magfield), err, *startingPlane);
auto tsos = startingStateP;

// auto layer = searchGeom.idToLayer(dus[firstBarrel]->geographicalId());
Expand Down