---

yaml --- r: 77554 b: "refs/heads/CMSSW_7_1_X" c: 026c82a h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Nov 10, 2009 · 01f58e9 · 01f58e9
1 parent 08a0490
commit 01f58e9
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 70 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": ae2871f29e93a739a2ed5c383acd5d2e4a5eddc3
+"refs/heads/CMSSW_7_1_X": 026c82a8a7a3f1437bd9f5423bca216a44e847e9
diff --git a/trunk/HLTrigger/Configuration/python/HLT_1E31_cff.py b/trunk/HLTrigger/Configuration/python/HLT_1E31_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_3_4_0/pre6/1E31/V3 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/1E31/V4 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/1E31/V3')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/1E31/V4')
 )
 
 
@@ -2439,10 +2439,7 @@
     MuonCollectionLabel = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
     L3TrajBuilderParameters = cms.PSet( 
       ScaleTECxFactor = cms.double( -1.0 ),
-      StateOnTrackerBoundOutPropagator = cms.string( "SmartPropagatorAny" ),
-      TransformerOutPropagator = cms.string( "SmartPropagatorAny" ),
       ScaleTECyFactor = cms.double( -1.0 ),
-      Direction = cms.int32( 0 ),
       TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
       MuonTrackingRegionBuilder = cms.PSet( 
         EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
@@ -2465,9 +2462,7 @@
         UseVertex = cms.bool( False ),
         EscapePt = cms.double( 1.5 )
       ),
-      TkTrackBuilder = cms.string( "muonCkfTrajectoryBuilder" ),
       TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ),
-      MatcherOutPropagator = cms.string( "SmartPropagator" ),
       GlobalMuonTrackMatcher = cms.PSet( 
         MinP = cms.double( 2.5 ),
         MinPt = cms.double( 1.0 ),
@@ -2486,7 +2481,8 @@
         DeltaRCut_3 = cms.double( 1.0 ),
         Quality_1 = cms.double( 20.0 ),
         Quality_2 = cms.double( 15.0 ),
-        Quality_3 = cms.double( 7.0 )
+        Quality_3 = cms.double( 7.0 ),
+        Propagator = cms.string( "SmartPropagator" )
       ),
       tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2" ),
       MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2498,21 +2494,19 @@
         Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
         RefitDirection = cms.string( "insideOut" ),
-        RefitRPCHits = cms.bool( True )
+        RefitRPCHits = cms.bool( True ),
+        Propagator = cms.string( "SmartPropagatorAny" )
       ),
       PtCut = cms.double( 1.0 ),
-      KFFitter = cms.string( "L3MuKFFitter" ),
       GlbRefitterParameters = cms.PSet( 
         DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
         CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
-        RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ),
         MuonHitsOption = cms.int32( 1 ),
         Chi2CutCSC = cms.double( 150.0 ),
         Chi2CutDT = cms.double( 10.0 ),
         Chi2CutRPC = cms.double( 1.0 ),
         HitThreshold = cms.int32( 1 ),
         Fitter = cms.string( "L3MuKFFitter" ),
-        Smoother = cms.string( "KFSmootherForRefitInsideOut" ),
         Propagator = cms.string( "SmartPropagatorAny" ),
         TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2540,7 +2534,6 @@
       Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
       MuonUpdatorAtVertexParameters = cms.PSet( 
         MaxChi2 = cms.double( 1000000.0 ),
-        BeamSpotPosition = cms.vdouble( 0.0, 0.0, 0.0 ),
         Propagator = cms.string( "SteppingHelixPropagatorOpposite" ),
         BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 )
       ),

diff --git a/trunk/HLTrigger/Configuration/python/HLT_8E29_cff.py b/trunk/HLTrigger/Configuration/python/HLT_8E29_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_3_4_0/pre6/8E29/V3 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/8E29/V4 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/8E29/V3')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/8E29/V4')
 )
 
 
