Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ordering of egamma HLT modules in unseeded paths #44849

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,36 @@
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 *
from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import *
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)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,25 +1,82 @@
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 *
from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import *
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)
Loading