Skip to content

Update mkFit for 12_1_0_pre5 #35652

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 4 commits into from
Oct 19, 2021
Merged

Update mkFit for 12_1_0_pre5 #35652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a72fd4
Update names of (two) parameters in mkFit README
mmasciov Oct 13, 2021
e400333
Set beamspot in mkFit eventOfHits
mmasciov Oct 13, 2021
ed3032c
Use mkfit::BeamSpot constructor
mmasciov Oct 13, 2021
b32639d
Override beamspot parameter in customizeHLTIter0ToMkFit.py
mmasciov Oct 13, 2021
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
4 changes: 2 additions & 2 deletions RecoTracker/MkFit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ $ runTheMatrix.py -l <workflow(s)> --apply 2 --command "--procModifiers tracking

* *m_track_algorithm:* CMSSW track algorithm (used internally for reporting and consistency checks)
* *m_requires_seed_hit_sorting:* do hits on seed tracks need to be sorted (required for seeds that include strip layers)
* *m_require_quality_filter:* is additional post-processing required for result tracks
* *m_require_dupclean_tight:* is tight duplicate removal post-processing required for result tracks
* *m_requires_quality_filter:* is additional post-processing required for result tracks
* *m_requires_dupclean_tight:* is tight duplicate removal post-processing required for result tracks
* *m_params:* IterationParams structure for this iteration
* *m_backward_params:* IterationParams structure for backward search for this iteration
* *m_layer_configs:* std::vector of per-layer parameters
Expand Down
1 change: 1 addition & 0 deletions RecoTracker/MkFit/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<use name="CalibTracker/Records"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/SiPixelObjects"/>
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/SiStripCluster"/>
<use name="DataFormats/SiStripCommon"/>
Expand Down
10 changes: 9 additions & 1 deletion RecoTracker/MkFit/plugins/MkFitEventOfHitsProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
#include "CalibTracker/Records/interface/SiStripQualityRcd.h"

#include "DataFormats/BeamSpot/interface/BeamSpot.h"
#include "DataFormats/SiStripCommon/interface/ConstantsForHardwareSystems.h"
#include "DataFormats/TrackerCommon/interface/TrackerDetSide.h"
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
Expand Down Expand Up @@ -42,6 +43,7 @@ class MkFitEventOfHitsProducer : public edm::global::EDProducer<> {
mkfit::EventOfHits& eventOfHits,
const MkFitGeometry& mkFitGeom) const;

const edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
const edm::EDGetTokenT<MkFitHitWrapper> pixelHitsToken_;
const edm::EDGetTokenT<MkFitHitWrapper> stripHitsToken_;
const edm::EDGetTokenT<MkFitClusterIndexToHit> pixelClusterIndexToHitToken_;
Expand All @@ -56,7 +58,8 @@ class MkFitEventOfHitsProducer : public edm::global::EDProducer<> {
};

MkFitEventOfHitsProducer::MkFitEventOfHitsProducer(edm::ParameterSet const& iConfig)
: pixelHitsToken_{consumes(iConfig.getParameter<edm::InputTag>("pixelHits"))},
: beamSpotToken_{consumes(iConfig.getParameter<edm::InputTag>("beamSpot"))},
pixelHitsToken_{consumes(iConfig.getParameter<edm::InputTag>("pixelHits"))},
stripHitsToken_{consumes(iConfig.getParameter<edm::InputTag>("stripHits"))},
pixelClusterIndexToHitToken_{consumes(iConfig.getParameter<edm::InputTag>("pixelHits"))},
stripClusterIndexToHitToken_{consumes(iConfig.getParameter<edm::InputTag>("stripHits"))},
Expand All @@ -77,6 +80,7 @@ MkFitEventOfHitsProducer::MkFitEventOfHitsProducer(edm::ParameterSet const& iCon
void MkFitEventOfHitsProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;

desc.add("beamSpot", edm::InputTag{"offlineBeamSpot"});
desc.add("pixelHits", edm::InputTag{"mkFitSiPixelHits"});
desc.add("stripHits", edm::InputTag{"mkFitSiStripHits"});
desc.add("usePixelQualityDB", true)->setComment("Use SiPixelQuality DB information");
Expand Down Expand Up @@ -172,6 +176,10 @@ void MkFitEventOfHitsProducer::produce(edm::StreamID iID, edm::Event& iEvent, co

mkfit::StdSeq::Cmssw_LoadHits_End(*eventOfHits);

auto const bs = iEvent.get(beamSpotToken_);
eventOfHits->SetBeamSpot(
mkfit::BeamSpot(bs.x0(), bs.y0(), bs.z0(), bs.sigmaZ(), bs.BeamWidthX(), bs.BeamWidthY(), bs.dxdz(), bs.dydz()));

iEvent.emplace(putToken_, std::move(eventOfHits));
}

Expand Down
1 change: 1 addition & 0 deletions RecoTracker/MkFit/python/customizeHLTIter0ToMkFit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def customizeHLTIter0ToMkFit(process):
minGoodStripCharge = dict(refToPSet_ = 'HLTSiStripClusterChargeCutLoose'),
)
process.hltIter0PFlowCkfTrackCandidatesMkFitEventOfHits = mkFitEventOfHitsProducer_cfi.mkFitEventOfHitsProducer.clone(
beamSpot = "hltOnlineBeamSpot",
pixelHits = "hltIter0PFlowCkfTrackCandidatesMkFitSiPixelHits",
stripHits = "hltIter0PFlowCkfTrackCandidatesMkFitSiStripHits",
)
Expand Down