---

yaml --- r: 129678 b: "refs/heads/CMSSW_8_1_X" c: b4bb974 h: "refs/heads/CMSSW_8_1_X"
cms-sw · Mar 7, 2014 · 3724017 · 3724017
1 parent 8e92945
commit 3724017
Show file tree

Hide file tree

Showing 59 changed files with 2,628 additions and 1,986 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_8_1_X": 12b33af54478ad3148d97ade71d9ae645c0dd461
+"refs/heads/CMSSW_8_1_X": b4bb9749585578dd928efe7ebdee3ca8ba75d423
diff --git a/trunk/FWCore/Services/src/InitRootHandlers.cc b/trunk/FWCore/Services/src/InitRootHandlers.cc
@@ -116,7 +116,8 @@ namespace {
           (el_location.find("TDecompChol::Solve") != std::string::npos) ||
           (el_location.find("THistPainter::PaintInit") != std::string::npos) ||
           (el_location.find("TUnixSystem::SetDisplay") != std::string::npos) ||
-          (el_location.find("TGClient::GetFontByName") != std::string::npos)) {
+          (el_location.find("TGClient::GetFontByName") != std::string::npos) ||
+          (el_message.find("nbins is <=0 - set to nbins = 1") != std::string::npos)) {
         el_severity = SeverityLevel::kInfo;
       }
 

diff --git a/...uon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDriftFromDB_CosmicData_cfi.py b/...uon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDriftFromDB_CosmicData_cfi.py
@@ -13,14 +13,16 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftFromDBAlgo_CosmicData,
-        segmCleanerMode = cms.int32(1),
         AlphaMaxPhi = cms.double(100.0),
+        AlphaMaxTheta = cms.double(100.0),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(100.0),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator and
         performT0SegCorrection = cms.bool(False),
         performT0_vdriftSegCorrection = cms.bool(False),

diff --git a/.../RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDriftFromDB_cfi.py b/.../RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDriftFromDB_cfi.py
@@ -13,14 +13,16 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftFromDBAlgo,
-        segmCleanerMode = cms.int32(2),
         AlphaMaxPhi = cms.double(1.0),
+        AlphaMaxTheta = cms.double(0.9),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(2),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(0.9),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0_vdriftSegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),

diff --git a/...LocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDrift_CosmicData_cfi.py b/...LocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDrift_CosmicData_cfi.py
@@ -13,14 +13,16 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftAlgo_CosmicData,
-        segmCleanerMode = cms.int32(1),
         AlphaMaxPhi = cms.double(100.0),
+        AlphaMaxTheta = cms.double(100.0),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(100.0),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for the Updator and T0 fit segment 
         performT0_vdriftSegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_LinearDrift_cfi.py
@@ -13,14 +13,16 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftAlgo,
-        segmCleanerMode = cms.int32(2),
         AlphaMaxPhi = cms.double(1.0),
+        AlphaMaxTheta = cms.double(0.9),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(2),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(0.9),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator and
         hit_afterT0_resolution = cms.double(0.03),
         performT0_vdriftSegCorrection = cms.bool(False),

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_ParamDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco2DAlgo_ParamDrift_cfi.py
@@ -13,14 +13,16 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTParametrizedDriftAlgo,
-        segmCleanerMode = cms.int32(2),
         AlphaMaxPhi = cms.double(1.0),
+        AlphaMaxTheta = cms.double(0.9),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(2),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(0.9),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator and
         performT0SegCorrection = cms.bool(False),
         performT0_vdriftSegCorrection = cms.bool(False),

diff --git a/...uon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDriftFromDB_CosmicData_cfi.py b/...uon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDriftFromDB_CosmicData_cfi.py
@@ -18,17 +18,20 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftFromDBAlgo_CosmicData,
-        segmCleanerMode = cms.int32(1),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator and
         performT0SegCorrection = cms.bool(False),
         performT0_vdriftSegCorrection = cms.bool(False),

diff --git a/.../RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDriftFromDB_cfi.py b/.../RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDriftFromDB_cfi.py
@@ -19,14 +19,17 @@
         # this is the RecHit1D algo!!
         DTLinearDriftFromDBAlgo,
         debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0SegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),

diff --git a/...LocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDrift_CosmicData_cfi.py b/...LocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDrift_CosmicData_cfi.py
@@ -18,17 +18,20 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftAlgo_CosmicData,
-        segmCleanerMode = cms.int32(1),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for the Updator and T0 fit segment 
         performT0SegCorrection = cms.bool(False),
         performT0_vdriftSegCorrection = cms.bool(False),

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_LinearDrift_cfi.py
@@ -20,12 +20,14 @@
         DTCombinatorialPatternReco2DAlgo_LinearDrift,
         debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0SegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_ParamDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTCombinatorialPatternReco4DAlgo_ParamDrift_cfi.py
@@ -20,12 +20,14 @@
         DTParametrizedDriftAlgo,
         debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0SegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),

diff --git a/...RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDriftFromDBLoose_cfi.py b/...RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDriftFromDBLoose_cfi.py
@@ -15,20 +15,20 @@
         DTLinearDriftFromDBAlgo,
         AlphaMaxPhi = cms.double(100.0),
         AlphaMaxTheta = cms.double(100.),
-        MaxChi2 = cms.double(4.0),
-        MaxT0 = cms.double(100.0),
-        MinT0 = cms.double(-100.0),
+        MaxChi2 = cms.double(8.0),
         MaxAllowedHits = cms.uint32(50),
         debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
         segmCleanerMode = cms.int32(2),
         nSharedHitsMax = cms.int32(2),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0_vdriftSegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),
         performT0SegCorrection = cms.bool(False),
