fix

jlieberm · Sep 25, 2022 · 6f7f03d · 6f7f03d
2 parents d83e0ef + c152cb1
commit 6f7f03d
Show file tree

Hide file tree

Showing 8 changed files with 1,070 additions and 17 deletions.
diff --git a/core/python/EventATLAS.py b/core/python/EventATLAS.py
@@ -33,6 +33,9 @@ def initialize( self ):
     if self._dataframe is DataframeEnum.Electron_v1:
       from EventAtlas import Electron_v1
       self._event = Electron_v1()
+    elif self._dataframe is DataframeEnum.ElectronForward_v1:
+      from EventAtlas import ElectronForward_v1
+      self._event = ElectronForward_v1()
     elif self._dataframe is DataframeEnum.Photon_v1:
       from EventAtlas import Photon_v1
       self._event = Photon_v1()
@@ -43,6 +46,7 @@ def initialize( self ):
     MSG_INFO( self, "Creating containers...")
     # Allocating containers
     from EventAtlas import Electron
+    from EventAtlas import ElectronForward
     from EventAtlas import Photon
     from EventAtlas import TrigEMCluster
     from EventAtlas import TrigElectron
@@ -65,11 +69,7 @@ def initialize( self ):
                             'MenuContainer'              : Menu(),
                            }
 
-    self._containersSvc.update({
-                            'HLT__TrigEMClusterContainer': TrigEMCluster(),
-                            'HLT__CaloClusterContainer'  : CaloCluster(),
-                            'HLT__EmTauRoIContainer'     : EmTauRoI(),
-                            })
+
 
     if self._dataframe is DataframeEnum.Electron_v1:
       self._containersSvc.update({  'ElectronContainer'           : Electron(),
@@ -78,11 +78,22 @@ def initialize( self ):
                                     'HLT__ElectronContainer'      : Electron(),
                                     'HLT__TrackParticleContainer' : TrackParticle(),
                                 })
-
+      self._containersSvc.update({
+                            'HLT__TrigEMClusterContainer': TrigEMCluster(),
+                            'HLT__CaloClusterContainer'  : CaloCluster(),
+                            'HLT__EmTauRoIContainer'     : EmTauRoI(),
+                            })
+    elif self._dataframe is DataframeEnum.ElectronForward_v1:
+      self._containersSvc.update({  'ElectronForwardContainer'           : ElectronForward()})
     elif self._dataframe is DataframeEnum.Photon_v1:
       self._containersSvc.update({  'PhotonContainer'             : Photon(),
                                     'HLT__PhotonContainer'        : Photon(),
                                 })
+      self._containersSvc.update({
+                            'HLT__TrigEMClusterContainer': TrigEMCluster(),
+                            'HLT__CaloClusterContainer'  : CaloCluster(),
+                            'HLT__EmTauRoIContainer'     : EmTauRoI(),
+                            })
     else:
       return StatusCode.FATAL
 
@@ -143,7 +154,4 @@ def initialize( self ):
       if alg.initialize().isFailure():
         MSG_FATAL( self, "Impossible to initialize the tool name: %s",alg.name)
 
-    return StatusCode.SUCCESS
-
-
-
+    return StatusCode.SUCCESS
diff --git a/core/python/enumerations.py b/core/python/enumerations.py
@@ -13,4 +13,5 @@ class Dataframe(EnumStringification):
   PhysVal_v2 = 3
   SkimmedNtuple_v2  = 4
   Electron_v1 = 5
-  Photon_v1 = 6
+  Photon_v1 = 6
+  ElectronForward_v1 = 7