Skip to content

Commit

Permalink
address further code review
Browse files Browse the repository at this point in the history
  • Loading branch information
@bendavid
bendavid committed Jan 17, 2019
1 parent 9cec85f commit e1a553e
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 64 deletions.
18 changes: 8 additions & 10 deletions CommonTools/RecoAlgos/plugins/TOFPIDProducer.cc
View file
Expand Up @@ -79,8 +79,7 @@ TOFPIDProducer::TOFPIDProducer(const ParameterSet& iConfig) :
}

// Configuration descriptions
void
TOFPIDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
void TOFPIDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("tracksSrc", edm::InputTag("generalTracks"))->
setComment("Input tracks collection");
Expand All @@ -105,7 +104,9 @@ TOFPIDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
desc.add<double>("maxDtSignificance", 5.0)->
setComment("Maximum distance in time (normalized by uncertainty) for track-primary vertex association for particle id");
desc.add<double>("minProbHeavy", 0.75)->
setComment("Minimum probability for a particle to be a kaon or proton before reassigning the timestamp");
setComment("Minimum probability for a particle to be a kaon or proton before reassigning the timestamp");

descriptions.add("tofPIDProducer", desc);
}

template <class H, class T>
Expand All @@ -117,9 +118,7 @@ void TOFPIDProducer::fillValueMap(edm::Event& iEvent, const edm::Handle<H>& hand
iEvent.put(std::move(out),name);
}

