Skip to content

Commit f26ba75

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47797 from mmusich/mm_add_FillDesc_forCDC_modules_15_0_X
[15.0.X] Miscellaneous updates for modules targeting CDC reconstruction at HLT
2 parents 9947503 + 6532f7d commit f26ba75

File tree

4 files changed

+76
-55
lines changed

4 files changed

+76
-55
lines changed

Diff for: ‎RecoTracker/SpecialSeedGenerators/python/outInSeedsFromStandaloneMuons_cfi.py

+14-13
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,27 @@
77
nSigma = 4., ## was 3 ## TO BE TUNED
88
)
99

10-
outInSeedsFromStandaloneMuons = cms.EDProducer('OutsideInMuonSeeder',
10+
from RecoTracker.SpecialSeedGenerators.outsideInMuonSeeder_cfi import outsideInMuonSeeder
11+
outInSeedsFromStandaloneMuons = outsideInMuonSeeder.clone(
1112
## Input collection of muons, and selection. outerTrack.isNonnull is implicit.
12-
src = cms.InputTag('muons'),
13-
cut = cms.string('pt > 10 && outerTrack.hitPattern.muonStationsWithValidHits >= 2'),
14-
layersToTry = cms.int32(3), # try up to 3 layers where at least one seed is found
15-
hitsToTry = cms.int32(3), # use at most 3 hits from the same layer
13+
src = 'muons',
14+
cut = 'pt > 10 && outerTrack.hitPattern.muonStationsWithValidHits >= 2',
15+
layersToTry = 3, # try up to 3 layers where at least one seed is found
16+
hitsToTry = 3, # use at most 3 hits from the same layer
1617
## Use as state the muon updated ad vertex (True) or the innermost state of the standalone track (False)
17-
fromVertex = cms.bool(True),
18+
fromVertex = True,
1819
## Propagator to go from muon state to TOB/TEC.
19-
muonPropagator = cms.string('SteppingHelixPropagatorAlong'),
20+
muonPropagator = 'SteppingHelixPropagatorAlong',
2021
## Propagator used searching for hits..
21-
trackerPropagator = cms.string('PropagatorWithMaterial'),
22+
trackerPropagator = 'PropagatorWithMaterial',
2223
## How much to rescale the standalone muon uncertainties beforehand
23-
errorRescaleFactor = cms.double(2.0),
24+
errorRescaleFactor = 2.0,
2425
## Chi2MeasurementEstimator used to select hits
25-
hitCollector = cms.string('hitCollectorForOutInMuonSeeds'),
26+
hitCollector = 'hitCollectorForOutInMuonSeeds',
2627
## Eta ranges to search for TOB and TEC
27-
maxEtaForTOB = cms.double(1.8),
28-
minEtaForTEC = cms.double(0.7),
28+
maxEtaForTOB = 1.8,
29+
minEtaForTEC = 0.7,
2930
#### Turn on verbose debugging (to be removed at the end)
30-
debug = cms.untracked.bool(False),
31+
debug = False
3132
)
3233

Diff for: ‎RecoTracker/SpecialSeedGenerators/src/OutsideInMuonSeeder.cc

+40-20
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
55
\author Giovanni Petrucciani
66
*/
77

8-
#include "FWCore/Framework/interface/stream/EDProducer.h"
8+
#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
9+
#include "DataFormats/Math/interface/deltaR.h"
10+
#include "DataFormats/MuonReco/interface/Muon.h"
911
#include "FWCore/Framework/interface/Event.h"
1012
#include "FWCore/Framework/interface/EventSetup.h"
13+
#include "FWCore/Framework/interface/stream/EDProducer.h"
14+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1115
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1216
#include "FWCore/Utilities/interface/InputTag.h"
13-
14-
#include "DataFormats/Math/interface/deltaR.h"
15-
16-
#include "DataFormats/MuonReco/interface/Muon.h"
1717
#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
18+
#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
1819
#include "MagneticField/Engine/interface/MagneticField.h"
19-
#include "TrackingTools/GeomPropagators/interface/Propagator.h"
20-
21-
#include "TrackingTools/TrackRefitter/interface/TrackTransformer.h"
22-
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
23-
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
24-
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
2520
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
26-
#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
2721
#include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
2822
#include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
29-
#include "TrackingTools/MeasurementDet/interface/MeasurementDet.h"
3023
#include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"
31-
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
32-
#include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h"
24+
#include "TrackingTools/GeomPropagators/interface/Propagator.h"
3325
#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimatorBase.h"
34-
#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
35-
#include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
26+
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
27+
#include "TrackingTools/MeasurementDet/interface/MeasurementDet.h"
3628
#include "TrackingTools/PatternTools/interface/TrajMeasLessEstim.h"
29+
#include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
30+
#include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h"
31+
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
32+
#include "TrackingTools/TrackRefitter/interface/TrackTransformer.h"
33+
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
34+
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
3735

3836
class OutsideInMuonSeeder final : public edm::stream::EDProducer<> {
3937
public:
4038
explicit OutsideInMuonSeeder(const edm::ParameterSet &iConfig);
41-
~OutsideInMuonSeeder() override {}
39+
~OutsideInMuonSeeder() override = default;
4240

4341
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;
4442

43+
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
44+
4545
private:
4646
/// Labels for input collections
4747
edm::EDGetTokenT<edm::View<reco::Muon>> src_;
@@ -100,9 +100,10 @@ OutsideInMuonSeeder::OutsideInMuonSeeder(const edm::ParameterSet &iConfig)
100100
errorRescaling_(iConfig.getParameter<double>("errorRescaleFactor")),
101101
trackerPropagatorToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("trackerPropagator")))),
102102
muonPropagatorToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("muonPropagator")))),
103-
measurementTrackerTag_(consumes<MeasurementTrackerEvent>(edm::InputTag("MeasurementTrackerEvent"))),
103+
measurementTrackerTag_(
104+
consumes<MeasurementTrackerEvent>(iConfig.getParameter<edm::InputTag>("measurementTkEvent"))),
104105
estimatorToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("hitCollector")))),
105-
updatorToken_(esConsumes(edm::ESInputTag("", "KFUpdator"))),
106+
updatorToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("updatorLabel")))),
106107
magfieldToken_(esConsumes()),
107108
geometryToken_(esConsumes()),
108109
tkGeometryToken_(esConsumes()),
@@ -320,5 +321,24 @@ void OutsideInMuonSeeder::doDebug(const reco::Track &tk) const {
320321
}
321322
}
322323

