Merge pull request #44592 from swagata87/fixOrdering_egamma

Fix ordering of egamma HLT modules

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDiphoton3023IsoCaloIdL1SeededSequence_cfi.py

@@ -12,7 +12,14 @@
 from ..modules.hltEG30EtL1SeededFilter_cfi import *
 from ..modules.hltEgammaCandidatesWrapperL1Seeded_cfi import *
 from ..modules.hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi import *
-from ..sequences.HLTDiphoton3023IsoCaloIdL1SeededInnerSequence_cfi import *
+from ..modules.hltEgammaCandidatesL1Seeded_cfi import *
+from ..modules.hltEgammaClusterShapeL1Seeded_cfi import *
+from ..modules.hltEgammaEcalPFClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHcalPFClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHGCALIDVarsL1Seeded_cfi import *
+from ..modules.hltEgammaHGCalLayerClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHoverEL1Seeded_cfi import *
+
 from ..sequences.HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi import *
 from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
 from ..sequences.HLTFastJetForEgammaSequence_cfi import *
@@ -21,4 +28,29 @@
 from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
 from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
 
-HLTDiphoton3023IsoCaloIdL1SeededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForDoublePhotonIsolatedFilter+HLTDoFullUnpackingEgammaEcalL1SeededSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaL1SeededSequence+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence+HLTFastJetForEgammaSequence+HLTPFHcalClusteringForEgammaSequence+HLTDiphoton3023IsoCaloIdL1SeededInnerSequence+hltEgammaCandidatesWrapperL1Seeded+hltEG30EtL1SeededFilter+hltDiEG23EtL1SeededFilter+hltDiEG3023IsoCaloIdClusterShapeL1SeededFilter+hltDiEG3023IsoCaloIdClusterShapeSigmavvL1SeededFilter+hltDiEG3023IsoCaloIdClusterShapeSigmawwL1SeededFilter+hltDiEG3023IsoCaloIdHgcalHEL1SeededFilter+hltDiEG3023IsoCaloIdHEL1SeededFilter+hltDiEG3023IsoCaloIdEcalIsoL1SeededFilter+hltDiEG3023IsoCaloIdHgcalIsoL1SeededFilter+hltDiEG3023IsoCaloIdHcalIsoL1SeededFilter)
+HLTDiphoton3023IsoCaloIdL1SeededSequence = cms.Sequence(HLTL1Sequence
+                                                        +hltEGL1SeedsForDoublePhotonIsolatedFilter
+                                                        +HLTDoFullUnpackingEgammaEcalL1SeededSequence
+                                                        +HLTPFClusteringForEgammaL1SeededSequence
+                                                        +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
+                                                        +hltEgammaCandidatesL1Seeded
+                                                        +hltEgammaCandidatesWrapperL1Seeded
+                                                        +hltEG30EtL1SeededFilter
+                                                        +hltDiEG23EtL1SeededFilter
+                                                        +hltEgammaClusterShapeL1Seeded
+                                                        +hltDiEG3023IsoCaloIdClusterShapeL1SeededFilter
+                                                        +hltEgammaHGCALIDVarsL1Seeded
+                                                        +hltDiEG3023IsoCaloIdClusterShapeSigmavvL1SeededFilter
+                                                        +hltDiEG3023IsoCaloIdClusterShapeSigmawwL1SeededFilter
+                                                        +hltDiEG3023IsoCaloIdHgcalHEL1SeededFilter
+                                                        +HLTEGammaDoLocalHcalSequence
+                                                        +HLTFastJetForEgammaSequence
+                                                        +hltEgammaHoverEL1Seeded
+                                                        +hltDiEG3023IsoCaloIdHEL1SeededFilter
+                                                        +hltEgammaEcalPFClusterIsoL1Seeded
+                                                        +hltDiEG3023IsoCaloIdEcalIsoL1SeededFilter
+                                                        +hltEgammaHGCalLayerClusterIsoL1Seeded
+                                                        +hltDiEG3023IsoCaloIdHgcalIsoL1SeededFilter
+                                                        +HLTPFHcalClusteringForEgammaSequence
+                                                        +hltEgammaHcalPFClusterIsoL1Seeded                                                        
+                                                        +hltDiEG3023IsoCaloIdHcalIsoL1SeededFilter)

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi.py

