New attempt to add Dynamic Strip Reco to 7_6_X - a new PR was necessa…

…ry because of a rebase while debugging

Previous PR at: cms-sw#10215

CommonTools/ParticleFlow/python/pfTaus_cff.py

@@ -126,6 +126,50 @@
 pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
 
 
+# Produce primary vertices
+
+from RecoTauTag.RecoTau.PFTauPrimaryVertexProducer_cfi      import *
+from RecoTauTag.RecoTau.PFTauSecondaryVertexProducer_cfi    import *
+from RecoTauTag.RecoTau.PFTauTransverseImpactParameters_cfi import *
+hpsPFTauPrimaryVertexProducer = PFTauPrimaryVertexProducer.clone(
+    PFTauTag = cms.InputTag("hpsPFTauProducer"),
+    ElectronTag = cms.InputTag(""),
+    MuonTag = cms.InputTag(""),
+    PVTag = cms.InputTag("offlinePrimaryVertices"),
+    beamSpot = cms.InputTag("offlineBeamSpot"),
+    TrackCollectionTag = cms.InputTag("generalTracks"),
+    Algorithm = cms.int32(1),
+    useBeamSpot = cms.bool(True),
+    RemoveMuonTracks = cms.bool(False),
+    RemoveElectronTracks = cms.bool(False),
+    useSelectedTaus = cms.bool(False),
+    discriminators = cms.VPSet(
+        cms.PSet(
+            discriminator = cms.InputTag('hpsPFTauDiscriminationByDecayModeFindingNewDMs'),
+            selectionCut = cms.double(0.5)
+        )
+    ),
+    cut = cms.string("pt > 18.0 & abs(eta) < 2.4")
+)
+
+
+hpsPFTauSecondaryVertexProducer = PFTauSecondaryVertexProducer.clone(
+    PFTauTag = cms.InputTag("hpsPFTauProducer")
+)
+hpsPFTauTransverseImpactParameters = PFTauTransverseImpactParameters.clone(
+    PFTauTag = cms.InputTag("hpsPFTauProducer"),
+    PFTauPVATag = cms.InputTag("hpsPFTauPrimaryVertexProducer"),
+    PFTauSVATag = cms.InputTag("hpsPFTauSecondaryVertexProducer"),
+    useFullCalculation = cms.bool(False)
+)
+hpsPFTauVertexAndImpactParametersSeq = cms.Sequence(
+    hpsPFTauPrimaryVertexProducer*
+    hpsPFTauSecondaryVertexProducer*
+    hpsPFTauTransverseImpactParameters
+)
+
+
+
 pfTausPreSequence = cms.Sequence(
     pfJetTracksAssociatorAtVertex +
     pfTauPFJets08Region +

HLTrigger/Configuration/python/HLT_25ns14e33_v1_cff.py

@@ -10653,6 +10653,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -10717,6 +10721,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -16460,6 +16468,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -16524,6 +16536,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -19450,6 +19466,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),

HLTrigger/Configuration/python/HLT_25ns14e33_v3_cff.py

@@ -11691,6 +11691,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -11755,6 +11759,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -17491,6 +17499,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -17555,6 +17567,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -21588,6 +21604,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),

HLTrigger/Configuration/python/HLT_50nsGRun_cff.py

@@ -11963,6 +11963,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -12027,6 +12031,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -17989,6 +17997,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -18053,6 +18065,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -21498,6 +21514,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),

HLTrigger/Configuration/python/HLT_50ns_5e33_v1_cff.py

@@ -10936,6 +10936,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -11000,6 +11004,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -16518,6 +16526,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -16582,6 +16594,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -19605,6 +19621,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),

HLTrigger/Configuration/python/HLT_50ns_5e33_v3_cff.py

@@ -11928,6 +11928,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -11992,6 +11996,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -17954,6 +17962,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( False ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -18018,6 +18030,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),
@@ -21445,6 +21461,10 @@
     applyOccupancyCut = cms.bool( False ),
     applyDeltaBetaCorrection = cms.bool( False ),
     applyRelativeSumPtCut = cms.bool( True ),
+    applyPhotonPtSumOutsideSignalConeCut = cms.bool( False ),
+    maxAbsPhotonSumPt_outsideSignalCone = cms.double(1.e+9),
+    maxRelPhotonSumPt_outsideSignalCone = cms.double(0.10),
+    applyFootprintCorrection = cms.bool(False),
     maximumOccupancy = cms.uint32( 0 ),
     deltaBetaPUTrackPtCutOverride = cms.double( 0.5 ),
     ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ),