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

Cleanup and modernize SeedingLayerSetsBuilder #21138

Merged
merged 23 commits into from Nov 14, 2017
Merged

Cleanup and modernize SeedingLayerSetsBuilder #21138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
583ab90
Remove SeedingLayerSetsBuilder::layers() as unused and obsolete
makortel Sep 22, 2017
87deccb
Remove CosmicTrackingRegion::hits(.., ctfseeding::SeedingLayer*) as u…
makortel Sep 22, 2017
3cbaeaf
Remove unnecessary includes of SeedingLayer.h
makortel Sep 22, 2017
0d873a8
Remove all functionality from SeedingLayer as unused and obsolete
makortel Sep 22, 2017
a7f9c13
Remove forward declaration
makortel Sep 22, 2017
97cd12e
Move SeedingLayerSetsHits construction to SeedingLayerSetsBuilder
makortel Sep 25, 2017
e6b9ddf
Minor modernization
makortel Sep 25, 2017
551574a
Deliver also DetLayer vector via pointer for consistency
makortel Sep 25, 2017
c6dcf57
Remove SeedingLayer.h as unnecessary, move enum to more general Track…
makortel Sep 25, 2017
f3de976
Remove unnecessary mutable
makortel Sep 25, 2017
ebfb745
Use unique_ptr
makortel Sep 25, 2017
57af369
Simplify updating from EventSetup
makortel Sep 25, 2017
935b148
Move SeedingLayersEDProducer to fillDescriptions
makortel Oct 2, 2017
d52a98b
Unify layer naming with iterative tracking and reduce copy-paste
makortel Oct 2, 2017
2a09975
Call updateEventSetup inside hits() in SeedingLayerSetsBuilder
makortel Oct 18, 2017
dba7e34
Fix cosmics
makortel Nov 3, 2017
fdb5f67
Change TrackerDetSide to enum class
makortel Nov 9, 2017
d136fc5
Remove spurious ;
makortel Nov 9, 2017
835e3ae
Remove duplicated #include
makortel Nov 9, 2017
3e37411
Add back shink_to_fit
makortel Nov 9, 2017
c781b5d
Streamline the strip mono hit definition in MTV
makortel Nov 10, 2017
38e3f33
Hack for conversion seeding layers
makortel Nov 10, 2017
733226a
Fix typo
makortel Nov 10, 2017
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
6 changes: 6 additions & 0 deletions DataFormats/TrackerCommon/interface/TrackerDetSide.h
View file
Open in desktop
@@ -0,0 +1,6 @@
#ifndef DataFormats_TrackerCommon_TrackerDetSide_H
#define DataFormats_TrackerCommon_TrackerDetSide_H

enum class TrackerDetSide { Barrel = 0, NegEndcap = 1, PosEndcap = 2 };

#endif
1 change: 0 additions & 1 deletion RecoMuon/TrackerSeedGenerator/plugins/TSGFromL1Muon.cc
View file
Open in desktop
Expand Up @@ -30,7 +30,6 @@
#include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeedCollection.h"

using namespace reco;
using namespace ctfseeding;
using namespace l1extra;

template <class T> T sqr( T t) {return t*t;}
Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
#undef Debug

using namespace std;
using namespace ctfseeding;

/*****************************************************************************/
PixelTripletLowPtGenerator::PixelTripletLowPtGenerator( const edm::ParameterSet& cfg, edm::ConsumesCollector& iC):
Expand Down
1 change: 1 addition & 0 deletions RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterByConformalMappingAndLine.h
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@

class TrackerGeometry;
class MagneticField;
class TransientTrackingRecHitBuilder;