@@ -2130,10 +2130,7 @@
     MuonCollectionLabel = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
     L3TrajBuilderParameters = cms.PSet( 
       ScaleTECxFactor = cms.double( -1.0 ),
-      StateOnTrackerBoundOutPropagator = cms.string( "SmartPropagatorAny" ),
-      TransformerOutPropagator = cms.string( "SmartPropagatorAny" ),
       ScaleTECyFactor = cms.double( -1.0 ),
-      Direction = cms.int32( 0 ),
       TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
       MuonTrackingRegionBuilder = cms.PSet( 
         EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
@@ -2156,9 +2153,7 @@
         UseVertex = cms.bool( False ),
         EscapePt = cms.double( 1.5 )
       ),
-      TkTrackBuilder = cms.string( "muonCkfTrajectoryBuilder" ),
       TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ),
-      MatcherOutPropagator = cms.string( "SmartPropagator" ),
       GlobalMuonTrackMatcher = cms.PSet( 
         MinP = cms.double( 2.5 ),
         MinPt = cms.double( 1.0 ),
@@ -2177,7 +2172,8 @@
         DeltaRCut_3 = cms.double( 1.0 ),
         Quality_1 = cms.double( 20.0 ),
         Quality_2 = cms.double( 15.0 ),
-        Quality_3 = cms.double( 7.0 )
+        Quality_3 = cms.double( 7.0 ),
+        Propagator = cms.string( "SmartPropagator" )
       ),
       tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2" ),
       MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2189,21 +2185,19 @@
         Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
         RefitDirection = cms.string( "insideOut" ),
-        RefitRPCHits = cms.bool( True )
+        RefitRPCHits = cms.bool( True ),
+        Propagator = cms.string( "SmartPropagatorAny" )
       ),
       PtCut = cms.double( 1.0 ),
-      KFFitter = cms.string( "L3MuKFFitter" ),
       GlbRefitterParameters = cms.PSet( 
         DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
         CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
-        RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ),
         MuonHitsOption = cms.int32( 1 ),
         Chi2CutCSC = cms.double( 150.0 ),
         Chi2CutDT = cms.double( 10.0 ),
         Chi2CutRPC = cms.double( 1.0 ),
         HitThreshold = cms.int32( 1 ),
         Fitter = cms.string( "L3MuKFFitter" ),
-        Smoother = cms.string( "KFSmootherForRefitInsideOut" ),
         Propagator = cms.string( "SmartPropagatorAny" ),
         TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2231,7 +2225,6 @@
       Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
       MuonUpdatorAtVertexParameters = cms.PSet( 
         MaxChi2 = cms.double( 1000000.0 ),
-        BeamSpotPosition = cms.vdouble( 0.0, 0.0, 0.0 ),
         Propagator = cms.string( "SteppingHelixPropagatorOpposite" ),
         BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 )
       ),

diff --git a/trunk/HLTrigger/Configuration/python/HLT_FULL_cff.py b/trunk/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_3_4_0/pre6/HLT/V4 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/HLT/V5 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/HLT/V4')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/HLT/V5')
 )
 
 
@@ -3141,10 +3141,7 @@
     MuonCollectionLabel = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
     L3TrajBuilderParameters = cms.PSet( 
       ScaleTECxFactor = cms.double( -1.0 ),
-      StateOnTrackerBoundOutPropagator = cms.string( "SmartPropagatorAny" ),
-      TransformerOutPropagator = cms.string( "SmartPropagatorAny" ),
       ScaleTECyFactor = cms.double( -1.0 ),
-      Direction = cms.int32( 0 ),
       TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
       MuonTrackingRegionBuilder = cms.PSet( 
         EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
@@ -3167,9 +3164,7 @@
         UseVertex = cms.bool( False ),
         EscapePt = cms.double( 1.5 )
       ),
-      TkTrackBuilder = cms.string( "muonCkfTrajectoryBuilder" ),
       TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ),
-      MatcherOutPropagator = cms.string( "SmartPropagator" ),
       GlobalMuonTrackMatcher = cms.PSet( 
         MinP = cms.double( 2.5 ),
         MinPt = cms.double( 1.0 ),
@@ -3188,7 +3183,8 @@
         DeltaRCut_3 = cms.double( 1.0 ),
         Quality_1 = cms.double( 20.0 ),
         Quality_2 = cms.double( 15.0 ),
-        Quality_3 = cms.double( 7.0 )
+        Quality_3 = cms.double( 7.0 ),
+        Propagator = cms.string( "SmartPropagator" )
       ),
       tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2" ),
       MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -3200,21 +3196,19 @@
         Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
         RefitDirection = cms.string( "insideOut" ),
