Commit 217b6a11 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'overlay/bscleanup' into 'master'

Move OverlayByteStreamAlgs under the Overlay domain

See merge request !35389
parents 3f5139bf abd495b4
......@@ -74,7 +74,7 @@ svcMgr.ByteStreamAddressProviderSvc.TypeNames += ["HLT::HLTResult/HLTResult_EF",
"CTP_RDO/CTP_RDO", "CTP_RIO/CTP_RIO"]
# main alg
from OverlayByteStreamAlgs.OverlayByteStreamAlgsConf import BSFilter
from OverlayByteStreamUtils.OverlayByteStreamUtilsConf import BSFilter
filAlg = BSFilter("BSFilter")
topSequence += filAlg
if hasattr( runArgs, "triggerBit"):
......@@ -101,7 +101,7 @@ else:
BSFilterLog.info( '**** ByteStreamCopyTool configuration' )
if hasattr( runArgs, 'InputLbnMapFile'):
from OverlayByteStreamAlgs.OverlayByteStreamAlgsConf import ByteStreamMultipleOutputStreamCopyTool
from OverlayByteStreamUtils.OverlayByteStreamUtilsConf import ByteStreamMultipleOutputStreamCopyTool
bsCopyTool = ByteStreamMultipleOutputStreamCopyTool("MultipleOutputStreamBSCopyTool")
bsCopyTool.lbn_map_file = runArgs.InputLbnMapFile
if hasattr( runArgs, "inputFilterFile"): bsCopyTool.trigfile = runArgs.inputFilterFile
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( OverlayByteStreamAlgs )
atlas_subdir( OverlayByteStreamUtils )
# External dependencies:
find_package( ROOT COMPONENTS MathCore )
# Component(s) in the package:
atlas_add_component( OverlayByteStreamAlgs
atlas_add_component( OverlayByteStreamUtils
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
......
......@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef OVERLAYBYTESTREAMALGS_BSFILTER_H
#define OVERLAYBYTESTREAMALGS_BSFILTER_H
#ifndef OVERLAYBYTESTREAMUTILS_BSFILTER_H
#define OVERLAYBYTESTREAMUTILS_BSFILTER_H
#include <string>
#include <map>
......@@ -37,4 +37,4 @@ class BSFilter : public AthAlgorithm
ServiceHandle< TrigConf::ITrigConfigSvc > m_trigConf;
};
#endif //OVERLAYBYTESTREAMALGS_BSFILTER_H
#endif // OVERLAYBYTESTREAMUTILS_BSFILTER_H
......@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
# define OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
#ifndef OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
# define OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
/**
* @file ByteStreamMultipleOutputStreamCopyTool.h
*
......@@ -111,4 +111,4 @@ private:
};
#endif // OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
#endif // OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment