diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededInnerSequence_cfi.py deleted file mode 100644 index 8ab274e89039d..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededInnerSequence_cfi.py +++ /dev/null @@ -1,18 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * -from ..modules.hltEgammaClusterShapeUnseeded_cfi import * -from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * -from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * -from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * -from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * -from ..sequences.HLTFastJetForEgammaSequence_cfi import * -from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import * -from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * -from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * - -HLTDiphoton3023IsoCaloIdUnseededInnerSequence = cms.Sequence(HLTDoFullUnpackingEgammaEcalSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+HLTFastJetForEgammaSequence+HLTPFHcalClusteringForEgammaSequence+hltEgammaCandidatesUnseeded+hltEgammaCandidatesWrapperUnseeded+hltEgammaClusterShapeUnseeded+hltEgammaHGCALIDVarsUnseeded+hltEgammaHoverEUnseeded+hltEgammaEcalPFClusterIsoUnseeded+hltEgammaHGCalLayerClusterIsoUnseeded+hltEgammaHcalPFClusterIsoUnseeded) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededSequence_cfi.py index be2498a0426cb..9951c178acf7c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdUnseededSequence_cfi.py @@ -12,13 +12,46 @@ from ..modules.hltEG30EtUnseededFilter_cfi import * from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * from ..modules.hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi import * -from ..sequences.HLTDiphoton3023IsoCaloIdUnseededInnerSequence_cfi import * +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaClusterShapeUnseeded_cfi import * +from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * +from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * + from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * -from ..sequences.HLTDoLocalHcalSequence_cfi import * +from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * -HLTDiphoton3023IsoCaloIdUnseededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForDoublePhotonIsolatedFilter+HLTDoFullUnpackingEgammaEcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTDiphoton3023IsoCaloIdUnseededInnerSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+hltEgammaCandidatesWrapperUnseeded+hltEG30EtUnseededFilter+hltDiEG23EtUnseededFilter+hltDiEG3023IsoCaloIdClusterShapeUnseededFilter+hltDiEG3023IsoCaloIdClusterShapeSigmavvUnseededFilter+hltDiEG3023IsoCaloIdClusterShapeSigmawwUnseededFilter+hltDiEG3023IsoCaloIdHgcalHEUnseededFilter+HLTDoLocalHcalSequence+HLTFastJetForEgammaSequence+hltDiEG3023IsoCaloIdHEUnseededFilter+hltDiEG3023IsoCaloIdEcalIsoUnseededFilter+hltDiEG3023IsoCaloIdHgcalIsoUnseededFilter+HLTPFHcalClusteringForEgammaSequence+hltDiEG3023IsoCaloIdHcalIsoUnseededFilter) + +HLTDiphoton3023IsoCaloIdUnseededSequence = cms.Sequence(HLTL1Sequence + +hltEGL1SeedsForDoublePhotonIsolatedFilter + +HLTDoFullUnpackingEgammaEcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG30EtUnseededFilter + +hltDiEG23EtUnseededFilter + +hltEgammaClusterShapeUnseeded + +hltDiEG3023IsoCaloIdClusterShapeUnseededFilter + +hltEgammaHGCALIDVarsUnseeded + +hltDiEG3023IsoCaloIdClusterShapeSigmavvUnseededFilter + +hltDiEG3023IsoCaloIdClusterShapeSigmawwUnseededFilter + +hltDiEG3023IsoCaloIdHgcalHEUnseededFilter + +HLTEGammaDoLocalHcalSequence + +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltDiEG3023IsoCaloIdHEUnseededFilter + +hltEgammaEcalPFClusterIsoUnseeded + +hltDiEG3023IsoCaloIdEcalIsoUnseededFilter + +hltEgammaHGCalLayerClusterIsoUnseeded + +hltDiEG3023IsoCaloIdHgcalIsoUnseededFilter + +HLTPFHcalClusteringForEgammaSequence + +hltEgammaHcalPFClusterIsoUnseeded + +hltDiEG3023IsoCaloIdHcalIsoUnseededFilter) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence_cfi.py deleted file mode 100644 index 9b21ff3886de4..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaClusterShapeUnseeded_cfi import * -from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * - -HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence = cms.Sequence(hltEgammaCandidatesUnseeded+hltEgammaClusterShapeUnseeded+hltEgammaHGCALIDVarsUnseeded+hltEgammaHoverEUnseeded) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py index f70e11d4718c6..8519652f01f49 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py @@ -9,8 +9,12 @@ from ..modules.hltDiEle25CaloIdLPMS2UnseededFilter_cfi import * from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * from ..modules.hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi import * +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaClusterShapeUnseeded_cfi import * +from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * + from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * -from ..sequences.HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence_cfi import * from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * from ..sequences.HLTElePixelMatchUnseededSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * @@ -18,4 +22,23 @@ from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * -HLTDoubleEle25CaloIdLPMS2UnseededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForDoubleEleNonIsolatedFilter+HLTDoFullUnpackingEgammaEcalSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+HLTDoubleEle25CaloIdLPMS2UnseededInnerSequence+hltEgammaCandidatesWrapperUnseeded+hltDiEG25EtUnseededFilter+hltDiEG25CaloIdLClusterShapeUnseededFilter+hltDiEG25CaloIdLClusterShapeSigmavvUnseededFilter+hltDiEG25CaloIdLHgcalHEUnseededFilter+hltDiEG25CaloIdLHEUnseededFilter+HLTElePixelMatchUnseededSequence+hltDiEle25CaloIdLPixelMatchUnseededFilter+hltDiEle25CaloIdLPMS2UnseededFilter+HLTFastJetForEgammaSequence) +HLTDoubleEle25CaloIdLPMS2UnseededSequence = cms.Sequence(HLTL1Sequence + +hltEGL1SeedsForDoubleEleNonIsolatedFilter + +HLTDoFullUnpackingEgammaEcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltDiEG25EtUnseededFilter + +hltEgammaClusterShapeUnseeded + +hltDiEG25CaloIdLClusterShapeUnseededFilter + +hltEgammaHGCALIDVarsUnseeded + +hltDiEG25CaloIdLClusterShapeSigmavvUnseededFilter + +hltDiEG25CaloIdLHgcalHEUnseededFilter + +HLTEGammaDoLocalHcalSequence + +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltDiEG25CaloIdLHEUnseededFilter + +HLTElePixelMatchUnseededSequence + +hltDiEle25CaloIdLPixelMatchUnseededFilter + +hltDiEle25CaloIdLPMS2UnseededFilter) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededInnerSequence_cfi.py deleted file mode 100644 index 52e8d9594e7ff..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededInnerSequence_cfi.py +++ /dev/null @@ -1,63 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaClusterShapeUnseeded_cfi import * -from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaEleGsfTrackIsoV6Unseeded_cfi import * -from ..modules.hltEgammaEleL1TrkIsoUnseeded_cfi import * -from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * -from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * -from ..modules.hltEG26EtUnseededFilter_cfi import * -from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * -from ..modules.hltEGL1SeedsForSingleEleIsolatedFilter_cfi import * -from ..modules.hltEle26WP70BestGsfChi2UnseededFilter_cfi import * -from ..modules.hltEle26WP70BestGsfNLayerITUnseededFilter_cfi import * -from ..modules.hltEle26WP70ClusterShapeSigmavvUnseededFilter_cfi import * -from ..modules.hltEle26WP70ClusterShapeSigmawwUnseededFilter_cfi import * -from ..modules.hltEle26WP70ClusterShapeUnseededFilter_cfi import * -from ..modules.hltEle26WP70EcalIsoUnseededFilter_cfi import * -from ..modules.hltEle26WP70GsfDetaUnseededFilter_cfi import * -from ..modules.hltEle26WP70GsfDphiUnseededFilter_cfi import * -from ..modules.hltEle26WP70GsfOneOEMinusOneOPUnseededFilter_cfi import * -from ..modules.hltEle26WP70GsfTrackIsoFromL1TracksUnseededFilter_cfi import * -from ..modules.hltEle26WP70GsfTrackIsoUnseededFilter_cfi import * -from ..modules.hltEle26WP70HcalIsoUnseededFilter_cfi import * -from ..modules.hltEle26WP70HEUnseededFilter_cfi import * -from ..modules.hltEle26WP70HgcalHEUnseededFilter_cfi import * -from ..modules.hltEle26WP70HgcalIsoUnseededFilter_cfi import * -from ..modules.hltEle26WP70PixelMatchUnseededFilter_cfi import * -from ..modules.hltEle26WP70PMS2UnseededFilter_cfi import * -from ..sequences.HLTTrackingV61Sequence_cfi import * - -HLTEle26WP70UnseededInnerSequence = cms.Sequence(hltEgammaCandidatesUnseeded - +hltEgammaClusterShapeUnseeded - +hltEgammaHGCALIDVarsUnseeded - +hltEgammaHoverEUnseeded - +hltEgammaEcalPFClusterIsoUnseeded - +hltEgammaHGCalLayerClusterIsoUnseeded - +hltEgammaHcalPFClusterIsoUnseeded - +hltEgammaEleL1TrkIsoUnseeded - +hltEgammaCandidatesWrapperUnseeded - +hltEG26EtUnseededFilter - +hltEle26WP70ClusterShapeUnseededFilter - +hltEle26WP70ClusterShapeSigmavvUnseededFilter - +hltEle26WP70ClusterShapeSigmawwUnseededFilter - +hltEle26WP70HgcalHEUnseededFilter - +hltEle26WP70HEUnseededFilter - +hltEle26WP70EcalIsoUnseededFilter - +hltEle26WP70HgcalIsoUnseededFilter - +hltEle26WP70HcalIsoUnseededFilter - +hltEle26WP70PixelMatchUnseededFilter - +hltEle26WP70PMS2UnseededFilter - +hltEle26WP70GsfOneOEMinusOneOPUnseededFilter - +hltEle26WP70GsfDetaUnseededFilter - +hltEle26WP70GsfDphiUnseededFilter - +hltEle26WP70BestGsfNLayerITUnseededFilter - +hltEle26WP70BestGsfChi2UnseededFilter - +hltEle26WP70GsfTrackIsoFromL1TracksUnseededFilter - +HLTTrackingV61Sequence - +hltEgammaEleGsfTrackIsoV6Unseeded - +hltEle26WP70GsfTrackIsoUnseededFilter - ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededSequence_cfi.py index e81d5b5ea1fa5..9904775174564 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70UnseededSequence_cfi.py @@ -1,8 +1,37 @@ import FWCore.ParameterSet.Config as cms +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaClusterShapeUnseeded_cfi import * +from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaEleGsfTrackIsoV6Unseeded_cfi import * +from ..modules.hltEgammaEleL1TrkIsoUnseeded_cfi import * +from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * +from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * +from ..modules.hltEG26EtUnseededFilter_cfi import * +from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * +from ..modules.hltEGL1SeedsForSingleEleIsolatedFilter_cfi import * +from ..modules.hltEle26WP70BestGsfChi2UnseededFilter_cfi import * +from ..modules.hltEle26WP70BestGsfNLayerITUnseededFilter_cfi import * +from ..modules.hltEle26WP70ClusterShapeSigmavvUnseededFilter_cfi import * +from ..modules.hltEle26WP70ClusterShapeSigmawwUnseededFilter_cfi import * +from ..modules.hltEle26WP70ClusterShapeUnseededFilter_cfi import * +from ..modules.hltEle26WP70EcalIsoUnseededFilter_cfi import * +from ..modules.hltEle26WP70GsfDetaUnseededFilter_cfi import * +from ..modules.hltEle26WP70GsfDphiUnseededFilter_cfi import * +from ..modules.hltEle26WP70GsfOneOEMinusOneOPUnseededFilter_cfi import * +from ..modules.hltEle26WP70GsfTrackIsoFromL1TracksUnseededFilter_cfi import * +from ..modules.hltEle26WP70GsfTrackIsoUnseededFilter_cfi import * +from ..modules.hltEle26WP70HcalIsoUnseededFilter_cfi import * +from ..modules.hltEle26WP70HEUnseededFilter_cfi import * +from ..modules.hltEle26WP70HgcalHEUnseededFilter_cfi import * +from ..modules.hltEle26WP70HgcalIsoUnseededFilter_cfi import * +from ..modules.hltEle26WP70PixelMatchUnseededFilter_cfi import * +from ..modules.hltEle26WP70PMS2UnseededFilter_cfi import * + from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * -from ..sequences.HLTEle26WP70UnseededInnerSequence_cfi import * from ..sequences.HLTElePixelMatchUnseededSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTGsfElectronUnseededSequence_cfi import * @@ -10,16 +39,44 @@ from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * +from ..sequences.HLTTrackingV61Sequence_cfi import * HLTEle26WP70UnseededSequence = cms.Sequence(HLTL1Sequence - +hltEGL1SeedsForSingleEleIsolatedFilter - +HLTDoFullUnpackingEgammaEcalSequence - +HLTEGammaDoLocalHcalSequence - +HLTPFClusteringForEgammaUnseededSequence - +HLTHgcalTiclPFClusteringForEgammaUnseededSequence - +HLTFastJetForEgammaSequence - +HLTPFHcalClusteringForEgammaSequence - +HLTElePixelMatchUnseededSequence - +HLTGsfElectronUnseededSequence - +HLTEle26WP70UnseededInnerSequence -) + +hltEGL1SeedsForSingleEleIsolatedFilter + +HLTDoFullUnpackingEgammaEcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG26EtUnseededFilter + +hltEgammaClusterShapeUnseeded + +hltEle26WP70ClusterShapeUnseededFilter + +hltEgammaHGCALIDVarsUnseeded + +hltEle26WP70ClusterShapeSigmavvUnseededFilter + +hltEle26WP70ClusterShapeSigmawwUnseededFilter + +hltEle26WP70HgcalHEUnseededFilter + +HLTEGammaDoLocalHcalSequence + +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltEle26WP70HEUnseededFilter + +hltEgammaEcalPFClusterIsoUnseeded + +hltEle26WP70EcalIsoUnseededFilter + +hltEgammaHGCalLayerClusterIsoUnseeded + +hltEle26WP70HgcalIsoUnseededFilter + +HLTPFHcalClusteringForEgammaSequence + +hltEgammaHcalPFClusterIsoUnseeded + +hltEle26WP70HcalIsoUnseededFilter + +HLTElePixelMatchUnseededSequence + +hltEle26WP70PixelMatchUnseededFilter + +hltEle26WP70PMS2UnseededFilter + +HLTGsfElectronUnseededSequence + +hltEle26WP70GsfOneOEMinusOneOPUnseededFilter + +hltEle26WP70GsfDetaUnseededFilter + +hltEle26WP70GsfDphiUnseededFilter + +hltEle26WP70BestGsfNLayerITUnseededFilter + +hltEle26WP70BestGsfChi2UnseededFilter + +hltEgammaEleL1TrkIsoUnseeded + +hltEle26WP70GsfTrackIsoFromL1TracksUnseededFilter + +HLTTrackingV61Sequence + +hltEgammaEleGsfTrackIsoV6Unseeded + +hltEle26WP70GsfTrackIsoUnseededFilter) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededInnerSequence_cfi.py deleted file mode 100644 index 67b6e8a212318..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededInnerSequence_cfi.py +++ /dev/null @@ -1,63 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaClusterShapeUnseeded_cfi import * -from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaEleGsfTrackIsoV6Unseeded_cfi import * -from ..modules.hltEgammaEleL1TrkIsoUnseeded_cfi import * -from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * -from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * -from ..modules.hltEG32EtUnseededFilter_cfi import * -from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * -from ..modules.hltEGL1SeedsForSingleEleIsolatedFilter_cfi import * -from ..modules.hltEle32WPTightBestGsfChi2UnseededFilter_cfi import * -from ..modules.hltEle32WPTightBestGsfNLayerITUnseededFilter_cfi import * -from ..modules.hltEle32WPTightClusterShapeSigmavvUnseededFilter_cfi import * -from ..modules.hltEle32WPTightClusterShapeSigmawwUnseededFilter_cfi import * -from ..modules.hltEle32WPTightClusterShapeUnseededFilter_cfi import * -from ..modules.hltEle32WPTightEcalIsoUnseededFilter_cfi import * -from ..modules.hltEle32WPTightGsfDetaUnseededFilter_cfi import * -from ..modules.hltEle32WPTightGsfDphiUnseededFilter_cfi import * -from ..modules.hltEle32WPTightGsfOneOEMinusOneOPUnseededFilter_cfi import * -from ..modules.hltEle32WPTightGsfTrackIsoFromL1TracksUnseededFilter_cfi import * -from ..modules.hltEle32WPTightGsfTrackIsoUnseededFilter_cfi import * -from ..modules.hltEle32WPTightHcalIsoUnseededFilter_cfi import * -from ..modules.hltEle32WPTightHEUnseededFilter_cfi import * -from ..modules.hltEle32WPTightHgcalHEUnseededFilter_cfi import * -from ..modules.hltEle32WPTightHgcalIsoUnseededFilter_cfi import * -from ..modules.hltEle32WPTightPixelMatchUnseededFilter_cfi import * -from ..modules.hltEle32WPTightPMS2UnseededFilter_cfi import * -from ..sequences.HLTTrackingV61Sequence_cfi import * - -HLTEle32WPTightUnseededInnerSequence = cms.Sequence(hltEgammaHGCALIDVarsUnseeded - +hltEgammaEcalPFClusterIsoUnseeded - +hltEgammaHGCalLayerClusterIsoUnseeded - +hltEgammaHcalPFClusterIsoUnseeded - +hltEgammaEleL1TrkIsoUnseeded - +hltEgammaHoverEUnseeded - +hltEgammaCandidatesUnseeded - +hltEgammaClusterShapeUnseeded - +hltEgammaCandidatesWrapperUnseeded - +hltEG32EtUnseededFilter - +hltEle32WPTightClusterShapeUnseededFilter - +hltEle32WPTightClusterShapeSigmavvUnseededFilter - +hltEle32WPTightClusterShapeSigmawwUnseededFilter - +hltEle32WPTightHgcalHEUnseededFilter - +hltEle32WPTightHEUnseededFilter - +hltEle32WPTightEcalIsoUnseededFilter - +hltEle32WPTightHgcalIsoUnseededFilter - +hltEle32WPTightHcalIsoUnseededFilter - +hltEle32WPTightPixelMatchUnseededFilter - +hltEle32WPTightPMS2UnseededFilter - +hltEle32WPTightGsfOneOEMinusOneOPUnseededFilter - +hltEle32WPTightGsfDetaUnseededFilter - +hltEle32WPTightGsfDphiUnseededFilter - +hltEle32WPTightBestGsfNLayerITUnseededFilter - +hltEle32WPTightBestGsfChi2UnseededFilter - +hltEle32WPTightGsfTrackIsoFromL1TracksUnseededFilter - +HLTTrackingV61Sequence - +hltEgammaEleGsfTrackIsoV6Unseeded - +hltEle32WPTightGsfTrackIsoUnseededFilter -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededSequence_cfi.py index 99635b5547bc9..6fb316f5f68a9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle32WPTightUnseededSequence_cfi.py @@ -2,7 +2,6 @@ from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * -from ..sequences.HLTEle32WPTightUnseededInnerSequence_cfi import * from ..sequences.HLTElePixelMatchUnseededSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTGsfElectronUnseededSequence_cfi import * @@ -10,16 +9,75 @@ from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * +from ..sequences.HLTTrackingV61Sequence_cfi import * + +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaClusterShapeUnseeded_cfi import * +from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaEleGsfTrackIsoV6Unseeded_cfi import * +from ..modules.hltEgammaEleL1TrkIsoUnseeded_cfi import * +from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * +from ..modules.hltEgammaHGCalLayerClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * +from ..modules.hltEG32EtUnseededFilter_cfi import * +from ..modules.hltEgammaCandidatesWrapperUnseeded_cfi import * +from ..modules.hltEGL1SeedsForSingleEleIsolatedFilter_cfi import * +from ..modules.hltEle32WPTightBestGsfChi2UnseededFilter_cfi import * +from ..modules.hltEle32WPTightBestGsfNLayerITUnseededFilter_cfi import * +from ..modules.hltEle32WPTightClusterShapeSigmavvUnseededFilter_cfi import * +from ..modules.hltEle32WPTightClusterShapeSigmawwUnseededFilter_cfi import * +from ..modules.hltEle32WPTightClusterShapeUnseededFilter_cfi import * +from ..modules.hltEle32WPTightEcalIsoUnseededFilter_cfi import * +from ..modules.hltEle32WPTightGsfDetaUnseededFilter_cfi import * +from ..modules.hltEle32WPTightGsfDphiUnseededFilter_cfi import * +from ..modules.hltEle32WPTightGsfOneOEMinusOneOPUnseededFilter_cfi import * +from ..modules.hltEle32WPTightGsfTrackIsoFromL1TracksUnseededFilter_cfi import * +from ..modules.hltEle32WPTightGsfTrackIsoUnseededFilter_cfi import * +from ..modules.hltEle32WPTightHcalIsoUnseededFilter_cfi import * +from ..modules.hltEle32WPTightHEUnseededFilter_cfi import * +from ..modules.hltEle32WPTightHgcalHEUnseededFilter_cfi import * +from ..modules.hltEle32WPTightHgcalIsoUnseededFilter_cfi import * +from ..modules.hltEle32WPTightPixelMatchUnseededFilter_cfi import * +from ..modules.hltEle32WPTightPMS2UnseededFilter_cfi import * HLTEle32WPTightUnseededSequence = cms.Sequence(HLTL1Sequence +hltEGL1SeedsForSingleEleIsolatedFilter +HLTDoFullUnpackingEgammaEcalSequence - +HLTEGammaDoLocalHcalSequence +HLTPFClusteringForEgammaUnseededSequence +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG32EtUnseededFilter + +hltEgammaClusterShapeUnseeded + +hltEle32WPTightClusterShapeUnseededFilter + +hltEgammaHGCALIDVarsUnseeded + +hltEle32WPTightClusterShapeSigmavvUnseededFilter + +hltEle32WPTightClusterShapeSigmawwUnseededFilter + +hltEle32WPTightHgcalHEUnseededFilter + +HLTEGammaDoLocalHcalSequence +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltEle32WPTightHEUnseededFilter + +hltEgammaEcalPFClusterIsoUnseeded + +hltEle32WPTightEcalIsoUnseededFilter + +hltEgammaHGCalLayerClusterIsoUnseeded + +hltEle32WPTightHgcalIsoUnseededFilter +HLTPFHcalClusteringForEgammaSequence + +hltEgammaHcalPFClusterIsoUnseeded + +hltEle32WPTightHcalIsoUnseededFilter +HLTElePixelMatchUnseededSequence + +hltEle32WPTightPixelMatchUnseededFilter + +hltEle32WPTightPMS2UnseededFilter +HLTGsfElectronUnseededSequence - +HLTEle32WPTightUnseededInnerSequence + +hltEle32WPTightGsfOneOEMinusOneOPUnseededFilter + +hltEle32WPTightGsfDetaUnseededFilter + +hltEle32WPTightGsfDphiUnseededFilter + +hltEle32WPTightBestGsfNLayerITUnseededFilter + +hltEle32WPTightBestGsfChi2UnseededFilter + +hltEgammaEleL1TrkIsoUnseeded + +hltEle32WPTightGsfTrackIsoFromL1TracksUnseededFilter + +HLTTrackingV61Sequence + +hltEgammaEleGsfTrackIsoV6Unseeded + +hltEle32WPTightGsfTrackIsoUnseededFilter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededInnerSequence_cfi.py deleted file mode 100644 index ddcef0cbeaa8c..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededInnerSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaClusterShapeUnseeded_cfi import * -from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * - -HLTPhoton108EBTightIDTightIsoUnseededInnerSequence = cms.Sequence(hltEgammaCandidatesUnseeded+hltEgammaClusterShapeUnseeded+hltEgammaHoverEUnseeded+hltEgammaEcalPFClusterIsoUnseeded+hltEgammaHcalPFClusterIsoUnseeded) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededSequence_cfi.py index 73bedd5e67ac5..6e9b277b28a07 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededSequence_cfi.py @@ -7,6 +7,12 @@ from ..modules.hltPhoton108EBTightIDTightIsoEcalIsoUnseededFilter_cfi import * from ..modules.hltPhoton108EBTightIDTightIsoHcalIsoUnseededFilter_cfi import * from ..modules.hltPhoton108EBTightIDTightIsoHEUnseededFilter_cfi import * +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaClusterShapeUnseeded_cfi import * +from ..modules.hltEgammaEcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHcalPFClusterIsoUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * + from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * @@ -14,6 +20,23 @@ from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * -from ..sequences.HLTPhoton108EBTightIDTightIsoUnseededInnerSequence_cfi import * -HLTPhoton108EBTightIDTightIsoUnseededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForSinglePhotonIsolatedFilter+HLTDoFullUnpackingEgammaEcalSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+HLTFastJetForEgammaSequence+HLTPFHcalClusteringForEgammaSequence+HLTPhoton108EBTightIDTightIsoUnseededInnerSequence+hltEgammaCandidatesWrapperUnseeded+hltEG108EtUnseededFilter+hltPhoton108EBTightIDTightIsoClusterShapeUnseededFilter+hltPhoton108EBTightIDTightIsoHEUnseededFilter+hltPhoton108EBTightIDTightIsoEcalIsoUnseededFilter+hltPhoton108EBTightIDTightIsoHcalIsoUnseededFilter) +HLTPhoton108EBTightIDTightIsoUnseededSequence = cms.Sequence(HLTL1Sequence + +hltEGL1SeedsForSinglePhotonIsolatedFilter + +HLTDoFullUnpackingEgammaEcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG108EtUnseededFilter + +hltEgammaClusterShapeUnseeded + +hltPhoton108EBTightIDTightIsoClusterShapeUnseededFilter + +HLTEGammaDoLocalHcalSequence + +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltPhoton108EBTightIDTightIsoHEUnseededFilter + +hltEgammaEcalPFClusterIsoUnseeded + +hltPhoton108EBTightIDTightIsoEcalIsoUnseededFilter + +HLTPFHcalClusteringForEgammaSequence + +hltEgammaHcalPFClusterIsoUnseeded + +hltPhoton108EBTightIDTightIsoHcalIsoUnseededFilter) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededInnerSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededInnerSequence_cfi.py deleted file mode 100644 index 95e664a0a462a..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededInnerSequence_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltEgammaCandidatesUnseeded_cfi import * -from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * -from ..modules.hltEgammaHoverEUnseeded_cfi import * - -HLTPhoton187UnseededInnerSequence = cms.Sequence(hltEgammaCandidatesUnseeded+hltEgammaHGCALIDVarsUnseeded+hltEgammaHoverEUnseeded) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py index 5a99d5b399a8f..3847c35211a51 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py @@ -5,11 +5,28 @@ from ..modules.hltPhoton187HEUnseededFilter_cfi import * from ..modules.hltPhoton187HgcalHEUnseededFilter_cfi import * from ..modules.l1tTkEmSingle51Filter_cfi import * +from ..modules.hltEgammaCandidatesUnseeded_cfi import * +from ..modules.hltEgammaHGCALIDVarsUnseeded_cfi import * +from ..modules.hltEgammaHoverEUnseeded_cfi import * + from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import * from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import * from ..sequences.HLTL1Sequence_cfi import * from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import * -from ..sequences.HLTPhoton187UnseededInnerSequence_cfi import * +from ..sequences.HLTFastJetForEgammaSequence_cfi import * -HLTPhoton187UnseededSequence = cms.Sequence(HLTL1Sequence+l1tTkEmSingle51Filter+HLTDoFullUnpackingEgammaEcalSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+HLTPhoton187UnseededInnerSequence+hltEgammaCandidatesWrapperUnseeded+hltEG187EtUnseededFilter+hltPhoton187HgcalHEUnseededFilter+hltPhoton187HEUnseededFilter) +HLTPhoton187UnseededSequence = cms.Sequence(HLTL1Sequence + +l1tTkEmSingle51Filter + +HLTDoFullUnpackingEgammaEcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG187EtUnseededFilter + +hltEgammaHGCALIDVarsUnseeded + +hltPhoton187HgcalHEUnseededFilter + +HLTEGammaDoLocalHcalSequence + +HLTFastJetForEgammaSequence + +hltEgammaHoverEUnseeded + +hltPhoton187HEUnseededFilter)