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

CSC segment fit factored and smatrixed #7864

Merged
merged 19 commits into from
Feb 21, 2015
Merged

CSC segment fit factored and smatrixed #7864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
022182f
remove unused and unwanted file
ptcox Feb 18, 2015
b3e9f69
remove unused and unwanted file
ptcox Feb 18, 2015
7c5ae88
remove CLHEP
ptcox Feb 19, 2015
22def8e
include me42
ptcox Feb 19, 2015
64185f0
fix broken formal structure
ptcox Feb 19, 2015
551ab33
update to run in 74x
ptcox Feb 19, 2015
40ca12d
segment fit using smatrix factored out of algorithms
ptcox Feb 19, 2015
d3b2e37
conditioned version of cscsegfit factored out of cscsegalgost
ptcox Feb 19, 2015
62e9957
logdebug to logverbatim for convenience when dumping
ptcox Feb 19, 2015
5f144b3
back to stream again
ptcox Feb 19, 2015
c09455e
factored out segment fit which now uses smatrix not clhep
ptcox Feb 19, 2015
56fcf99
run on run1 real raw data in 75x
ptcox Feb 19, 2015
beda9ab
run on run2 simulated digis in 75x
ptcox Feb 19, 2015
67fdca4
remove unused variables
ptcox Feb 20, 2015
ce49cd4
fix mem leak due to too much clean up of code
ptcox Feb 20, 2015
25514b7
remove unused variables
ptcox Feb 20, 2015
26e2537
remove unused variables
ptcox Feb 20, 2015
003bb73
remove unused variables
ptcox Feb 20, 2015
b779fc5
fix misnamed header guard
ptcox Feb 20, 2015
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
1 change: 0 additions & 1 deletion RecoLocalMuon/CSCSegment/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<use name="CommonTools/Statistics"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/CSCRecHit"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/GeometryVector"/>
Expand Down
39 changes: 14 additions & 25 deletions RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmDF_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import FWCore.ParameterSet.Config as cms

# The following algorithms looks how far a rechit is from the
# The following DF algorithms looks how far a rechit is from the
# proto segment in terms of its error ellipse. This is different
# from the other algorithms which use a cylinder around the proto
# from SK & TC algorithms which use a cylinder around the proto
# segment and look for rechits within that cylinder
DF_ME1234_1 = cms.PSet(
preClustering = cms.untracked.bool(False),
Expand All @@ -19,7 +19,9 @@
nHitsPerClusterIsShower = cms.int32(20),
minLayersApart = cms.int32(2),
Pruning = cms.untracked.bool(False),
dYclusBoxMax = cms.double(8.0)
dYclusBoxMax = cms.double(8.0),
maxDPhi = cms.double(999.),
maxDTheta = cms.double(999.)
)
DF_ME1234_2 = cms.PSet(
preClustering = cms.untracked.bool(False),
Expand All @@ -36,7 +38,9 @@
nHitsPerClusterIsShower = cms.int32(20),
minLayersApart = cms.int32(2),
Pruning = cms.untracked.bool(False),
dYclusBoxMax = cms.double(12.0)
dYclusBoxMax = cms.double(12.0),
maxDPhi = cms.double(999.),
maxDTheta = cms.double(999.)
)
DF_ME1A = cms.PSet(
preClustering = cms.untracked.bool(False),
Expand All @@ -53,29 +57,14 @@
nHitsPerClusterIsShower = cms.int32(20),
minLayersApart = cms.int32(2),
Pruning = cms.untracked.bool(False),
dYclusBoxMax = cms.double(8.0)
dYclusBoxMax = cms.double(8.0),
maxDPhi = cms.double(999.),
maxDTheta = cms.double(999.)
)
CSCSegAlgoDF = cms.PSet(
chamber_types = cms.vstring('ME1/a',
'ME1/b',
'ME1/2',
'ME1/3',
'ME2/1',
'ME2/2',
'ME3/1',
'ME3/2',
'ME4/1'),
chamber_types = cms.vstring('ME1/a', 'ME1/b', 'ME1/2', 'ME1/3', 'ME2/1', 'ME2/2', 'ME3/1', 'ME3/2', 'ME4/1','ME4/2'),
algo_name = cms.string('CSCSegAlgoDF'),
algo_psets = cms.VPSet(cms.PSet(
DF_ME1234_1
),
cms.PSet(
DF_ME1234_2
),
cms.PSet(
DF_ME1A
)),
parameters_per_chamber_type = cms.vint32(3, 1, 2, 2, 1,
2, 1, 2, 1)
algo_psets = cms.VPSet( cms.PSet(DF_ME1234_1), cms.PSet(DF_ME1234_2), cms.PSet(DF_ME1A) ),
parameters_per_chamber_type = cms.vint32( 3, 1, 2, 2, 1, 2, 1, 2, 1, 2 )
)