@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from ..sequences.HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi import *
-from ..sequences.HLTDoubleEle2312IsoL1SeededInnerSequence_cfi import *
 from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
 from ..sequences.HLTElePixelMatchL1SeededSequence_cfi import *
 from ..sequences.HLTFastJetForEgammaSequence_cfi import *
@@ -10,16 +9,78 @@
 from ..sequences.HLTL1Sequence_cfi import *
 from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
 from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
+from ..sequences.HLTTrackingV61Sequence_cfi import *
+
+from ..modules.hltDiEG12EtL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoClusterShapeL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoClusterShapeSigmavvL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoClusterShapeSigmawwL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoEcalIsoL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoHcalIsoL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoHEL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoHgcalHEL1SeededFilter_cfi import *
+from ..modules.hltDiEG2312IsoHgcalIsoL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoBestGsfChi2L1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoBestGsfNLayerITL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoGsfDetaL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoGsfDphiL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoGsfOneOEMinusOneOPL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoGsfTrackIsoFromL1TracksL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoGsfTrackIsoL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoPixelMatchL1SeededFilter_cfi import *
+from ..modules.hltDiEle2312IsoPMS2L1SeededFilter_cfi import *
+from ..modules.hltEG23EtL1SeededFilter_cfi import *
+from ..modules.hltEgammaCandidatesWrapperL1Seeded_cfi import *
+from ..modules.hltEGL1SeedsForDoubleEleIsolatedFilter_cfi import *
+from ..modules.hltEgammaCandidatesL1Seeded_cfi import *
+from ..modules.hltEgammaClusterShapeL1Seeded_cfi import *
+from ..modules.hltEgammaEcalPFClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaEleGsfTrackIsoV6L1Seeded_cfi import *
+from ..modules.hltEgammaEleL1TrkIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHcalPFClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHGCALIDVarsL1Seeded_cfi import *
+from ..modules.hltEgammaHGCalLayerClusterIsoL1Seeded_cfi import *
+from ..modules.hltEgammaHoverEL1Seeded_cfi import *
+
 
 HLTDoubleEle2312IsoL1SeededSequence = cms.Sequence(HLTL1Sequence
     +hltEGL1SeedsForDoubleEleIsolatedFilter
     +HLTDoFullUnpackingEgammaEcalL1SeededSequence
-    +HLTEGammaDoLocalHcalSequence
     +HLTPFClusteringForEgammaL1SeededSequence
     +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
+    +hltEgammaCandidatesL1Seeded
+    +hltEgammaCandidatesWrapperL1Seeded
+    +hltEG23EtL1SeededFilter
+    +hltDiEG12EtL1SeededFilter
+    +hltEgammaClusterShapeL1Seeded
+    +hltDiEG2312IsoClusterShapeL1SeededFilter
+    +hltEgammaHGCALIDVarsL1Seeded
+    +hltDiEG2312IsoClusterShapeSigmavvL1SeededFilter
+    +hltDiEG2312IsoClusterShapeSigmawwL1SeededFilter
+    +hltDiEG2312IsoHgcalHEL1SeededFilter
+    +HLTEGammaDoLocalHcalSequence
     +HLTFastJetForEgammaSequence
+    +hltEgammaHoverEL1Seeded
+    +hltDiEG2312IsoHEL1SeededFilter
+    +hltEgammaEcalPFClusterIsoL1Seeded
+    +hltDiEG2312IsoEcalIsoL1SeededFilter
+    +hltEgammaHGCalLayerClusterIsoL1Seeded
+    +hltDiEG2312IsoHgcalIsoL1SeededFilter
     +HLTPFHcalClusteringForEgammaSequence
+    +hltEgammaHcalPFClusterIsoL1Seeded
+    +hltDiEG2312IsoHcalIsoL1SeededFilter
     +HLTElePixelMatchL1SeededSequence
+    +hltDiEle2312IsoPixelMatchL1SeededFilter
+    +hltDiEle2312IsoPMS2L1SeededFilter
     +HLTGsfElectronL1SeededSequence
-    +HLTDoubleEle2312IsoL1SeededInnerSequence
+    +hltDiEle2312IsoGsfOneOEMinusOneOPL1SeededFilter
+    +hltDiEle2312IsoGsfDetaL1SeededFilter
+    +hltDiEle2312IsoGsfDphiL1SeededFilter
+    +hltDiEle2312IsoBestGsfNLayerITL1SeededFilter
+    +hltDiEle2312IsoBestGsfChi2L1SeededFilter
+    +hltEgammaEleL1TrkIsoL1Seeded
+    +hltDiEle2312IsoGsfTrackIsoFromL1TracksL1SeededFilter
+    +HLTTrackingV61Sequence
+    +hltEgammaEleGsfTrackIsoV6L1Seeded
+    +hltDiEle2312IsoGsfTrackIsoL1SeededFilter
 )

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi.py