void TOFPIDProducer::produce( edm::Event& ev,
const edm::EventSetup& es ) {

void TOFPIDProducer::produce( edm::Event& ev, const edm::EventSetup& es ) {
constexpr double m_k = 0.493677; //[GeV]
constexpr double m_p = 0.9382720813; //[GeV]
constexpr double c_cm_ns = CLHEP::c_light*CLHEP::ns/CLHEP::cm; //[cm/ns]
Expand Down Expand Up @@ -184,7 +183,6 @@ void TOFPIDProducer::produce( edm::Event& ev,

double rsigmazsq = 1./track.dzError()/track.dzError();
double rsigmat = 1./sigmatmtd;
// double rsigmatsq = rsigmat*rsigmat;

//find associated vertex
int vtxidx = -1;
Expand Down Expand Up @@ -248,9 +246,9 @@ void TOFPIDProducer::produce( edm::Event& ev,
sigmat0safe = sigmatmtd;
}

float tmtd = tmtdIn[trackref];
float pathlength = pathLengthIn[trackref];
float magp = pIn[trackref];
double tmtd = tmtdIn[trackref];
double pathlength = pathLengthIn[trackref];
double magp = pIn[trackref];

double gammasq_k = 1. + magp*magp/m_k/m_k;
double beta_k = std::sqrt(1.-1./gammasq_k);
Expand Down
16 changes: 0 additions & 16 deletions CommonTools/RecoAlgos/python/TOFPIDProducer_cfi.py
View file

This file was deleted.

4 changes: 4 additions & 0 deletions CommonTools/RecoAlgos/python/tofPID_cfi.py
View file
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

from CommonTools.RecoAlgos.tofPIDProducer_cfi import tofPIDProducer
tofPID = tofPIDProducer.clone()
12 changes: 6 additions & 6 deletions RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc
View file
Expand Up @@ -310,11 +310,11 @@ void TrackExtenderWithMTDT<TrackCollection>::produce( edm::Event& ev,
//create the track
output->push_back(result);
pathLengthsRaw.push_back(pathLength);
tmtdRaw.push_back(tmtd);
sigmatmtdRaw.push_back(sigmatmtd);
tmtdRaw.push_back(tmtd);
sigmatmtdRaw.push_back(sigmatmtd);
pathLengthMap = pathLength;
tmtdMap = tmtd;
sigmatmtdMap = sigmatmtd;
tmtdMap = tmtd;
sigmatmtdMap = sigmatmtd;
auto& backtrack = output->back();
pMap = backtrack.p();
betaMap = backtrack.beta();
Expand Down Expand Up @@ -444,8 +444,8 @@ reco::Track TrackExtenderWithMTDT<TrackCollection>::buildTrack(const reco::Track
const Propagator* thePropagator,
bool hasMTD,
float& pathLengthOut,
float& tmtdOut,
float& sigmatmtdOut) const {
float& tmtdOut,
float& sigmatmtdOut) const {

// get the state closest to the beamline
TrajectoryStateOnSurface stateForProjectionToBeamLineOnSurface =
Expand Down
31 changes: 31 additions & 0 deletions RecoVertex/Configuration/python/RecoVertex_cff.py
View file
Expand Up @@ -33,4 +33,35 @@
)
vertexreco = cms.Sequence(vertexrecoTask)

#modifications for timing
#from RecoVertex.Configuration.RecoVertex_phase2_timing_cff import _phase2_tktiming_vertexrecoTask, unsortedOfflinePrimaryVertices4D, offlinePrimaryVertices4D, offlinePrimaryVertices4DWithBS, DA2D_vectParameters
from RecoVertex.Configuration.RecoVertex_phase2_timing_cff import *
_phase2_tktiming_vertexrecoTask = cms.Task( vertexrecoTask.copy() ,
tpClusterProducer ,
quickTrackAssociatorByHits ,
trackTimeValueMapProducer ,
unsortedOfflinePrimaryVertices4DnoPID ,
trackWithVertexRefSelectorBeforeSorting4DnoPID ,
trackRefsForJetsBeforeSorting4DnoPID ,
offlinePrimaryVertices4DnoPID ,
offlinePrimaryVertices4DnoPIDWithBS,
tofPID,
unsortedOfflinePrimaryVertices4Dfastsim,
trackWithVertexRefSelectorBeforeSorting4Dfastsim ,
trackRefsForJetsBeforeSorting4Dfastsim ,
offlinePrimaryVertices4Dfastsim,
offlinePrimaryVertices4DfastsimWithBS,
unsortedOfflinePrimaryVertices3D,
trackWithVertexRefSelectorBeforeSorting3D ,
trackRefsForJetsBeforeSorting3D,
offlinePrimaryVertices3D,
offlinePrimaryVertices3DWithBS,
)

from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
phase2_timing.toReplaceWith(vertexrecoTask, _phase2_tktiming_vertexrecoTask)
phase2_timing.toReplaceWith(unsortedOfflinePrimaryVertices, unsortedOfflinePrimaryVertices4D)
phase2_timing.toReplaceWith(offlinePrimaryVertices, offlinePrimaryVertices4D)
phase2_timing.toReplaceWith(offlinePrimaryVerticesWithBS, offlinePrimaryVertices4DWithBS)
phase2_timing.toModify(offlinePrimaryVertices, vertices = "unsortedOfflinePrimaryVertices", particles = "trackRefsForJetsBeforeSorting")
phase2_timing.toModify(offlinePrimaryVerticesWithBS, vertices = "unsortedOfflinePrimaryVertices:WithBS", particles = "trackRefsForJetsBeforeSorting")
33 changes: 1 addition & 32 deletions RecoVertex/Configuration/python/RecoVertex_phase2_timing_cff.py
View file
Expand Up @@ -2,9 +2,7 @@
from RecoVertex.Configuration.RecoVertex_cff import unsortedOfflinePrimaryVertices, trackWithVertexRefSelector, trackRefsForJets, sortedPrimaryVertices, offlinePrimaryVertices, offlinePrimaryVerticesWithBS,vertexrecoTask

from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA2D_vectParameters
DA2D_vectParameters.TkDAClusParameters.verbose = cms.untracked.bool(False)
unsortedOfflinePrimaryVertices4DnoPID = unsortedOfflinePrimaryVertices.clone( verbose = cms.untracked.bool(False),
TkClusParameters = DA2D_vectParameters,
unsortedOfflinePrimaryVertices4DnoPID = unsortedOfflinePrimaryVertices.clone(TkClusParameters = DA2D_vectParameters,
TrackTimesLabel = cms.InputTag("trackExtenderWithMTD:generalTrackt0"),
TrackTimeResosLabel = cms.InputTag("trackExtenderWithMTD:generalTracksigmat0"),
)
Expand Down Expand Up @@ -75,32 +73,3 @@
from SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi import quickTrackAssociatorByHits
from SimTracker.TrackAssociation.trackTimeValueMapProducer_cfi import trackTimeValueMapProducer
from CommonTools.RecoAlgos.TOFPIDProducer_cfi import tofPID
_phase2_tktiming_vertexrecoTask = cms.Task( vertexrecoTask.copy() ,
tpClusterProducer ,
quickTrackAssociatorByHits ,
trackTimeValueMapProducer ,
unsortedOfflinePrimaryVertices4DnoPID ,
trackWithVertexRefSelectorBeforeSorting4DnoPID ,
trackRefsForJetsBeforeSorting4DnoPID ,
offlinePrimaryVertices4DnoPID ,
offlinePrimaryVertices4DnoPIDWithBS,
tofPID,
unsortedOfflinePrimaryVertices4Dfastsim,
trackWithVertexRefSelectorBeforeSorting4Dfastsim ,
trackRefsForJetsBeforeSorting4Dfastsim ,
offlinePrimaryVertices4Dfastsim,
offlinePrimaryVertices4DfastsimWithBS,
unsortedOfflinePrimaryVertices3D,
trackWithVertexRefSelectorBeforeSorting3D ,
trackRefsForJetsBeforeSorting3D,
offlinePrimaryVertices3D,
offlinePrimaryVertices3DWithBS,
)

from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
phase2_timing.toReplaceWith(vertexrecoTask, _phase2_tktiming_vertexrecoTask)
phase2_timing.toReplaceWith(unsortedOfflinePrimaryVertices, unsortedOfflinePrimaryVertices4D)
phase2_timing.toReplaceWith(offlinePrimaryVertices, offlinePrimaryVertices4D)
phase2_timing.toReplaceWith(offlinePrimaryVerticesWithBS, offlinePrimaryVertices4DWithBS)
phase2_timing.toModify(offlinePrimaryVertices, vertices = "unsortedOfflinePrimaryVertices", particles = "trackRefsForJetsBeforeSorting")
phase2_timing.toModify(offlinePrimaryVerticesWithBS, vertices = "unsortedOfflinePrimaryVertices:WithBS", particles = "trackRefsForJetsBeforeSorting")
1 change: 1 addition & 0 deletions RecoVertex/PrimaryVertexProducer/python/TkClusParameters_cff.py
View file
Expand Up @@ -32,6 +32,7 @@
DA2D_vectParameters = cms.PSet(
algorithm = cms.string("DA2D_vect"),
TkDAClusParameters = cms.PSet(
verbose = cms.untracked.bool(False),
coolingFactor = cms.double(0.6), # moderate annealing speed
Tmin = cms.double(4.0), # end of vertex splitting
Tpurge = cms.double(4.0), # cleaning
Expand Down

0 comments on commit e1a553e

Please sign in to comment.