-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
hlttracking parabolic magnetic field in building and fitting #2291
Changes from 14 commits
b7146fb
5cccc4e
d492a0d
35bd068
03da7a9
160ee6f
a8ac9a4
bd9933c
18c13ca
7e3ec42
7d600ce
b122bdf
35cea7d
ebcb9d9
c845d45
81ece8a
7ad6cae
48a9518
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
navigationSchoolESProducer = cms.ESProducer("NavigationSchoolESProducer", | ||
ComponentName = cms.string('SimpleNavigationSchool') | ||
ComponentName = cms.string('SimpleNavigationSchool'), | ||
SimpleMagneticField = cms.string('ParabolicMf') | ||
) | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,13 +20,18 @@ class SeedFromConsecutiveHitsCreator : public SeedCreator { | |
theBOFFMomentum(cfg.existsAs<double>("SeedMomentumForBOFF") ? cfg.getParameter<double>("SeedMomentumForBOFF") : 5.0), | ||
theOriginTransverseErrorMultiplier(cfg.existsAs<double>("OriginTransverseErrorMultiplier") ? cfg.getParameter<double>("OriginTransverseErrorMultiplier") : 1.0), | ||
theMinOneOverPtError(cfg.existsAs<double>("MinOneOverPtError") ? cfg.getParameter<double>("MinOneOverPtError") : 1.0) | ||
{} | ||
{ | ||
if (cfg.exists("SimpleMagneticField")) { | ||
useSimpleMF = true; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bool useSimpleMF is never initialized (to false): please do it |
||
mfName_ = cfg.getParameter<std::string>("SimpleMagneticField"); | ||
} | ||
} | ||
|
||
SeedFromConsecutiveHitsCreator( | ||
const std::string & propagator = "PropagatorWithMaterial", double seedMomentumForBOFF = -5.0, | ||
double aOriginTransverseErrorMultiplier = 1.0, double aMinOneOverPtError = 1.0) | ||
: thePropagatorLabel(propagator), theBOFFMomentum(seedMomentumForBOFF), | ||
theOriginTransverseErrorMultiplier(aOriginTransverseErrorMultiplier), theMinOneOverPtError(aMinOneOverPtError) { } | ||
theOriginTransverseErrorMultiplier(aOriginTransverseErrorMultiplier), theMinOneOverPtError(aMinOneOverPtError), useSimpleMF(false) { } | ||
|
||
//dtor | ||
virtual ~SeedFromConsecutiveHitsCreator(); | ||
|
@@ -76,6 +81,7 @@ class SeedFromConsecutiveHitsCreator : public SeedCreator { | |
edm::ESHandle<MagneticField> bfield; | ||
float nomField; | ||
bool isBOFF = false; | ||
|
||
bool useSimpleMF; | ||
std::string mfName_; | ||
}; | ||
#endif |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
SeedFromConsecutiveHitsStraightLineCreator = cms.PSet( | ||
ComponentName = cms.string('SeedFromConsecutiveHitsStraightLineCreator'), | ||
propagator = cms.string('PropagatorWithMaterial'), | ||
propagator = cms.string('PropagatorWithMaterialParabolicMf'), | ||
OriginTransverseErrorMultiplier = cms.double(1.0), | ||
MinOneOverPtError = cms.double(1.0) | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
SeedFromConsecutiveHitsTripletOnlyCreator = cms.PSet( | ||
ComponentName = cms.string('SeedFromConsecutiveHitsTripletOnlyCreator'), | ||
propagator = cms.string('PropagatorWithMaterial') | ||
propagator = cms.string('PropagatorWithMaterialParabolicMf') | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,7 @@ void SeedFromProtoTrack::init(const reco::Track & proto, const edm::EventSetup& | |
const Propagator* propagator = &(*propagatorHandle); | ||
|
||
edm::ESHandle<MagneticField> field; | ||
es.get<IdealMagneticFieldRecord>().get(field); | ||
es.get<IdealMagneticFieldRecord>().get(field);//fixme | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is this "fixme" about? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it means that the (optional) simple magnetic field should also be added here but I could not find a simple way to propagate the pset to here (another possibility is to hardcode the name as done for the propagator but I don't like it) |
||
|
||
reco::TrackBase::Point vtx = proto.referencePoint(); | ||
reco::TrackBase::Vector mom = proto.momentum(); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
from TrackingTools.GeomPropagators.AnalyticalPropagator_cfi import AnalyticalPropagator | ||
AnalyticalPropagatorParabolicMF = AnalyticalPropagator.clone( | ||
SimpleMagneticField = cms.string('ParabolicMf'), | ||
ComponentName = cms.string('AnalyticalPropagatorParabolicMf') | ||
) | ||
|
||
from TrackingTools.GeomPropagators.OppositeAnalyticalPropagator_cfi import OppositeAnalyticalPropagator | ||
OppositeAnalyticalPropagatorParabolicMF = OppositeAnalyticalPropagator.clone( | ||
SimpleMagneticField = cms.string('ParabolicMf'), | ||
ComponentName = cms.string('AnalyticalPropagatorParabolicMfOpposite') | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
trackingRecHitPropagator = cms.ESProducer("TrackingRecHitPropagatorESProducer", | ||
ComponentName = cms.string('trackingRecHitPropagator') | ||
ComponentName = cms.string('trackingRecHitPropagator'), | ||
SimpleMagneticField = cms.string('ParabolicMf') | ||
) | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bool useSimpleMF is never initialized (to false): please do it