-        perform_delta_rejecting = cms.bool(True)
+        perform_delta_rejecting = cms.bool(False)
     ),
     Reco2DAlgoName = cms.string('DTMeantimerPatternReco')
 )

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDriftFromDB_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDriftFromDB_cfi.py
@@ -15,20 +15,20 @@
         DTLinearDriftFromDBAlgo,
         AlphaMaxPhi = cms.double(1.0),
         AlphaMaxTheta = cms.double(0.9),
-        MaxChi2 = cms.double(4.0),
-        MaxT0 = cms.double(100.0),
-        MinT0 = cms.double(-100.0),
+        MaxChi2 = cms.double(8.0),
         MaxAllowedHits = cms.uint32(50),
         debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
         segmCleanerMode = cms.int32(2),
         nSharedHitsMax = cms.int32(2),
         nUnSharedHitsMin = cms.int32(2),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0_vdriftSegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),
         performT0SegCorrection = cms.bool(False),
-        perform_delta_rejecting = cms.bool(True)
+        perform_delta_rejecting = cms.bool(False)
     ),
     Reco2DAlgoName = cms.string('DTMeantimerPatternReco')
 )
diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_LinearDrift_cfi.py
@@ -13,17 +13,22 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTLinearDriftAlgo,
-        segmCleanerMode = cms.int32(1),
         AlphaMaxPhi = cms.double(1.0),
+        AlphaMaxTheta = cms.double(0.1),
         MaxChi2 = cms.double(8.0),
-        MaxT0 = cms.double(50.0),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(0.1),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
-        MinT0 = cms.double(-10.0)
+
+        # Parameters for  T0 fit segment in the Updator 
+        performT0_vdriftSegCorrection = cms.bool(False),
+        hit_afterT0_resolution = cms.double(0.03),
+        performT0SegCorrection = cms.bool(False),
+        perform_delta_rejecting = cms.bool(False)
     ),
     Reco2DAlgoName = cms.string('DTMeantimerPatternReco')
 )

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_ParamDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco2DAlgo_ParamDrift_cfi.py
@@ -13,17 +13,22 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTParametrizedDriftAlgo,
-        segmCleanerMode = cms.int32(1),
         AlphaMaxPhi = cms.double(1.0),
+        AlphaMaxTheta = cms.double(0.1),
         MaxChi2 = cms.double(8.0),
-        MaxT0 = cms.double(50.0),
         MaxAllowedHits = cms.uint32(50),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        AlphaMaxTheta = cms.double(0.1),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
-        MinT0 = cms.double(-10.0)
+
+        # Parameters for  T0 fit segment in the Updator 
+        performT0_vdriftSegCorrection = cms.bool(False),
+        hit_afterT0_resolution = cms.double(0.03),
+        performT0SegCorrection = cms.bool(False),
+        perform_delta_rejecting = cms.bool(False)
     ),
     Reco2DAlgoName = cms.string('DTMeantimerPatternReco')
 )

diff --git a/...RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDriftFromDBLoose_cfi.py b/...RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDriftFromDBLoose_cfi.py
@@ -19,19 +19,22 @@
         # this are the RecSegment2D algo parameters!
         DTMeantimerPatternReco2DAlgo_LinearDriftFromDBLoose,
         debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0SegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),
         performT0_vdriftSegCorrection = cms.bool(False),
-        perform_delta_rejecting = cms.bool(True)
+        perform_delta_rejecting = cms.bool(False)
     )
 )
 
diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDriftFromDB_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDriftFromDB_cfi.py
@@ -19,19 +19,22 @@
         # this are the RecSegment2D algo parameters!
         DTMeantimerPatternReco2DAlgo_LinearDriftFromDB,
         debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits
         # If false the theta segment will be taken from the Event. Caveat: in this case the
         # event must contain the 2D segments!
         AllDTRecHits = cms.bool(True),
+
         # Parameters for  T0 fit segment in the Updator 
         performT0SegCorrection = cms.bool(False),
         hit_afterT0_resolution = cms.double(0.03),
         performT0_vdriftSegCorrection = cms.bool(False),
-        perform_delta_rejecting = cms.bool(True)
+        perform_delta_rejecting = cms.bool(False)
     )
 )
 
diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_LinearDrift_cfi.py
@@ -18,11 +18,13 @@
         DTLinearDriftAlgo,
         # this are the RecSegment2D algo parameters!
         DTMeantimerPatternReco2DAlgo_LinearDrift,
-        segmCleanerMode = cms.int32(1),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits

diff --git a/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_ParamDrift_cfi.py b/trunk/RecoLocalMuon/DTSegment/python/DTMeantimerPatternReco4DAlgo_ParamDrift_cfi.py
@@ -18,11 +18,13 @@
         # Parameters for the updator
         # this is the RecHit1D algo!!
         DTParametrizedDriftAlgo,
-        segmCleanerMode = cms.int32(1),
+        debug = cms.untracked.bool(False),
+
         # Parameters for the cleaner
+        segmCleanerMode = cms.int32(1),
         nSharedHitsMax = cms.int32(2),
-        debug = cms.untracked.bool(False),
         nUnSharedHitsMin = cms.int32(2),
+
         # the input type. 
         # If true the instructions in setDTRecSegment2DContainer will be schipped and the 
         # theta segment will be recomputed from the 1D rechits