@@ -9,12 +9,34 @@
 from ..modules.hltDiEle25CaloIdLPMS2L1SeededFilter_cfi import *
 from ..modules.hltEgammaCandidatesWrapperL1Seeded_cfi import *
 from ..modules.hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi import *
+from ..modules.hltEgammaCandidatesL1Seeded_cfi import *
+from ..modules.hltEgammaClusterShapeL1Seeded_cfi import *
+from ..modules.hltEgammaHGCALIDVarsL1Seeded_cfi import *
+from ..modules.hltEgammaHoverEL1Seeded_cfi import *
+
 from ..sequences.HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi import *
-from ..sequences.HLTDoubleEle25CaloIdLPMS2L1SeededInnerSequence_cfi import *
 from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
 from ..sequences.HLTElePixelMatchL1SeededSequence_cfi import *
 from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
 from ..sequences.HLTL1Sequence_cfi import *
 from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
 
-HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForDoubleEleNonIsolatedFilter+HLTDoFullUnpackingEgammaEcalL1SeededSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaL1SeededSequence+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence+HLTDoubleEle25CaloIdLPMS2L1SeededInnerSequence+hltEgammaCandidatesWrapperL1Seeded+hltDiEG25EtL1SeededFilter+hltDiEG25CaloIdLClusterShapeL1SeededFilter+hltDiEG25CaloIdLClusterShapeSigmavvL1SeededFilter+hltDiEG25CaloIdLHgcalHEL1SeededFilter+hltDiEG25CaloIdLHEL1SeededFilter+HLTElePixelMatchL1SeededSequence+hltDiEle25CaloIdLPixelMatchL1SeededFilter+hltDiEle25CaloIdLPMS2L1SeededFilter)
+HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence(HLTL1Sequence
+                                                         +hltEGL1SeedsForDoubleEleNonIsolatedFilter
+                                                         +HLTDoFullUnpackingEgammaEcalL1SeededSequence
+                                                         +HLTPFClusteringForEgammaL1SeededSequence
+                                                         +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
+                                                         +hltEgammaCandidatesL1Seeded
+                                                         +hltEgammaCandidatesWrapperL1Seeded
+                                                         +hltDiEG25EtL1SeededFilter
+                                                         +hltEgammaClusterShapeL1Seeded
+                                                         +hltDiEG25CaloIdLClusterShapeL1SeededFilter
+                                                         +hltEgammaHGCALIDVarsL1Seeded
+                                                         +hltDiEG25CaloIdLClusterShapeSigmavvL1SeededFilter
+                                                         +hltDiEG25CaloIdLHgcalHEL1SeededFilter
+                                                         +HLTEGammaDoLocalHcalSequence
+                                                         +hltEgammaHoverEL1Seeded
+                                                         +hltDiEG25CaloIdLHEL1SeededFilter
+                                                         +HLTElePixelMatchL1SeededSequence
+                                                         +hltDiEle25CaloIdLPixelMatchL1SeededFilter
+                                                         +hltDiEle25CaloIdLPMS2L1SeededFilter)

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle115NonIsoL1SeededSequence_cfi.py

