From 371e4ba8f3f114d7fa078d1f2c874a05cdcdd1ca Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 19:13:55 +0200
Subject: [PATCH] 'CMakeLists.txt' (TrigConfOffline-00-01-27)
* Make TrigHistoryAlg descend from Alg (fixes ATR-9464)
* TrigConfOffline-00-01-27
---
.../TrigConfOffline/CMakeLists.txt | 40 +++++++++++++
.../TrigConfOffline/python/TrigHistoryAlg.py | 59 +------------------
2 files changed, 43 insertions(+), 56 deletions(-)
create mode 100644 Trigger/TrigConfiguration/TrigConfOffline/CMakeLists.txt
diff --git a/Trigger/TrigConfiguration/TrigConfOffline/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfOffline/CMakeLists.txt
new file mode 100644
index 0000000000000..91dcf097d5bdc
--- /dev/null
+++ b/Trigger/TrigConfiguration/TrigConfOffline/CMakeLists.txt
@@ -0,0 +1,40 @@
+################################################################################
+# Package: TrigConfOffline
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrigConfOffline )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+ Trigger/TrigConfiguration/TrigConfHLTData
+ Trigger/TrigConfiguration/TrigConfL1Data
+ Trigger/TrigConfiguration/TrigConfStorage )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_dictionary( TrigConfL1DataDict
+ TrigConfOffline/TrigConfL1DataDict.h
+ TrigConfOffline/selectionL1Data.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigConfHLTData TrigConfL1Data TrigConfStorage )
+
+atlas_add_dictionary( TrigConfHLTDataDict
+ TrigConfOffline/TrigConfHLTDataDict.h
+ TrigConfOffline/selectionHLTData.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigConfHLTData TrigConfL1Data TrigConfStorage )
+
+atlas_add_dictionary( TrigConfStorageDict
+ TrigConfOffline/TrigConfStorageDict.h
+ TrigConfOffline/selectionStorage.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigConfHLTData TrigConfL1Data TrigConfStorage )
+
+# Install files from the package:
+atlas_install_headers( TrigConfOffline )
+atlas_install_python_modules( python/*.py )
+atlas_install_scripts( share/LoadTriggerMenuFromXML.py )
+
diff --git a/Trigger/TrigConfiguration/TrigConfOffline/python/TrigHistoryAlg.py b/Trigger/TrigConfiguration/TrigConfOffline/python/TrigHistoryAlg.py
index c0d5b1c26ca2a..8793af64456c2 100755
--- a/Trigger/TrigConfiguration/TrigConfOffline/python/TrigHistoryAlg.py
+++ b/Trigger/TrigConfiguration/TrigConfOffline/python/TrigHistoryAlg.py
@@ -10,70 +10,17 @@
###########################################################################
-from AthenaPython.PyAthena import StatusCode
+from AthenaPython.PyAthena import Alg, StatusCode
-from AthenaPython.Configurables import CfgPyAlgorithm, _get_prop_value
-
-class TrigHistoryAlg(CfgPyAlgorithm) :
+class TrigHistoryAlg(Alg) :
def __init__(self, name='TrigHistoryAlg', **kw):
super(TrigHistoryAlg, self).__init__(name, **kw)
from AthenaCommon.Logging import logging
self.__dict__['msg'] = logging.getLogger( 'TrigHistoryAlg.py' )
return
- def sysInitialize(self):
- self.msg.setLevel(_get_prop_value(self,'OutputLevel'))
- self.msg.info("sysInitialize")
- return self.initialize()
-
def initialize(self):
- self.msg.info("initialize")
+ self.msg.info("initialize - dumping configuration")
from TrigConfOffline.TrigHistoryDumper import dump
dump(self.OutputFile)
return StatusCode.Success
-
- def sysReinitialize(self):
- self.msg.setLevel(_get_prop_value(self,'OutputLevel'))
- return self.reinitialize()
-
- def reinitialize(self):
- self.msg.info( "==> re-initialize..." )
- return StatusCode.Success
-
- def sysExecute(self):
- #self.msg.info("Mirek: TestAlg - sysExecute")
- return StatusCode.Success
-
- def execute(self):
- #self.msg.info("Mirek: TestAlg - execute")
- return StatusCode.Success
-
- def sysFinalize(self):
- self.msg.info("sysFinalize")
- return self.finalize()
-
- def finalize(self):
- self.msg.info("finalize")
- return StatusCode.Success
-
- def sysBeginRun(self):
- return self.beginRun()
-
- def beginRun(self):
- self.msg.debug( "==> beginRun..." )
- return StatusCode.Success
-
- def sysEndRun(self):
- return self.endRun()
-
- def endRun(self):
- self.msg.debug( "==> endRun..." )
- return StatusCode.Success
-
- def filterPassed(self):
- """Did this algorithm pass or fail its filter criterion for the last event?"""
- return self._cppHandle.filterPassed()
-
- def setFilterPassed(self, state):
- """Set the filter passed flag to the specified state"""
- return self._cppHandle.setFilterPassed(state)
--
GitLab