-        RefitRPCHits = cms.bool( True )
+        RefitRPCHits = cms.bool( True ),
+        Propagator = cms.string( "SmartPropagatorAny" )
       ),
       PtCut = cms.double( 1.0 ),
-      KFFitter = cms.string( "L3MuKFFitter" ),
       GlbRefitterParameters = cms.PSet( 
         DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
         CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
-        RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ),
         MuonHitsOption = cms.int32( 1 ),
         Chi2CutCSC = cms.double( 150.0 ),
         Chi2CutDT = cms.double( 10.0 ),
         Chi2CutRPC = cms.double( 1.0 ),
         HitThreshold = cms.int32( 1 ),
         Fitter = cms.string( "L3MuKFFitter" ),
-        Smoother = cms.string( "KFSmootherForRefitInsideOut" ),
         Propagator = cms.string( "SmartPropagatorAny" ),
         TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -3242,7 +3236,6 @@
       Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
       MuonUpdatorAtVertexParameters = cms.PSet( 
         MaxChi2 = cms.double( 1000000.0 ),
-        BeamSpotPosition = cms.vdouble( 0.0, 0.0, 0.0 ),
         Propagator = cms.string( "SteppingHelixPropagatorOpposite" ),
         BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 )
       ),

diff --git a/trunk/HLTrigger/Configuration/python/HLT_GRun_cff.py b/trunk/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_3_4_0/pre6/GRun/V3 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/GRun/V4 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/GRun/V3')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/GRun/V4')
 )
 
 
@@ -2131,10 +2131,7 @@
     MuonCollectionLabel = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
     L3TrajBuilderParameters = cms.PSet( 
       ScaleTECxFactor = cms.double( -1.0 ),
-      StateOnTrackerBoundOutPropagator = cms.string( "SmartPropagatorAny" ),
-      TransformerOutPropagator = cms.string( "SmartPropagatorAny" ),
       ScaleTECyFactor = cms.double( -1.0 ),
-      Direction = cms.int32( 0 ),
       TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
       MuonTrackingRegionBuilder = cms.PSet( 
         EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
@@ -2157,9 +2154,7 @@
         UseVertex = cms.bool( False ),
         EscapePt = cms.double( 1.5 )
       ),
-      TkTrackBuilder = cms.string( "muonCkfTrajectoryBuilder" ),
       TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ),
-      MatcherOutPropagator = cms.string( "SmartPropagator" ),
       GlobalMuonTrackMatcher = cms.PSet( 
         MinP = cms.double( 2.5 ),
         MinPt = cms.double( 1.0 ),
@@ -2178,7 +2173,8 @@
         DeltaRCut_3 = cms.double( 1.0 ),
         Quality_1 = cms.double( 20.0 ),
         Quality_2 = cms.double( 15.0 ),
-        Quality_3 = cms.double( 7.0 )
+        Quality_3 = cms.double( 7.0 ),
+        Propagator = cms.string( "SmartPropagator" )
       ),
       tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2" ),
       MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2190,21 +2186,19 @@
         Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
         RefitDirection = cms.string( "insideOut" ),
-        RefitRPCHits = cms.bool( True )
+        RefitRPCHits = cms.bool( True ),
+        Propagator = cms.string( "SmartPropagatorAny" )
       ),
       PtCut = cms.double( 1.0 ),
-      KFFitter = cms.string( "L3MuKFFitter" ),
       GlbRefitterParameters = cms.PSet( 
         DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
         CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
-        RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ),
         MuonHitsOption = cms.int32( 1 ),
         Chi2CutCSC = cms.double( 150.0 ),
         Chi2CutDT = cms.double( 10.0 ),
         Chi2CutRPC = cms.double( 1.0 ),
         HitThreshold = cms.int32( 1 ),
         Fitter = cms.string( "L3MuKFFitter" ),
-        Smoother = cms.string( "KFSmootherForRefitInsideOut" ),
         Propagator = cms.string( "SmartPropagatorAny" ),
         TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2232,7 +2226,6 @@
       Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
       MuonUpdatorAtVertexParameters = cms.PSet( 
         MaxChi2 = cms.double( 1000000.0 ),
-        BeamSpotPosition = cms.vdouble( 0.0, 0.0, 0.0 ),
         Propagator = cms.string( "SteppingHelixPropagatorOpposite" ),
         BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 )
       ),

