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

Run3-gex99C Use ESGetToken in RecoHI/HiTracking #36242

Merged
merged 2 commits into from Nov 26, 2021
Merged

Run3-gex99C Use ESGetToken in RecoHI/HiTracking #36242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51db201
Use ESGetToken in RecoHI/HiTracking
Nov 24, 2021
51816aa
Code check
Nov 24, 2021
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
1 change: 0 additions & 1 deletion RecoHI/HiTracking/plugins/HIBestVertexProducer.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "RecoHI/HiTracking/interface/HIBestVertexProducer.h"

#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
#include "DataFormats/Common/interface/ValueMap.h"
#include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include <Math/DistFunc.h>
#include <TMath.h>
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "HIPixelMedianVtxProducer.h"

#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/Event.h"

Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/plugins/HIProtoTrackFilterProducer.cc
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@
#include "FWCore/Utilities/interface/InputTag.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilter.h"
#include "RecoHI/HiTracking/interface/HIProtoTrackFilter.h"
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/plugins/HITrackingRegionProducer.h
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
#include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/Common/interface/DetSetVector.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/src/HICaloCompatibleTrackSelector.cc
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
#include "RecoHI/HiTracking/interface/HICaloCompatibleTrackSelector.h"

#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "DataFormats/Math/interface/deltaR.h"
#include <Math/DistFunc.h>
Expand Down
19 changes: 9 additions & 10 deletions RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc
View file
Open in desktop
@@ -1,13 +1,11 @@
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
Expand Down Expand Up @@ -43,20 +41,22 @@ class HIPixelClusterVtxAnalyzer : public edm::EDAnalyzer {
virtual void analyze(const edm::Event &ev, const edm::EventSetup &es);
int getContainedHits(const std::vector<VertexHit> &hits, double z0, double &chi);

edm::EDGetTokenT<SiPixelRecHitCollection> srcPixels_; //pixel rec hits
const edm::EDGetTokenT<SiPixelRecHitCollection> srcPixels_; //pixel rec hits
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerToken_;

double minZ_;
double maxZ_;
double zStep_;
const double minZ_;
const double maxZ_;
const double zStep_;
const int maxHists_;

edm::Service<TFileService> fs;
int maxHists_;
int counter;
};

/*****************************************************************************/
HIPixelClusterVtxAnalyzer::HIPixelClusterVtxAnalyzer(const edm::ParameterSet &ps)
: srcPixels_(consumes<SiPixelRecHitCollection>(ps.getParameter<edm::InputTag>("pixelRecHits"))),
trackerToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
minZ_(ps.getParameter<double>("minZ")),
maxZ_(ps.getParameter<double>("maxZ")),
zStep_(ps.getParameter<double>("zStep")),
Expand Down Expand Up @@ -90,8 +90,7 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe

// get tracker geometry
if (hRecHits.isValid()) {
edm::ESHandle<TrackerGeometry> trackerHandle;
es.get<TrackerDigiGeometryRecord>().get(trackerHandle);
const auto &trackerHandle = es.getHandle(trackerToken_);
const TrackerGeometry *tgeo = trackerHandle.product();
const SiPixelRecHitCollection *hits = hRecHits.product();

Expand Down