class PixelFitterByConformalMappingAndLine : public PixelFitterBase {
public:
Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@
#include <vector>

using namespace pixeltrackfitting;
using namespace ctfseeding;
using edm::ParameterSet;

PixelTrackReconstruction::PixelTrackReconstruction(const ParameterSet& cfg,
Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGenerator.cc
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@ namespace


using namespace std;
using namespace ctfseeding;

constexpr unsigned int CAHitQuadrupletGenerator::minLayers;

Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTriplets/plugins/CAHitTripletGenerator.cc
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@ T sqr(T x)
}

using namespace std;
using namespace ctfseeding;

constexpr unsigned int CAHitTripletGenerator::minLayers;

Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTriplets/plugins/CombinedHitQuadrupletGenerator.cc
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@


using namespace std;
using namespace ctfseeding;

CombinedHitQuadrupletGenerator::CombinedHitQuadrupletGenerator(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC):
theSeedingLayerToken(iC.consumes<SeedingLayerSetsHits>(cfg.getParameter<edm::InputTag>("SeedingLayers")))
Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTriplets/plugins/PixelQuadrupletGenerator.h
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "RecoTracker/TkHitPairs/interface/HitPairGenerator.h"
#include "RecoPixelVertexing/PixelTriplets/interface/HitTripletGeneratorFromPairAndLayers.h"
#include "CombinedHitQuadrupletGenerator.h"
#include "RecoTracker/TkSeedingLayers/interface/SeedingLayer.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "RecoPixelVertexing/PixelTriplets/interface/HitQuadrupletGeneratorFromTripletAndLayers.h"
Expand Down
1 change: 0 additions & 1 deletion RecoPixelVertexing/PixelTriplets/plugins/PixelTripletHLTGenerator.cc
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@ using pixelrecoutilities::LongitudinalBendingCorrection;
using Range=PixelRecoRange<float>;

using namespace std;
using namespace ctfseeding;


PixelTripletHLTGenerator:: PixelTripletHLTGenerator(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC)
Expand Down
78 changes: 24 additions & 54 deletions RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py
View file
Open in desktop
Expand Up @@ -40,27 +40,17 @@

###CKF TOP
combinatorialcosmicseedingtripletsP5Top = copy.deepcopy(combinatorialcosmicseedingtripletsP5)
combinatorialcosmicseedingtripletsP5Top.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingtripletsP5Top.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingtripletsP5Top.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingtripletsP5Top.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingtripletsP5Top.TIB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
combinatorialcosmicseedingtripletsP5Top.MTIB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
combinatorialcosmicseedingtripletsP5Top.TOB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
combinatorialcosmicseedingtripletsP5Top.MTOB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
combinatorialcosmicseedingtripletsP5Top.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingtripletsP5Top.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top = copy.deepcopy(combinatorialcosmicseedingpairsTOBP5)
combinatorialcosmicseedingpairsTOBP5Top.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TIB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
combinatorialcosmicseedingpairsTOBP5Top.MTIB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
combinatorialcosmicseedingpairsTOBP5Top.TOB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
combinatorialcosmicseedingpairsTOBP5Top.MTOB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
combinatorialcosmicseedingpairsTOBP5Top.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Top.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
combinatorialcosmicseedingpairsTECposP5Top = copy.deepcopy(combinatorialcosmicseedingpairsTECposP5)
Expand All @@ -81,15 +71,10 @@
combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[5].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Top"
combinatorialcosmicseedfinderP5Top.MaxNumberOfCosmicClusters = 150
simpleCosmicBONSeedingLayersTop = copy.deepcopy(simpleCosmicBONSeedingLayers)
simpleCosmicBONSeedingLayersTop.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
simpleCosmicBONSeedingLayersTop.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
simpleCosmicBONSeedingLayersTop.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedingLayersTop.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
simpleCosmicBONSeedingLayersTop.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
simpleCosmicBONSeedingLayersTop.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedingLayersTop.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedingLayersTop.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedingLayersTop.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedingLayersTop.TIB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
simpleCosmicBONSeedingLayersTop.MTIB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
simpleCosmicBONSeedingLayersTop.TOB.matchedRecHits = "siStripMatchedRecHitsTop:matchedRecHit"
simpleCosmicBONSeedingLayersTop.MTOB.rphiRecHits = "siStripMatchedRecHitsTop:rphiRecHit"
simpleCosmicBONSeedingLayersTop.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsTop","matchedRecHit")
simpleCosmicBONSeedingLayersTop.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsTop","rphiRecHit")
simpleCosmicBONSeedsTop = copy.deepcopy(simpleCosmicBONSeeds)
Expand Down Expand Up @@ -127,27 +112,17 @@

###CKF BOTTOM
combinatorialcosmicseedingtripletsP5Bottom = copy.deepcopy(combinatorialcosmicseedingtripletsP5)
combinatorialcosmicseedingtripletsP5Bottom.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TIB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
combinatorialcosmicseedingtripletsP5Bottom.MTIB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
combinatorialcosmicseedingtripletsP5Bottom.TOB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
combinatorialcosmicseedingtripletsP5Bottom.MTOB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
combinatorialcosmicseedingtripletsP5Bottom.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingtripletsP5Bottom.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom = copy.deepcopy(combinatorialcosmicseedingpairsTOBP5)
combinatorialcosmicseedingpairsTOBP5Bottom.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TIB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
combinatorialcosmicseedingpairsTOBP5Bottom.MTIB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
combinatorialcosmicseedingpairsTOBP5Bottom.TOB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
combinatorialcosmicseedingpairsTOBP5Bottom.MTOB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
combinatorialcosmicseedingpairsTOBP5Bottom.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
combinatorialcosmicseedingpairsTOBP5Bottom.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
combinatorialcosmicseedingpairsTECposP5Bottom = copy.deepcopy(combinatorialcosmicseedingpairsTECposP5)
Expand All @@ -174,15 +149,10 @@
combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[5].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Bottom"
combinatorialcosmicseedfinderP5Bottom.MaxNumberOfCosmicClusters = 150
simpleCosmicBONSeedingLayersBottom = copy.deepcopy(simpleCosmicBONSeedingLayers)
simpleCosmicBONSeedingLayersBottom.TIB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
simpleCosmicBONSeedingLayersBottom.TIB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
simpleCosmicBONSeedingLayersBottom.TIB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedingLayersBottom.TOB1.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
simpleCosmicBONSeedingLayersBottom.TOB2.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
simpleCosmicBONSeedingLayersBottom.TOB3.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedingLayersBottom.TOB4.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedingLayersBottom.TOB5.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedingLayersBottom.TOB6.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedingLayersBottom.TIB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
simpleCosmicBONSeedingLayersBottom.MTIB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
simpleCosmicBONSeedingLayersBottom.TOB.matchedRecHits = "siStripMatchedRecHitsBottom:matchedRecHit"
simpleCosmicBONSeedingLayersBottom.MTOB.rphiRecHits = "siStripMatchedRecHitsBottom:rphiRecHit"
simpleCosmicBONSeedingLayersBottom.TEC.matchedRecHits = cms.InputTag("siStripMatchedRecHitsBottom","matchedRecHit")
simpleCosmicBONSeedingLayersBottom.TEC.rphiRecHits = cms.InputTag("siStripMatchedRecHitsBottom","rphiRecHit")
simpleCosmicBONSeedsBottom = copy.deepcopy(simpleCosmicBONSeeds)
Expand Down