diff --git a/trunk/HLTrigger/Configuration/python/HLT_HIon_cff.py b/trunk/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,10 +1,10 @@
-# /dev/CMSSW_3_4_0/pre6/HIon/V3 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/HIon/V4 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 
 HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/HIon/V3')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/HIon/V4')
 )
 
 

diff --git a/trunk/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/trunk/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
@@ -1,11 +1,11 @@
-# /dev/CMSSW_3_4_0/pre6/GRun/V3 (CMSSW_3_4_0_pre5_HLT1)
+# /dev/CMSSW_3_4_0/pre6/GRun/V4 (CMSSW_3_4_0_pre5_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLT" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/GRun/V3')
+  tableName = cms.string('/dev/CMSSW_3_4_0/pre6/GRun/V4')
 )
 
 process.options = cms.untracked.PSet(  Rethrow = cms.untracked.vstring( 'ProductNotFound',
@@ -2820,10 +2820,7 @@
     MuonCollectionLabel = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
     L3TrajBuilderParameters = cms.PSet( 
       ScaleTECxFactor = cms.double( -1.0 ),
-      StateOnTrackerBoundOutPropagator = cms.string( "SmartPropagatorAny" ),
-      TransformerOutPropagator = cms.string( "SmartPropagatorAny" ),
       ScaleTECyFactor = cms.double( -1.0 ),
-      Direction = cms.int32( 0 ),
       TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
       MuonTrackingRegionBuilder = cms.PSet( 
         EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
@@ -2846,9 +2843,7 @@
         UseVertex = cms.bool( False ),
         EscapePt = cms.double( 1.5 )
       ),
-      TkTrackBuilder = cms.string( "muonCkfTrajectoryBuilder" ),
       TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ),
-      MatcherOutPropagator = cms.string( "SmartPropagator" ),
       GlobalMuonTrackMatcher = cms.PSet( 
         MinP = cms.double( 2.5 ),
         MinPt = cms.double( 1.0 ),
@@ -2867,7 +2862,8 @@
         DeltaRCut_3 = cms.double( 1.0 ),
         Quality_1 = cms.double( 20.0 ),
         Quality_2 = cms.double( 15.0 ),
-        Quality_3 = cms.double( 7.0 )
+        Quality_3 = cms.double( 7.0 ),
+        Propagator = cms.string( "SmartPropagator" )
       ),
       tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2" ),
       MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2879,21 +2875,19 @@
         Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
         RefitDirection = cms.string( "insideOut" ),
-        RefitRPCHits = cms.bool( True )
+        RefitRPCHits = cms.bool( True ),
+        Propagator = cms.string( "SmartPropagatorAny" )
       ),
       PtCut = cms.double( 1.0 ),
-      KFFitter = cms.string( "L3MuKFFitter" ),
       GlbRefitterParameters = cms.PSet( 
         DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
         CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
-        RPCRecSegmentLabel = cms.InputTag( "hltRpcRecHits" ),
         MuonHitsOption = cms.int32( 1 ),
         Chi2CutCSC = cms.double( 150.0 ),
         Chi2CutDT = cms.double( 10.0 ),
         Chi2CutRPC = cms.double( 1.0 ),
         HitThreshold = cms.int32( 1 ),
         Fitter = cms.string( "L3MuKFFitter" ),
-        Smoother = cms.string( "KFSmootherForRefitInsideOut" ),
         Propagator = cms.string( "SmartPropagatorAny" ),
         TrackerRecHitBuilder = cms.string( "WithTrackAngle" ),
         MuonRecHitBuilder = cms.string( "MuonRecHitBuilder" ),
@@ -2921,7 +2915,6 @@
       Smoother = cms.string( "KFSmootherForMuonTrackLoader" ),
       MuonUpdatorAtVertexParameters = cms.PSet( 
         MaxChi2 = cms.double( 1000000.0 ),
-        BeamSpotPosition = cms.vdouble( 0.0, 0.0, 0.0 ),
         Propagator = cms.string( "SteppingHelixPropagatorOpposite" ),
         BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 )
       ),