Merge pull request #11393 from fwyzard/multithreading_74x_CSC

multithreading fix for 74x: CSC modules
cms-sw · Oct 9, 2015 · a1a958e · a1a958e
2 parents 656105d + 5751c57
commit a1a958e
Show file tree

Hide file tree

Showing 33 changed files with 2,220 additions and 2,919 deletions.
diff --git a/RecoLocalMuon/CSCSegment/BuildFile.xml b/RecoLocalMuon/CSCSegment/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="CommonTools/Statistics"/>
-<use   name="DataFormats/CLHEP"/>
 <use   name="DataFormats/CSCRecHit"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/GeometryVector"/>

diff --git a/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmDF_cfi.py b/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmDF_cfi.py
@@ -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),
@@ -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),
@@ -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),
@@ -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 )
 )
 
diff --git a/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmSK_cfi.py b/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmSK_cfi.py
@@ -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 )
 )
 
diff --git a/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmTC_cfi.py b/RecoLocalMuon/CSCSegment/python/CSCSegmentAlgorithmTC_cfi.py
@@ -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 )
 )
 
diff --git a/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py b/RecoLocalMuon/CSCSegment/python/cscSegments_cfi.py
@@ -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
         ), 
@@ -23,7 +23,8 @@
         ), 
         cms.PSet(
             CSCSegAlgoST
-        ))
+        )
+     )
 )