324+
void OutsideInMuonSeeder::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
325+
edm::ParameterSetDescription desc;
326+
desc.add<edm::InputTag>("src", edm::InputTag("muons"));
327+
desc.add<std::string>("cut", {});
328+
desc.add<int32_t>("layersToTry", 3);
329+
desc.add<int32_t>("hitsToTry", 3);
330+
desc.add<bool>("fromVertex", true);
331+
desc.add<double>("errorRescaleFactor", 2.0);
332+
desc.add<std::string>("trackerPropagator", {});
333+
desc.add<std::string>("muonPropagator", {});
334+
desc.add<edm::InputTag>("measurementTkEvent", edm::InputTag("MeasurementTrackerEvent"));
335+
desc.add<std::string>("hitCollector", {});
336+
desc.add<std::string>("updatorLabel", "KFUpdator");
337+
desc.add<double>("minEtaForTEC", 0.7);
338+
desc.add<double>("maxEtaForTOB", 1.8);
339+
desc.addUntracked<bool>("debug", false);
340+
descriptions.addWithDefaultLabel(desc);
341+
}
342+
323343
#include "FWCore/Framework/interface/MakerMacros.h"
324344
DEFINE_FWK_MODULE(OutsideInMuonSeeder);

Diff for: ‎RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc

+10-11
Original file line numberDiff line numberDiff line change
@@ -370,17 +370,16 @@ SkippingLayerCosmicNavigationSchoolESProducer::ReturnType SkippingLayerCosmicNav
370370

371371
void SkippingLayerCosmicNavigationSchoolESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
372372
edm::ParameterSetDescription desc;
373-
desc.add<std::string>("ComponentName");
374-
desc.add<bool>("noPXB");
375-
desc.add<bool>("noPXF");
376-
desc.add<bool>("noTIB");
377-
desc.add<bool>("noTID");
378-
desc.add<bool>("noTOB");
379-
desc.add<bool>("noTEC");
380-
desc.add<bool>("selfSearch");
381-
desc.add<bool>("allSelf");
382-
383-
descriptions.addDefault(desc);
373+
desc.add<std::string>("ComponentName", "CosmicNavigationSchool");
374+
desc.add<bool>("noPXB", false);
375+
desc.add<bool>("noPXF", false);
376+
desc.add<bool>("noTIB", false);
377+
desc.add<bool>("noTID", false);
378+
desc.add<bool>("noTOB", false);
379+
desc.add<bool>("noTEC", false);
380+
desc.add<bool>("selfSearch", true);
381+
desc.add<bool>("allSelf", true);
382+
descriptions.addWithDefaultLabel(desc);
384383
}
385384

386385
#include "FWCore/PluginManager/interface/ModuleDef.h"

Diff for: ‎RecoTracker/TkNavigation/python/CosmicsNavigationSchoolESProducer_cfi.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
# ComponentName = cms.string('CosmicNavigationSchool')
66
#)
77

8-
cosmicsNavigationSchoolESProducer = cms.ESProducer("SkippingLayerCosmicNavigationSchoolESProducer",
9-
ComponentName = cms.string('CosmicNavigationSchool'),
10-
noPXB = cms.bool(False),
11-
noPXF = cms.bool(False),
12-
noTIB = cms.bool(False),
13-
noTID = cms.bool(False),
14-
noTOB = cms.bool(False),
15-
noTEC = cms.bool(False),
16-
selfSearch = cms.bool(True),
17-
allSelf = cms.bool(True)
18-
)
8+
from RecoTracker.TkNavigation.skippingLayerCosmicNavigationSchoolESProducer_cfi import skippingLayerCosmicNavigationSchoolESProducer as _skippingLayerCosmicNavigationSchoolESProducer
9+
cosmicsNavigationSchoolESProducer = _skippingLayerCosmicNavigationSchoolESProducer.clone(
10+
ComponentName = 'CosmicNavigationSchool',
11+
noPXB = False,
12+
noPXF = False,
13+
noTIB = False,
14+
noTID = False,
15+
noTOB = False,
16+
noTEC = False,
17+
selfSearch = True,
18+
allSelf = True
19+
)
1920

2021

0 commit comments

Comments
 (0)