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.

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

Jump to bottom

Remove CMS deprecation warnings from CheckHitPattern #39748

Merged
merged 1 commit into from Oct 19, 2022
Merged

Remove CMS deprecation warnings from CheckHitPattern #39748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions PhysicsTools/RecoUtils/interface/CheckHitPattern.h
View file
Open in desktop
Expand Up @@ -9,8 +9,6 @@
* if used seriously it needs to be optimized and used properly...
*/

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "RecoVertex/VertexPrimitives/interface/VertexState.h"
#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
Expand All @@ -21,6 +19,7 @@
class DetId;

class TrackerTopology;
class TrackerGeometry;

class CheckHitPattern {
public:
Expand All @@ -39,7 +38,7 @@ class CheckHitPattern {
static void print(const reco::Track& track);

// Create map indicating r/z values of all layers/disks.
void init(const edm::EventSetup& iSetup);
void init(const TrackerTopology* tTopo, const TrackerGeometry& geom, const TransientTrackBuilder& builder);

// Return a pair<uint32, uint32> consisting of the numbers used by HitPattern to
// identify subdetector and layer number respectively.
Expand All @@ -61,7 +60,7 @@ class CheckHitPattern {
RZrangeMap rangeRorZ_;

// Makes TransientTracks needed for vertex fitting.
edm::ESHandle<TransientTrackBuilder> trkTool_;
const TransientTrackBuilder* trkTool_ = nullptr;
};

#endif
18 changes: 5 additions & 13 deletions PhysicsTools/RecoUtils/src/CheckHitPattern.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "PhysicsTools/RecoUtils/interface/CheckHitPattern.h"

// To get Tracker Geometry
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand All @@ -18,24 +17,17 @@
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

void CheckHitPattern::init(const edm::EventSetup& iSetup) {
//Retrieve tracker topology from geometry
edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
const TrackerTopology* const tTopo = tTopoHandle.product();

iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", trkTool_); // Needed for vertex fits

void CheckHitPattern::init(const TrackerTopology* tTopo,
const TrackerGeometry& geom,
const TransientTrackBuilder& builder) {
trkTool_ = &builder;
//
// Note min/max radius (z) of each barrel layer (endcap disk).
//

geomInitDone_ = true;

// Get Tracker geometry
edm::ESHandle<TrackerGeometry> trackerGeometry;
iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
const TrackingGeometry::DetContainer& dets = trackerGeometry->dets();
const TrackingGeometry::DetContainer& dets = geom.dets();

// Loop over all modules in the Tracker.
for (unsigned int i = 0; i < dets.size(); i++) {
Expand Down