@@ -12,13 +12,41 @@
 from ..modules.hltEle115NonIsoHgcalHEL1SeededFilter_cfi import *
 from ..modules.hltEle115NonIsoPixelMatchL1SeededFilter_cfi import *
 from ..modules.hltEle115NonIsoPMS2L1SeededFilter_cfi import *
+from ..modules.hltEgammaCandidatesL1Seeded_cfi import *
+from ..modules.hltEgammaClusterShapeL1Seeded_cfi import *
+from ..modules.hltEgammaHGCALIDVarsL1Seeded_cfi import *
+from ..modules.hltEgammaHoverEL1Seeded_cfi import *
+
 from ..sequences.HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi import *
 from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
 from ..sequences.HLTEle115NonIsoL1SeededGsfElectronL1SeededSequence_cfi import *
-from ..sequences.HLTEle115NonIsoL1SeededInnerSequence_cfi import *
 from ..sequences.HLTElePixelMatchL1SeededSequence_cfi import *
 from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
 from ..sequences.HLTL1Sequence_cfi import *
 from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
+from ..sequences.HLTFastJetForEgammaSequence_cfi import *
 
-HLTEle115NonIsoL1SeededSequence = cms.Sequence(HLTL1Sequence+hltEGL1SeedsForSingleEleNonIsolatedFilter+HLTDoFullUnpackingEgammaEcalL1SeededSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaL1SeededSequence+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence+HLTElePixelMatchL1SeededSequence+HLTEle115NonIsoL1SeededInnerSequence+hltEgammaCandidatesWrapperL1Seeded+hltEG115EtL1SeededFilter+hltEle115NonIsoClusterShapeL1SeededFilter+hltEle115NonIsoClusterShapeSigmavvL1SeededFilter+hltEle115NonIsoClusterShapeSigmawwL1SeededFilter+hltEle115NonIsoHgcalHEL1SeededFilter+hltEle115NonIsoHEL1SeededFilter+hltEle115NonIsoPixelMatchL1SeededFilter+hltEle115NonIsoPMS2L1SeededFilter+HLTEle115NonIsoL1SeededGsfElectronL1SeededSequence+hltEle115NonIsoGsfDetaL1SeededFilter+hltEle115NonIsoGsfDphiL1SeededFilter)
+HLTEle115NonIsoL1SeededSequence = cms.Sequence(HLTL1Sequence
+        +hltEGL1SeedsForSingleEleNonIsolatedFilter
+        +HLTDoFullUnpackingEgammaEcalL1SeededSequence
+        +HLTPFClusteringForEgammaL1SeededSequence
+        +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
+        +hltEgammaCandidatesL1Seeded
+        +hltEgammaCandidatesWrapperL1Seeded
+        +hltEG115EtL1SeededFilter
+        +hltEgammaClusterShapeL1Seeded
+        +hltEle115NonIsoClusterShapeL1SeededFilter
+        +hltEgammaHGCALIDVarsL1Seeded
+        +hltEle115NonIsoClusterShapeSigmavvL1SeededFilter
+        +hltEle115NonIsoClusterShapeSigmawwL1SeededFilter
+        +hltEle115NonIsoHgcalHEL1SeededFilter
+        +HLTEGammaDoLocalHcalSequence
+        +HLTFastJetForEgammaSequence
+        +hltEgammaHoverEL1Seeded
+        +hltEle115NonIsoHEL1SeededFilter
+        +HLTElePixelMatchL1SeededSequence
+        +hltEle115NonIsoPixelMatchL1SeededFilter
+        +hltEle115NonIsoPMS2L1SeededFilter
+        +HLTEle115NonIsoL1SeededGsfElectronL1SeededSequence
+        +hltEle115NonIsoGsfDetaL1SeededFilter
+        +hltEle115NonIsoGsfDphiL1SeededFilter)