22 changes: 3 additions & 19 deletions RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmSK_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,9 @@
dRPhiMax = cms.double(8.0)
)
CSCSegAlgoSK = cms.PSet(
chamber_types = cms.vstring('ME1/a',
'ME1/b',
'ME1/2',
'ME1/3',
'ME2/1',
'ME2/2',
'ME3/1',
'ME3/2',
'ME4/1'),
# vstring chamber_types = {"ME1/a", "ME1/b", "ME1/2", "ME1/3", "ME2/1", "ME2/2", "ME3/1", "ME3/2", "ME4/1", "ME4/2"}
# vint32 parameters_per_chamber_type = {2, 1, 1, 1, 1, 1, 1, 1, 1, 1}
chamber_types = cms.vstring('ME1/a', 'ME1/b', 'ME1/2', 'ME1/3', 'ME2/1', 'ME2/2', 'ME3/1', 'ME3/2', 'ME4/1','ME4/2'),
algo_name = cms.string('CSCSegAlgoSK'),
algo_psets = cms.VPSet(cms.PSet(
SK_ME1234
),
cms.PSet(
SK_ME1A
)),
parameters_per_chamber_type = cms.vint32(2, 1, 1, 1, 1,
1, 1, 1, 1)
algo_psets = cms.VPSet( cms.PSet(SK_ME1234), cms.PSet(SK_ME1A) ),
parameters_per_chamber_type = cms.vint32(2, 1, 1, 1, 1, 1, 1, 1, 1, 1 )
)

20 changes: 3 additions & 17 deletions RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmTC_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,9 @@
dRPhiMax = cms.double(0.6)
)
CSCSegAlgoTC = cms.PSet(
chamber_types = cms.vstring('ME1/a',
'ME1/b',
'ME1/2',
'ME1/3',
'ME2/1',
'ME2/2',
'ME3/1',
'ME3/2',
'ME4/1'),
chamber_types = cms.vstring('ME1/a', 'ME1/b', 'ME1/2', 'ME1/3', 'ME2/1', 'ME2/2', 'ME3/1', 'ME3/2', 'ME4/1','ME4/2'),
algo_name = cms.string('CSCSegAlgoTC'),
algo_psets = cms.VPSet(cms.PSet(
TC_ME1234
),
cms.PSet(
TC_ME1A
)),
parameters_per_chamber_type = cms.vint32(2, 1, 1, 1, 1,
1, 1, 1, 1)
algo_psets = cms.VPSet( cms.PSet(TC_ME1234), cms.PSet(TC_ME1A) ),
parameters_per_chamber_type = cms.vint32( 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 )
)

13 changes: 7 additions & 6 deletions RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
from RecoLocalMuon.CSCSegment.CSCSegmentAlgorithmTC_cfi import *
from RecoLocalMuon.CSCSegment.CSCSegmentAlgorithmDF_cfi import *
from RecoLocalMuon.CSCSegment.CSCSegmentAlgorithmST_cfi import *
# module must be an EDProducer or similar
# =======================================

cscSegments = cms.EDProducer("CSCSegmentProducer",
# Define input
inputObjects = cms.InputTag("csc2DRecHits"),
# Choice of the building algo: 1 SK, 2 TC, 3 DF, 4 ST, ...
algo_type = cms.int32(4),
# std::vector<edm::ParameterSet>
algo_psets = cms.VPSet(cms.PSet(
CSCSegAlgoSK
),
algo_psets = cms.VPSet(
cms.PSet(
CSCSegAlgoSK
),
cms.PSet(
CSCSegAlgoTC
),
Expand All @@ -23,7 +23,8 @@
),
cms.PSet(
CSCSegAlgoST
))
)
)
)