diff --git a/AtlasTest/ControlTest/share/test_seeking_athena_bs.py b/AtlasTest/ControlTest/share/test_seeking_athena_bs.py
index c3843dd4772ab1ce0f870b8084df09ea0125ff2f..0f0101edc154557dcfa5b4f7497b9f291659606c 100644
--- a/AtlasTest/ControlTest/share/test_seeking_athena_bs.py
+++ b/AtlasTest/ControlTest/share/test_seeking_athena_bs.py
@@ -50,7 +50,7 @@ OUTPUT='%(output_file_name)s'
include('ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py')
-svcMgr.ByteStreamInputSvc.FullFileName = %(input_file_list)s
+svcMgr.EventSelector.Input = %(input_file_list)s
import AthenaServices.PyAthenaEventLoopMgr as aspy
#aspy.enable_seeking()
@@ -147,4 +147,4 @@ diff = os.linesep.join( [d for d in diff] )
assert diff=='', diff
print "::: bye."
-print ":"*80
\ No newline at end of file
+print ":"*80
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaRead.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaRead.py
index 45e18d51b2838be6585978fa5f9873bbdacb4bcb..655b6590bd97c506e01482676929d4fd0d4df65d 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaRead.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaRead.py
@@ -25,7 +25,6 @@ theApp.EvtMax = 200000
if not hasattr(svcMgr,"ByteStreamCnvSvc"):
from ByteStreamCnvSvc import ReadByteStream
# Define the input
- svcMgr.ByteStreamInputSvc.FullFileName = [ "metatest.data" ]
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
svcMgr.ByteStreamCnvSvc.OutputLevel = DEBUG
@@ -38,6 +37,7 @@ from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamMetadataTool
svcMgr.MetaDataSvc.MetaDataTools += [ "ByteStreamMetadataTool" ]
#svcMgr.EventSelector.InputCollections = [ "test_defl.data" ]
+svcMgr.EventSelector.Input = [ "metatest.data" ]
#--------------------------------------------------------------
# Private Application Configuration options
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWrite.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWrite.py
index 521632e4b2d4badb2ea3f075dcb4d9fac6569e74..b899638c00bbd0837f1f04eab0f097d9ea960d89 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWrite.py
@@ -28,7 +28,7 @@ theApp.EvtMax = 200000
if not hasattr(svcMgr,"ByteStreamCnvSvc"):
from ByteStreamCnvSvc import ReadByteStream
# Define the input
- svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
+ svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
from ByteStreamCnvSvc import WriteByteStream
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
index 9dd526668f95cc9359379591bc426eb0d724e9ff..d9e4e12320bc18399c02622557eae8d0f66a2996 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
@@ -32,7 +32,6 @@ topSequence += PassNoneFilter
if not hasattr(svcMgr,"ByteStreamCnvSvc"):
from ByteStreamCnvSvc import ReadByteStream
# Define the input
- svcMgr.ByteStreamInputSvc.FullFileName = [ "metatest.data" ]
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
from ByteStreamCnvSvc import WriteByteStream
@@ -53,6 +52,7 @@ from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamMetadataTool
svcMgr.MetaDataSvc.MetaDataTools += [ "ByteStreamMetadataTool" ]
#svcMgr.EventSelector.InputCollections = [ "test_defl.data" ]
+svcMgr.EventSelector.Input= [ "metatest.data" ]
#--------------------------------------------------------------
# Private Application Configuration options
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index 489fdd523805b75c2cba882c5ae2d37907c4e9dd..17fbb7de231d8145d8c5eae3c138e49e6cd08a16 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -18,19 +18,20 @@ def ByteStreamReadCfg( inputFlags, typeNames=[] ):
if inputFlags.Input.SecondaryFiles:
filenames = inputFlags.Input.SecondaryFiles
eventSelector = EventSelectorByteStream("SecondaryEventSelector", IsSecondary=True)
+ eventSelector.Input = filenames
acc.addService( eventSelector )
else:
filenames = inputFlags.Input.Files
xAODMaker__EventInfoSelectorTool = CompFactory.xAODMaker.EventInfoSelectorTool
xconv = xAODMaker__EventInfoSelectorTool()
eventSelector = EventSelectorByteStream("EventSelector")
+ eventSelector.Input = filenames
eventSelector.HelperTools += [xconv]
eventSelector.SkipEvents=inputFlags.Exec.SkipEvents
acc.addService( eventSelector )
acc.setAppProperty( "EvtSel", eventSelector.name )
bsInputSvc = ByteStreamEventStorageInputSvc( "ByteStreamInputSvc" )
- bsInputSvc.FullFileName = filenames
if inputFlags.Overlay.DataOverlay:
bsInputSvc.EventInfoKey = inputFlags.Overlay.BkgPrefix + "EventInfo"
acc.addService( bsInputSvc )
diff --git a/Event/ByteStreamCnvSvc/share/BSFilter_test_jobOptions.py b/Event/ByteStreamCnvSvc/share/BSFilter_test_jobOptions.py
index d700968f9b956f3e6a537a5f3868d1993f29f5c7..5944a46f5576e525d0dfeebbd3311490b58b3491 100644
--- a/Event/ByteStreamCnvSvc/share/BSFilter_test_jobOptions.py
+++ b/Event/ByteStreamCnvSvc/share/BSFilter_test_jobOptions.py
@@ -11,7 +11,7 @@ svcMgr = theApp.serviceMgr()
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
theApp.EvtMax = 5000
-ByteStreamInputSvc.FullFileName += [
+EventSelector.Input += [
"/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data",
]
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index a77785f67b1faa584587ca8aad6ab5c161eec640..b3ac139d2874d0695feabc32a74c54ff13d6dba0 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -48,7 +48,6 @@ ByteStreamEventStorageInputSvc::ByteStreamEventStorageInputSvc(
, m_storeGate ("StoreGateSvc", name)
, m_inputMetadata("StoreGateSvc/InputMetaDataStore", name)
, m_robProvider ("ROBDataProviderSvc", name)
- , m_vExplicitFile(this, "FullFileName", {}, "")
, m_sequential (this, "EnableSequential", false, "")
, m_dump (this, "DumpFlag", false, "Dump fragments")
, m_wait (this, "WaitSecs", 0., "Seconds to wait if input is in wait state")
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
index 7385c5cb4b8576fb69f91f1de47f6355f5e5708e..d3a793f19dd838d6171e09c1fceef67b612ddfe4 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
@@ -96,7 +96,6 @@ private: // properties
ServiceHandle<StoreGateSvc> m_storeGate; //!< StoreGateSvc
ServiceHandle<StoreGateSvc> m_inputMetadata; //!< StoreGateSvc
ServiceHandle<IROBDataProviderSvc> m_robProvider;
- Gaudi::Property<std::vector<std::string> > m_vExplicitFile;
Gaudi::Property<bool> m_sequential; //!< enable sequential reading.
Gaudi::Property<bool> m_dump;
Gaudi::Property<float> m_wait;
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
index f4bf2ee6b2d916e33d122fc349fa4213584b9491..5991520c7c5732446820db900207478623caa31e 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
@@ -17,7 +17,6 @@
#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIoComponentMgr.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "AthenaKernel/IAthenaIPCTool.h"
#include "EventInfo/EventInfo.h"
@@ -76,44 +75,8 @@ StatusCode EventSelectorByteStream::initialize() {
// Check for input setting
if (m_filebased && m_inputCollectionsProp.value().empty()) {
- ATH_MSG_WARNING("InputCollections not properly set, checking EventStorageInputSvc properties");
- ServiceHandle<IJobOptionsSvc> joSvc("JobOptionsSvc", name());
- bool retrieve(false);
- if (!joSvc.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get JobOptionsSvc.");
- } else {
- // Check if FullFileName is set in the InputSvc
- typedef std::vector<const Property*> Properties_t;
- const Properties_t* esProps = joSvc->getProperties("ByteStreamInputSvc");
- std::vector<const Property*>::const_iterator ii = esProps->begin();
- if (esProps != 0) {
- while (ii != esProps->end()) {
- if ((*ii)->name() == "FullFileName") {
- StringArrayProperty temp;
- if ((*ii)->load(temp)) {
- retrieve = true;
- m_inputCollectionsProp.assign(temp);
- m_inputCollectionsFromIS = true;
- ATH_MSG_INFO("Retrieved InputCollections from InputSvc");
- }
- }
- if ((*ii)->name() == "EventStore") {
- StringProperty temp2;
- if ((*ii)->load(temp2)) {
- m_evtStore = ServiceHandle<StoreGateSvc>(temp2.value(),this->name());
- ATH_MSG_INFO("Retrieved StoreGateSvc name of " << temp2);
- }
- }
- ++ii;
- }
- } else {
- ATH_MSG_WARNING("Did not find InputSvc jobOptions properties");
- }
- }
- if (!retrieve) {
- ATH_MSG_FATAL("Unable to retrieve valid input list");
- return(StatusCode::FAILURE);
- }
+ ATH_MSG_FATAL("Unable to retrieve valid input list");
+ return(StatusCode::FAILURE);
}
m_skipEventSequence = m_skipEventSequenceProp.value();
std::sort(m_skipEventSequence.begin(), m_skipEventSequence.end());
diff --git a/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py b/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
index 80020fc764748d9d9df3068e3db794e1d5786637..fe00342c3405eea8c80a4e3ebcc354009d2803a0 100644
--- a/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
+++ b/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
@@ -5,9 +5,9 @@
#==============================================================
# Input
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.ByteStreamInputSvc.FullFileName = [ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" ]
-#svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
-#svcMgr.ByteStreamInputSvc.FullFileName += [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
+svcMgr.EventSelector.Input = [ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" ]
+#svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
+#svcMgr.EventSelector.Input += [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
#svcMgr.EventSelector.InputCollections = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
#svcMgr.ByteStreamInputSvc.ValidateEvent = False
diff --git a/Event/ByteStreamTest/share/MPSharedQueue.py b/Event/ByteStreamTest/share/MPSharedQueue.py
index 653c605f91617f0b4c403775e2091906302ff3d6..231252caec9adecf850531fd92621a52eb318d1b 100644
--- a/Event/ByteStreamTest/share/MPSharedQueue.py
+++ b/Event/ByteStreamTest/share/MPSharedQueue.py
@@ -6,7 +6,7 @@
# Input
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
+svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
from AthenaMP.AthenaMPFlags import jobproperties as jps
jps.AthenaMPFlags.Strategy='SharedQueue'
diff --git a/Event/ByteStreamTest/share/MPSharedReader.py b/Event/ByteStreamTest/share/MPSharedReader.py
index b5c211cf9b5072bab43653ecf395b40022f7230f..57dc53ce0a199064cf8eb078ac351829bbc0e96d 100644
--- a/Event/ByteStreamTest/share/MPSharedReader.py
+++ b/Event/ByteStreamTest/share/MPSharedReader.py
@@ -6,7 +6,7 @@
# Input
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
+svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
from AthenaMP.AthenaMPFlags import jobproperties as jps
jps.AthenaMPFlags.UseSharedReader=True
diff --git a/Event/ByteStreamTest/share/Selectors.py b/Event/ByteStreamTest/share/Selectors.py
index 21b614513b21c06a3f14cd1508b46927180582ff..6c25ec9de62efdcd1707fc02cbe7c0c746629e79 100755
--- a/Event/ByteStreamTest/share/Selectors.py
+++ b/Event/ByteStreamTest/share/Selectors.py
@@ -12,7 +12,7 @@ svcMgr = theApp.serviceMgr()
#ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
theApp.EvtMax = 500
-#svcMgr.ByteStreamInputSvc.FullFileName += [
+#svcMgr.EventSelector.Input += [
# "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data",
# ]
diff --git a/Event/ByteStreamTest/share/SkipAll.py b/Event/ByteStreamTest/share/SkipAll.py
index 696b65ce20ae7a9c9430abe8085720532deac0bb..cf87dd8314abe552ee7a1634f646df7e798ad3d0 100755
--- a/Event/ByteStreamTest/share/SkipAll.py
+++ b/Event/ByteStreamTest/share/SkipAll.py
@@ -28,7 +28,7 @@ if not hasattr(svcMgr,"ByteStreamCnvSvc"): from ByteStreamCnvSvc import ReadByte
# Define the input
svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
-#svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
+#svcMgr.EventSelector.Input = [ "/afs/cern.ch/atlas/maxidisk/d108/cranshaw/nightlies/extractedEvents.data" ]
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
svcMgr.ByteStreamInputSvc.OutputLevel=DEBUG
#svcMgr.ByteStreamInputSvc.DumpFlag = True
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
index 11b9169864fc7652f1ea61571dd073298fcf7c1c..c29e29758c901b74d8f4f36dfca36954237802bd 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
@@ -35,7 +35,7 @@ if overlayFlags.isDataOverlay():
from InDetRecExample.InDetJobProperties import InDetFlags
from ByteStreamCnvSvc import ReadByteStream
include("RecExCommon/BSRead_config.py")
- ServiceMgr.ByteStreamInputSvc.FullFileName = DataInputCollections
+ ServiceMgr.EventSelector.Input = DataInputCollections
ServiceMgr.ByteStreamInputSvc.EventStore= "StoreGateSvc/"+overlayFlags.dataStore()
from AthenaKernel import StoreID
ServiceMgr.ByteStreamAddressProviderSvc.StoreID=StoreID.UNKNOWN
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
index 991e6f8bbe01b628c8b4f531c2a762365d6cb8ec..01026f34be5610dff6669c4a3e39d6d869740ef6 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
@@ -37,11 +37,11 @@ BSFilterLog.info( '**** ByteStreamInputSvc configuration' )
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-# ByteStreamInputSvc.FullFileName = open(runArgs.InputFileMapFile).readline().rstrip().split(',')
+# EventSelector.Input = open(runArgs.InputFileMapFile).readline().rstrip().split(',')
if hasattr( runArgs, 'inputZeroBiasBSFile'):
- ByteStreamInputSvc.FullFileName=runArgs.inputZeroBiasBSFile
+ EventSelector.Input=runArgs.inputZeroBiasBSFile
else:
- ByteStreamInputSvc.FullFileName=runArgs.inputBS_SKIMFile
+ EventSelector.Input=runArgs.inputBS_SKIMFile
print ByteStreamInputSvc
# ---------------------------
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py b/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py
index ba693856347303e5fde77bf4eed9e2784cb11881..8176d3b697e2be56e03c0075b63565ab6fd89f0b 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py
@@ -119,8 +119,8 @@ conddb.addFolder("","<db>oracle://ATLAS_COOLPROD;schema=ATLAS_COOLOFL_FWD;dbname
#-------------------------------------------------------------------------------------------------#
globalflags.InputFormat.set_Value_and_Lock('bytestream')
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-#ServiceMgr.ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/work/g/ggach/public/xAOD/myTest/RAW/data15_13TeV/data15_13TeV.00266904.calibration_ALFACalib.daq.RAW._lb0000._SFO-6._0002.data"]
-ServiceMgr.ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/work/g/ggach/public/xAOD/myTest/RAW/data15_13TeV/data15_13TeV.00267358.physics_Main.merge.RAW._lb0005._SFO-2._0001.1"]
+#ServiceMgr.EventSelector.Input = ["/afs/cern.ch/work/g/ggach/public/xAOD/myTest/RAW/data15_13TeV/data15_13TeV.00266904.calibration_ALFACalib.daq.RAW._lb0000._SFO-6._0002.data"]
+ServiceMgr.EventSelector.Input = ["/afs/cern.ch/work/g/ggach/public/xAOD/myTest/RAW/data15_13TeV/data15_13TeV.00267358.physics_Main.merge.RAW._lb0005._SFO-2._0001.1"]
from ALFA_RawDataByteStreamCnv.ALFA_RawDataByteStreamCnvConf import ALFA_RawDataProvider
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions.py
index a1566aa9a80589dd00255791fc8f6dcfd04ee0e9..4c528f7520cceb55028f6dc252fedf3abcc7d237 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions.py
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions.py
@@ -12,7 +12,7 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
# EventStorage Input
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
+EventSelector.Input = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
#["/castor/cern.ch/grid/atlas/DAQ/2009/00115405/physics_ZDCStream/" + \
#"data09_cos.00115405.physics_ZDCStream.daq.RAW._lb0000._SFO-1._0064.data"]
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v2.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v2.py
index f0e4e4cd1222b980ddee26ac5802a7c50e8ac66a..77dd6bfc1d641e1c220fe57a0267132c19f9d473 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v2.py
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v2.py
@@ -12,7 +12,7 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
# EventStorage Input
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName = \
+EventSelector.Input = \
["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
#["/tmp/leite/test_map/data_test.00146536.calibration_map.daq.RAW._lb0000._ROSEventBuilder._0001.data"]
#["/castor/cern.ch/grid/atlas/DAQ/2009/00115405/physics_ZDCStream/" + \
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v3.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v3.py
index 94648e09068c3954cb50b0b84c39e2f9dbfa6c5f..2b8bbced4bae6601ac0c5ab5f86ee03e4cdbff3d 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v3.py
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v3.py
@@ -12,8 +12,8 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
# EventStorage Input
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
-#ByteStreamInputSvc.FullFileName = \
+EventSelector.Input = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
+#EventSelector.Input = \
#["/tmp/leite/test_map/data_test.00146536.calibration_map.daq.RAW._lb0000._ROSEventBuilder._0001.data"]
#["/castor/cern.ch/grid/atlas/DAQ/2009/00115405/physics_ZDCStream/" + \
#"data09_cos.00115405.physics_ZDCStream.daq.RAW._lb0000._SFO-1._0064.data"]
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v4.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v4.py
index 574e68ad4181955e91fa848dec9e5f33d2bc7394..e66a3db08952c96b851012173b9c68a62e535312 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v4.py
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v4.py
@@ -12,9 +12,9 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
# EventStorage Input
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-#ByteStreamInputSvc.FullFileName = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
-#ByteStreamInputSvc.FullFileName = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-zdc/ZdcData/standalone/data15_calib.00283741.calibration_.daq.RAW._lb0000._ROS-FWD-ZDC-00._0001.data"]
-ByteStreamInputSvc.FullFileName = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-zdc/ZdcData/calib/data15_calib.00285911.calibration_.daq.RAW._lb0000._ROS-FWD-ZDC-00._0001.data"]
+#EventSelector.Input = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_hi.00193403.physics_HardProbes.merge.RAW._lb0012._SFO-9._0001.1"]
+#EventSelector.Input = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-zdc/ZdcData/standalone/data15_calib.00283741.calibration_.daq.RAW._lb0000._ROS-FWD-ZDC-00._0001.data"]
+EventSelector.Input = ["root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-zdc/ZdcData/calib/data15_calib.00285911.calibration_.daq.RAW._lb0000._ROS-FWD-ZDC-00._0001.data"]
from AthenaCommon.GlobalFlags import GlobalFlags
GlobalFlags.InputFormat = "bytestream"
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/TestZdcDataAccess_jobOptions.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/TestZdcDataAccess_jobOptions.py
index 2ab74ea3a05cb8f84dd185c0251439ee3c4001bf..b240a579d3741b37b023dc252a5e283209a88e3a 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/TestZdcDataAccess_jobOptions.py
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/TestZdcDataAccess_jobOptions.py
@@ -12,7 +12,7 @@ from ByteStreamCnvSvc import ReadByteStream
import struct
-svcMgr.ByteStreamInputSvc.FullFileName = [InputFile]
+svcMgr.EventSelector.Input = [InputFile]
from AthenaCommon.GlobalFlags import globalflags
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/share/AthenaL2muCalibTestOptions.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/share/AthenaL2muCalibTestOptions.py
index 8edcee0103a0f02f086bd0dd3c4dd4fd47a61750..b80fe7ea8389e320102f0be89c1435dbbab76307 100755
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/share/AthenaL2muCalibTestOptions.py
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/share/AthenaL2muCalibTestOptions.py
@@ -77,7 +77,7 @@ svcMgr.ByteStreamAddressProviderSvc.OutputLevel = DEBUG
#
#==============================================================
-svcMgr.ByteStreamInputSvc.FullFileName = [ "bla-muon-calib._0001.data"]
+svcMgr.EventSelector.Input = [ "bla-muon-calib._0001.data"]
#**************************************************************
#
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/CompareModulesTDAQandBytestream.py b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/CompareModulesTDAQandBytestream.py
index fae53276e89a0907460245468396be9ce7d4ec7a..46254d90192d8361d0a83e782ad09f6f8c1fc849 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/CompareModulesTDAQandBytestream.py
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/CompareModulesTDAQandBytestream.py
@@ -377,7 +377,7 @@ if globalflags.InputFormat() == 'pool':
elif globalflags.InputFormat() == 'bytestream':
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include("InDetRecExample/InDetReadBS_jobOptions.py")
- ServiceMgr.ByteStreamInputSvc.FullFileName = collection
+ ServiceMgr.EventSelector.Input = collection
### configure the event selector
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
index ff6bdb8ee35aa6e8e1c171b0397e270b66c70783..67a11a30b79b11bdfad63f0e66fa9ce03a63e3fd 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
@@ -151,7 +151,7 @@ if globalflags.InputFormat() == 'pool':
elif globalflags.InputFormat() == 'bytestream':
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include("InDetRecExample/InDetReadBS_jobOptions.py")
- ServiceMgr.ByteStreamInputSvc.FullFileName = collection
+ ServiceMgr.EventSelector.Input = collection
topSequence += NoiseMapBuilder
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/createFilesForRun.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/createFilesForRun.py
index 4e1e0f2062a79383c3fa205c6e6f32e6630caecb..4808d8aa7ac99c42a5ee873e16a1b0269e364111 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/createFilesForRun.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/createFilesForRun.py
@@ -6,7 +6,7 @@ import os, sys, runInfo,re
def inputBs(dataFilename):
outputFile='input_BS.py' #the file to write will be an input file to the jobOptions
f=open(outputFile,'w')
- f.write('ServiceMgr.ByteStreamInputSvc.FullFileName = [\n')
+ f.write('ServiceMgr.EventSelector.Input = [\n')
f.write('"'+dataFilename+'"\n]\n')
f.close()
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/input_BS.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/input_BS.py
index e3dfcf9149d5afe2e4d01ecbd58950f7fb36dc1a..ea8498ffd9142bca89526f1a76173d26a570ae54 100755
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/input_BS.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/input_BS.py
@@ -1,3 +1,3 @@
-ServiceMgr.ByteStreamInputSvc.FullFileName = [
+ServiceMgr.EventSelector.Input = [
"/afs/cern.ch/user/s/sctcalib/scratch0/test_results/data/data10_7TeV.00167661.calibration_SCTNoise.daq.RAW._lb0000._SFO-9._0003.data"
]
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
index 48f2c191d435793d54a1f21359ef9973b582402c..3a1f2e3b90dccf4cac555e09db4db10433db5fe0 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
@@ -497,7 +497,7 @@ SCTCalib.ReadBS = ReadBS
#--- Input files
if hasattr( runArgs, 'InputType' ) :
if runArgs.InputType is 'RAW' :
- ServiceMgr.ByteStreamInputSvc.FullFileName = runArgs.inputNames
+ ServiceMgr.EventSelector.Input = runArgs.inputNames
# ServiceMgr.ByteStreamInputSvc.PartName = runArgs.part
elif runArgs.InputType is 'NTUP_TRKVALID' :
SCTCalib.InputTrkVal = runArgs.inputNames
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
index f6dceb0e3c109b9240a943f516adca6c3e28eca1..4f99c8040c7bccc63381619f31db8e0bedbd69b1 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
@@ -203,7 +203,7 @@ if not doReadBS:
ostring+="""
if doReadBS:
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "some file" ]
+ ServiceMgr.EventSelector.Input = [ "some file" ]
#--------------------------------------------------------------
# Calibration stuff
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
index 8e776c2d9caf4efe0ac898c1cd27607d84517f0d..2250a635c5554660c65a7ffadc72bdafa1e94f4e 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
@@ -198,7 +198,7 @@ if not doReadBS:
ostring+="""
if doReadBS:
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "some file" ]
+ ServiceMgr.EventSelector.Input = [ "some file" ]
#--------------------------------------------------------------
# Calibration stuff
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
index ad030dcad25e6d55bb946f820a38408e8b704b5b..f59d0676c4559c8c3f4d95a245d2e9cf37e26248 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
@@ -206,7 +206,7 @@ if not doReadBS:
ostring+="""
if doReadBS:
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "some file" ]
+ ServiceMgr.EventSelector.Input = [ "some file" ]
#--------------------------------------------------------------
# Calibration stuff
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicTemplate.py
index 8ce490169a2615a9d48deea7e9faf16228770d5a..eeefef9e05817f4e5aba3e6e85f91377b1771a43 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicTemplate.py
@@ -217,7 +217,7 @@ if not doReadBS:
ostring+="""
if doReadBS:
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "some file" ]
+ ServiceMgr.EventSelector.Input = [ "some file" ]
#--------------------------------------------------------------
# Calibration stuff
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
index 5e6e52226353cd57580e0e4ac9b841dac3381e82..1a6981374cf2297a51f8ab6536702c6ea227fa48 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
@@ -271,7 +271,7 @@ theApp.EvtMax = %i""" % nevents
#ServiceMgr.EventSelector.SkipEvents = 2
#ServiceMgr.StoreGateSvc.Dump = True
-ServiceMgr.ByteStreamInputSvc.FullFileName = ["""
+ServiceMgr.EventSelector.Input = ["""
for i in range(len(inputfiles)-1):
ostring+='"%s", ' % inputfiles[i]
ostring+='"%s"]' % inputfiles[len(inputfiles)-1]
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
index b03f998135e64bda30ef322dda2d909bb576e3f9..2f4efb9abeb81779ef2af2f76d229a022f073129 100755
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
@@ -208,7 +208,7 @@ theApp.EvtMax = 10
#ServiceMgr.EventSelector.SkipEvents = 2
#ServiceMgr.StoreGateSvc.Dump = True
-#ServiceMgr.ByteStreamInputSvc.FullFileName = ["data12_8TeV.00208485.express_express.merge.RAW._lb0055._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0056._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0057._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0058._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0059._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0060._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0061._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0062._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0063._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0064._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0065._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0066._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0067._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0068._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0069._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0070._SFO-ALL._0001.1"]
+#ServiceMgr.EventSelector.Input = ["data12_8TeV.00208485.express_express.merge.RAW._lb0055._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0056._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0057._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0058._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0059._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0060._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0061._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0062._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0063._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0064._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0065._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0066._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0067._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0068._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0069._SFO-ALL._0001.1","data12_8TeV.00208485.express_express.merge.RAW._lb0070._SFO-ALL._0001.1"]
from AthenaCommon.AppMgr import ToolSvc
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/BSexample.py b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/BSexample.py
index 83f8e08e6a8159cca545bd924eb9305158736bf2..c2d751d89c8d207711885f7bd18dc064644a7551 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/BSexample.py
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/BSexample.py
@@ -73,6 +73,6 @@ if not doReadBS:
#ServiceMgr.EventSelector.InputCollections = ["castor:/castor/cern.ch/grid/atlas/datafiles/egamma/DC3.007040.singlepart_gamma_Et20/digit/120031/ideal0_mc12.007040.singlepart_gamma_Et20.digit.RDO.v12003108_tid005022._00001.pool.root"]
#ServiceMgr.EventSelector.InputCollections += ["castor:/castor/cern.ch/grid/atlas/datafiles/egamma/DC3.007040.singlepart_gamma_Et20/digit/120031/ideal0_mc12.007040.singlepart_gamma_Et20.digit.RDO.v12003108_tid005022._00002.pool.root"]
if doReadBS:
- #ServiceMgr.ByteStreamInputSvc.FullFileName = [ "rfio:/castor/cern.ch/user/w/wildauer/calib0.007003.singlepart_e_Et25.digit.RDO.v12003101_tid003425._00001.bs.data" ]
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "RawEvent.re" ]
+ #ServiceMgr.EventSelector.Input = [ "rfio:/castor/cern.ch/user/w/wildauer/calib0.007003.singlepart_e_Et25.digit.RDO.v12003101_tid003425._00001.bs.data" ]
+ ServiceMgr.EventSelector.Input = [ "RawEvent.re" ]
ServiceMgr.ByteStreamInputSvc.NumFile = [1] # this might be the same as SkipEvents?? useless if it just specifies the number of input files ...
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index 791905bbbea36780aa8d72b11c29b5b4135b6a72..9547557cb61ae1dc9b3593864c387bf64864216f 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -100,7 +100,7 @@ IOVDbSvc.OutputLevel = WARNING
# Set input byte stream file (from q431 test)
inputBSFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.daq.RAW._lb0310._SFO-1._0001.data"]
include("ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py")
-ServiceMgr.ByteStreamInputSvc.FullFileName = inputBSFiles
+ServiceMgr.EventSelector.Input = inputBSFiles
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
athenaCommonFlags.FilesInput = inputBSFiles
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
index 799c13013d55e87df77a3f8901e75ce55b846c69..69623dbdc040f5e9fbe70d5cb239e92abd9b5031 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
@@ -8,6 +8,7 @@
#include "SCT_Cabling/ISCT_CablingTool.h"
#include "InDetIdentifier/SCT_ID.h"
#include "EventContainers/IdentifiableContTemp.h"
+#include "EventContainers/IdentifiableContainerBase.h"
#include <memory>
diff --git a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/datasets.py b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/datasets.py
index 5271e4f17648a43ee160c7d20180de4189ba8681..2b940be7ae533064b47bf86bf04f4b1c40afa94a 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/datasets.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/datasets.py
@@ -44,7 +44,7 @@ class CastorDataset(object):
athenaCommonFlags.FilesInput = copy.deepcopy(self.filePaths)
#ServiceMgr.EventSelector.InputCollections = copy.deepcopy(self.filePaths)
- #ServiceMgr.ByteStreamInputSvc.FullFileName = copy.deepcopy(self.filePaths)
+ #ServiceMgr.EventSelector.Input = copy.deepcopy(self.filePaths)
if (shuffle):
import random
@@ -192,7 +192,7 @@ class EOSDataset(object):
athenaCommonFlags.FilesInput = copy.deepcopy(self.filePaths)
#ServiceMgr.EventSelector.InputCollections = copy.deepcopy(self.filePaths)
- #ServiceMgr.ByteStreamInputSvc.FullFileName = copy.deepcopy(self.filePaths)
+ #ServiceMgr.EventSelector.Input = copy.deepcopy(self.filePaths)
if (shuffle):
import random
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/JobSetupFragment.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/JobSetupFragment.py
index cde5a1496253956b9c1e07e4d7dd2c66a2d98394..c4498501288b9b4bc4e55185bcd4c561f0179253 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/JobSetupFragment.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/JobSetupFragment.py
@@ -52,7 +52,7 @@ if not jobConfig['bytestream']:
ServiceMgr.PoolSvc.AttemptCatalogPatch=True
ServiceMgr.EventSelector.InputCollections = jobConfig['inputfiles']
else:
- ServiceMgr.ByteStreamInputSvc.FullFileName = jobConfig['inputfiles']
+ ServiceMgr.EventSelector.Input = jobConfig['inputfiles']
# Number of events
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
index b254e3b35595d48e44d7b6e9176506965bb35122..dc78cdfc6ccddc4b782c21e51c0b69d9056dc6b0 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
@@ -56,7 +56,7 @@ if globalflags.InputFormat() == 'bytestream':
# configure converters, including cabling
include("InDetRecExample/InDetReadBS_jobOptions.py")
if 'athenaCommonFlags' in dir() and athenaCommonFlags.FilesInput():
- ServiceMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.FilesInput()
+ ServiceMgr.EventSelector.Input = athenaCommonFlags.FilesInput()
else:
# set up pool reading
import AthenaPoolCnvSvc.ReadAthenaPool
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/TESTS/testEFIDReadBSMemAudit.py b/InnerDetector/InDetExample/InDetTrigRecExample/TESTS/testEFIDReadBSMemAudit.py
index 5e4bd7cd2dbbfbaa2a451299842c3bf8ccee0b0b..b8703204386f5b259f1772d5648dc782938facaf 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/TESTS/testEFIDReadBSMemAudit.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/TESTS/testEFIDReadBSMemAudit.py
@@ -61,8 +61,8 @@ if 'theRTTisRunningMe' in dir() and theRTTisRunningMe:
print "input data to be set up by RTT"
del ByteStreamInputSvc
else:
- ByteStreamInputSvc.FullFileName = BSRDOInput
- print ByteStreamInputSvc.FullFileName
+ EventSelector.Input = BSRDOInput
+ print EventSelector.Input
# algorithm to measure vmem size
theApp.DLLs += [ "TrigTestTools" ]
theApp.TopAlg += [ "MemAuditAlg" ]
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigReadBS_jobOptions.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigReadBS_jobOptions.py
index 8ac6c52ba14a0e0d32dfd497ca618b1548e72220..0bdb4392531b0635dc2f260d750d8e6b28d550b6 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigReadBS_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigReadBS_jobOptions.py
@@ -8,14 +8,14 @@ from AthenaCommon.AppMgr import ToolSvc
# InputSvc
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageInputSvc
-ByteStreamInputSvc = ByteStreamEventStorageInputSvc("ByteStreamInputSvc",
- FullFileName = ["RawEvent.re"])
+ByteStreamInputSvc = ByteStreamEventStorageInputSvc("ByteStreamInputSvc")
ServiceMgr += ByteStreamInputSvc
print ByteStreamInputSvc
# get EventSelector
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import EventSelectorByteStream
EventSelector = EventSelectorByteStream("EventSelector",
+ Input = ["RawEvent.re"],
ByteStreamInputSvc = "ByteStreamInputSvc")
ServiceMgr += EventSelector
# declare EventSelector to theApp
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
index ccdc6bd88e7e91a16e7a7b62d601b7fb28f91334..fc65bd7d3fe8b34cce4d10985906563f6703ac74 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
@@ -352,7 +352,7 @@ if not doReadBS:
ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d38/ID_ValidationData/testIdeal_07.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000201_tid002760._00002.pool.root.1"]
#ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d89/InDetRecRDO.root"]
else:
- ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
+ EventSelector.Input = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
# ------------------------------------------------------------
# switch off history service
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
index fd431e1cc36e9d2c82c6421e782e4b333e0023ee..18c51da92ee13dfc809c29f1d2d455ddc1c65ca5 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
@@ -351,7 +351,7 @@ if not doReadBS:
ServiceMgr.EventSelector.InputCollections = ["rfio:/castor/cern.ch/user/e/enzuobon/RTT/RTTdata/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301_tid003138._00001.pool.root.4"]
#ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d89/InDetRecRDO.root"]
else:
- ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
+ EventSelector.Input = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
# ------------------------------------------------------------
# switch off history service
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
index 150efdf99ba1f20a3db1166a2f567680175a1571..61515232d5082d0ba6bf0b7fe7b40699f3a1737b 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
@@ -304,7 +304,7 @@ if not doReadBS:
ServiceMgr.EventSelector.InputCollections = ["rfio:/castor/cern.ch/user/e/enzuobon/RTT/RTTdata/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301_tid003138._00001.pool.root.4"]
#ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d89/InDetRecRDO.root"]
else:
- ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
+ EventSelector.Input = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/data/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.bs-lvl1sim.v12000301_tid003138._00001.pool.root"]
# ------------------------------------------------------------
# switch off history service
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
index bdc04982b5545ba9a42bfa10f012d55713915c84..a4b72d0cd66d9f21fa9ba8d4ec2d2aa2995f0c7c 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
@@ -353,7 +353,7 @@ if not doReadBS:
ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d38/ID_ValidationData/testIdeal_07.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000201_tid002760._00002.pool.root.1"]
#ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d89/InDetRecRDO.root"]
else:
- ByteStreamInputSvc.FullFileName = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/releases/data/daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data"]
+ EventSelector.Input = ["/afs/cern.ch/atlas/project/trigger/pesa-sw/releases/data/daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data"]
# ------------------------------------------------------------
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
index 1fc5469676b6e76587882c1a3ce62ca22137a1be..9893bb893701206cd2843679531eab76066ff5c0 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
@@ -57,7 +57,7 @@ if globalflags.InputFormat() == 'pool':
ServiceMgr.EventSelector.InputCollections = collection
elif globalflags.InputFormat() == 'bytestream':
include("InDetRecExample/InDetReadBS_jobOptions.py")
- ServiceMgr.ByteStreamInputSvc.FullFileName = collection
+ ServiceMgr.EventSelector.Input = collection
#--------------------------------------------------------------
# include SCT Clusterization
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/share/jobOptions_artest.py b/InnerDetector/InDetMonitoring/TRT_Monitoring/share/jobOptions_artest.py
index b6759d2610db2abf1653dfbf87cc3c1373fea2a3..532b64bb2ee4debb27913176e4437ac173ff607a 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/share/jobOptions_artest.py
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/share/jobOptions_artest.py
@@ -76,9 +76,9 @@ if not doReadBS:
ServiceMgr.PoolSvc.AttemptCatalogPatch=True
ServiceMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/maxidisk/d158/CSC.005200.T1_McAtNlo_Jimmy.RDO.pool.root" ]
if doReadBS:
-# ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/e/eyazici/rawdata/data12_8TeV.00205010.physics_ZeroBiasOverlay.merge.RAW/data12_8TeV.00205010.physics_ZeroBiasOverlay.merge.RAW._lb0137._SFO-ALL._0001.1"]
-#AB ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/e/eyazici/rawdata/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW._lb0423._SFO-ALL._0001.1"]
-#ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/work/e/ecelebi/public/data11_7TeV.00179710.physics_ZeroBias.merge.RAW" ]
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/e/eyazici/public/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW._lb0423._SFO-ALL._0001.1"]
+# ServiceMgr.EventSelector.Input = [ "/afs/cern.ch/user/e/eyazici/rawdata/data12_8TeV.00205010.physics_ZeroBiasOverlay.merge.RAW/data12_8TeV.00205010.physics_ZeroBiasOverlay.merge.RAW._lb0137._SFO-ALL._0001.1"]
+#AB ServiceMgr.EventSelector.Input = [ "/afs/cern.ch/user/e/eyazici/rawdata/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW._lb0423._SFO-ALL._0001.1"]
+#ServiceMgr.EventSelector.Input = [ "/afs/cern.ch/work/e/ecelebi/public/data11_7TeV.00179710.physics_ZeroBias.merge.RAW" ]
+ ServiceMgr.EventSelector.Input = [ "/afs/cern.ch/user/e/eyazici/public/data12_8TeV.00201113.physics_ZeroBiasOverlay.merge.RAW._lb0423._SFO-ALL._0001.1"]
-# ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/tmp/rjungst/testinput"]
+# ServiceMgr.EventSelector.Input = [ "/tmp/rjungst/testinput"]
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index 6880029de6a0086885f6aa7126f51453b605e77c..9e15f052297dd87b4cbe232fcda9a3fadeb0101c 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -137,7 +137,7 @@ IOVDbSvc.GlobalTag="CONDBR2-BLKPA-2018-03"
IOVDbSvc.OutputLevel = WARNING
include("ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py")
-ServiceMgr.ByteStreamInputSvc.FullFileName = inputBSFiles
+ServiceMgr.EventSelector.Input = inputBSFiles
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
athenaCommonFlags.FilesInput = inputBSFiles
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.data.raw.py b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.data.raw.py
index d36ea305ee958d24b3e7c745a26617eaa6efddf1..ca9cb5c47fed4d7d4b7035ec74a41944a7cac03f 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.data.raw.py
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.data.raw.py
@@ -218,10 +218,10 @@ if not doReadBS:
if doReadBS:
# input used for FDR2b (run 8): low lumi (2.3 min bias, 10^33)/pile-up/shifted vertex run 8
# this file needs (as set by default): DetDescrVersion = "ATLAS-CSC-02-00-00" globalflags.ConditionsTag="OFLCOND-FDR-02-01-00", jobproperties.Beam.numberOfCollisions = 2.3
- ServiceMgr.ByteStreamInputSvc.FullFileName = [ "/tmp/jahreda/data11_7TeV.00191628.physics_ZeroBias.merge.RAW/data11_7TeV.00191628.physics_ZeroBias.merge.RAW._lb0216._SFO-ALL._0001.1"]
+ ServiceMgr.EventSelector.Input = [ "/tmp/jahreda/data11_7TeV.00191628.physics_ZeroBias.merge.RAW/data11_7TeV.00191628.physics_ZeroBias.merge.RAW._lb0216._SFO-ALL._0001.1"]
# if you create the input BS file yourself with InDetWriteBS jobO the output will be this file
# and you have to set the detdescr and cond tag to what you used ...
- #ServiceMgr.ByteStreamInputSvc.FullFileName = [ "daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data" ]
+ #ServiceMgr.EventSelector.Input = [ "daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data" ]
from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
theAtlasExtrapolator = AtlasExtrapolator()
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
index 2bd22534b250e8903ef2b40e5fa4c9c0c54aac9b..f61de37ef5df66e65e687746ec469b18a7feec5e 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
@@ -59,7 +59,7 @@ from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr)
theApp.EvtMax=1
## theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
-## theByteStreamInputSvc.FullFileName=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
+## svcMgr.EventSelector.Input=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
diff --git a/LArCalorimeter/LArCafJobs/share/skeleton.LArCAF.py b/LArCalorimeter/LArCafJobs/share/skeleton.LArCAF.py
index 3fab8f41e70195b5035ba96b61a80ef373febd85..9b8a4e28718acdad576738572e802c1a39b60068 100644
--- a/LArCalorimeter/LArCafJobs/share/skeleton.LArCAF.py
+++ b/LArCalorimeter/LArCafJobs/share/skeleton.LArCAF.py
@@ -106,7 +106,7 @@ else:
#"COMCOND-BLKP-005-05"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
if hasattr(runArgs,"skipEvents"):
svcMgr.EventSelector.SkipEvents=runArgs.skipEvents
diff --git a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
index 1a5275fb9b19a051a047363d935428a8754f2b4b..e80661c8cac99b0cd77d8bf1a115ff9dd25e9e5b 100644
--- a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
+++ b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
@@ -115,7 +115,7 @@ else:
#"COMCOND-BLKP-005-05"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
if hasattr(runArgs,"skipEvents"):
svcMgr.EventSelector.SkipEvents=runArgs.skipEvents
diff --git a/LArCalorimeter/LArCalibTools/share/LArAverages2Ntuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArAverages2Ntuple_jobOptions.py
index f3bcafcc86663b09440e74582dd5f928cd27d972..0084c0d35f6844dc970d938cf3d25939a0df2a1d 100755
--- a/LArCalorimeter/LArCalibTools/share/LArAverages2Ntuple_jobOptions.py
+++ b/LArCalorimeter/LArCalibTools/share/LArAverages2Ntuple_jobOptions.py
@@ -29,9 +29,9 @@ ByteStreamAddressProviderSvc.TypeNames += ["LArCalibDigitContainer/MEDIUM"]
ByteStreamAddressProviderSvc.TypeNames += ["LArCalibDigitContainer/HIGH"]
# Three input files (for H8): accordion HG, accordion MG, PS (HG only)
-#ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005134_file01.data"]
-ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005135_file01.data"]
-#ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005136_file01.data"]
+#EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005134_file01.data"]
+EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005135_file01.data"]
+#EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005136_file01.data"]
include( "LArDetMgrDetDescrCnv/LArDetMgrDetDescrCnv_H8_joboptions.py" )
diff --git a/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
index add93e7a5c15331519d77f0515c37d68f4fdc9e4..f970419da63695f8020366d57d5bfb45c65cf5a3 100755
--- a/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
+++ b/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
@@ -137,7 +137,7 @@ if not 'FullFileName' in dir():
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
svcMgr.ByteStreamCnvSvc.InitCnvs += [ "EventInfo"]
diff --git a/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py b/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py
index 655a40f262376fac6cfcc811a09e498fda4aad1c..ef841ebcfdbabcaec408469898c4253cace327ec 100644
--- a/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py
+++ b/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py
@@ -45,7 +45,7 @@ from AtlasGeoModel import GeoModelInit
from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
topSequence+=xAODMaker__EventInfoCnvAlg()
-svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
#Get identifier mapping (needed by LArConditionsContainer)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_ReadLArROD.py b/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_ReadLArROD.py
index 643a52434bcc170ba28a4bc26c007f7588ae31ca..9582dc31349db6d3808776b47a67e9f992764496 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_ReadLArROD.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_ReadLArROD.py
@@ -9,7 +9,7 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
# EventStorage Input
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName = ["daq.csc12.0000000.Single.Stream.LB0000.Athena._0001.data"]
+EventSelector.Input = ["daq.csc12.0000000.Single.Stream.LB0000.Athena._0001.data"]
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
from AthenaCommon.DetFlags import DetFlags
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_AutoCorrPhys_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_AutoCorrPhys_jobOptions.py
index 695ef4bcd3ee6a4b6ceaa03ff3d0db16e04329ec..4a1f8d7d3e663ee7229492f8c29396739faeb230 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_AutoCorrPhys_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_AutoCorrPhys_jobOptions.py
@@ -123,7 +123,7 @@ except:
pass
theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
-theByteStreamInputSvc.FullFileName=athenaCommonFlags.FilesInput()
+svcMgr.EventSelector.Input=athenaCommonFlags.FilesInput()
theByteStreamAddressProviderSvc =svcMgr.ByteStreamAddressProviderSvc
theByteStreamAddressProviderSvc.TypeNames += ["LArFebHeaderContainer/LArFebHeader"]
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Ramp_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Ramp_jobOptions.py
index 1968221f8a98ea9a7f5b0c8c6d61a2d2acfd16cf..44d7c37a06ecc556e36a5abf84a9a8283a0e96b8 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Ramp_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Ramp_jobOptions.py
@@ -22,9 +22,9 @@ ByteStreamAddressProviderSvc.TypeNames += ["LArCalibDigitContainer/MEDIUM"]
ByteStreamAddressProviderSvc.TypeNames += ["LArCalibDigitContainer/HIGH"]
# Three input files (for H8): accordion HG, accordion MG, PS (HG only)
-ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005134_file01.data"]
-ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005135_file01.data"]
-ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005136_file01.data"]
+EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005134_file01.data"]
+EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005135_file01.data"]
+EventSelector.Input += ["/castor/cern.ch/atlas/testbeam/lar/2004/daq_ROS-41_LargCalib_0005136_file01.data"]
include( "LArDetMgrDetDescrCnv/LArDetMgrDetDescrCnv_H8_joboptions.py" )
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
index 82a87d4bb1c07993b65989e2fb8f81a1ce5b44d2..0810c2f37f22283d0dcdbf5a593f4208f0ab0540 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
@@ -263,7 +263,7 @@ if not 'FullFileName' in dir():
DelayLog.info( "No FullFileName! Please give a FullFileName list.")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
svcMgr.EventSelector.MaxBadEvents = 0
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
index 1fc6e113ac4fe5626a9ebc17c31d6117c8bfa028..46b460d5d60da649c097cc48d78452bb6338d38e 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
@@ -451,7 +451,7 @@ if not 'FullFileName' in dir():
DelayOFCLog.info( "No FullFileName! Please give a FullFileName list.")
theApp.exit(-1)
else :
- #theByteStreamInputSvc.FullFileName=FullFileName
+ #svcMgr.EventSelector.Input=FullFileName
svcMgr.EventSelector.Input = FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
@@ -463,8 +463,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
# else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
index d318758a2df18b20c6f722012bc4219d5bc93f8e..974f7af0800ad475b58f2ad5d5d169fbbcef24ff 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
@@ -450,7 +450,7 @@ if not 'FullFileName' in dir():
DelayLog.info( "No FullFileName! Please give a FullFileName list.")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
svcMgr.EventSelector.MaxBadEvents = 0
@@ -461,8 +461,8 @@ svcMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
# else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
index d6bde46597b78d0ede04654d92c026a0e10cdaf5..394e43803e155d54154ad27ab18398454cb2da12 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
@@ -268,7 +268,7 @@ if not 'FullFileName' in dir():
DelayLog.info( "No FullFileName! Please give a FullFileName list.")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
@@ -279,8 +279,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
# else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
index f4798504b7d213c80f5e2e4d51dbc2d6cdf626df..6a56f053460154c336e48e16e7b10ef51ee9c35c 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
@@ -296,9 +296,9 @@ if not 'FullFileName' in dir():
DelayLog.info( "No FullFileName! Please give a FullFileName list.")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
-scvMgr.EventSelector.MaxBadEvents = 0
+svcMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
@@ -307,8 +307,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
# else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DigitAccumulator_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DigitAccumulator_jobOptions.py
index 75772be30e5b4c0b5e9c1df43e03dafe87ecbdf8..707ef4518de6653649bac79aaabacec1479d3283 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DigitAccumulator_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DigitAccumulator_jobOptions.py
@@ -257,7 +257,7 @@ if not 'FullFileName' in dir():
PedestalAutoCorrLog.info( "No FullFileName! Please give a FullFileName list")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
from LArByteStream.LArByteStreamConf import LArRodDecoder
svcMgr.ToolSvc += LArRodDecoder()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_FillOFCPhase.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_FillOFCPhase.py
index 9aee485ae7b6f38c682c7d9b5e37fd34981680ea..98a92edeeaa56c87c5f6d78799ab55f640f35d62 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_FillOFCPhase.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_FillOFCPhase.py
@@ -18,7 +18,7 @@ include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" )
#include ("LArConditionsCommon/LArMinimalSetup.py")
#theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
-#theByteStreamInputSvc.FullFileName=["/data/pavol/athena_calib/daq.Ramp.0031077.No.Streaming.LB0000.EB-ECC._0001.data"]
+#svcMgr.EventSelector.Input=["/data/pavol/athena_calib/daq.Ramp.0031077.No.Streaming.LB0000.EB-ECC._0001.data"]
#--------------------------------------------------------------
# pick a proper run number for conditions
#--------------------------------------------------------------
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
index 7e8acce43737142c6cb8ec8e3e1ec77df3bbceb5..a09a8f0525a1e70108c9a114771e9b1a7aa3f7f3 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
@@ -283,7 +283,7 @@ if not 'FullFileName' in dir():
PedestalAutoCorrLog.info( "No FullFileName! Please give a FullFileName list")
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
@@ -294,8 +294,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
# else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
index 42b97e043065bd416aca2fc9936fe9edc6d5aa01..94d2ea6624b3e5381dc5df03fda30cdafb3c25c8 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
@@ -344,7 +344,7 @@ if not 'FullFileName' in dir():
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
@@ -355,8 +355,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
#else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
index c4a990f607f6304ad67c8487ce7a87e738cb52b6..935026b83565f5d9fd1d31830dbe56fa05763798 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
@@ -320,7 +320,7 @@ if not 'FullFileName' in dir():
theApp.exit(-1)
else :
- theByteStreamInputSvc.FullFileName=FullFileName
+ svcMgr.EventSelector.Input=FullFileName
scvMgr.EventSelector.MaxBadEvents = 0
@@ -331,8 +331,8 @@ scvMgr.EventSelector.MaxBadEvents = 0
# maybe useful one day #
# #
#else #
-# theByteStreamInputSvc.FullFileName=OneFileName #
-# for i in range(len(theByteStreamInputSvc.FullFileName)): #
+# svcMgr.EventSelector.Input=OneFileName #
+# for i in range(len(svcMgr.EventSelector.Input)): #
# theByteStreamInputSvc.NumFile+=[10000] #
##############################################################################################
diff --git a/LArCalorimeter/LArMonTools/share/LArMonByteStream.py b/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
index 3e29cdf1a47d3d21bff88edf0c942a1be236beca..b9c1830faae1bd7ce52e480723af615c281dc031 100755
--- a/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
+++ b/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
@@ -4,7 +4,7 @@
#
if not online:
theByteStreamInputSvc = svcMgr.ByteStreamInputSvc
- theByteStreamInputSvc.FullFileName = FullFileName
+ svcMgr.EventSelector.Input = FullFileName
svcMgr.EventSelector.MaxBadEvents = 0
else:
theApp.CreateSvc += ["ByteStreamCnvSvc"]
diff --git a/LArCalorimeter/LArMonTools/share/LArMonTools_RTT_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArMonTools_RTT_jobOptions.py
index 084b2149c1a4a7d5f944921136854ecdc7b4f04c..73363e515302e21eb1e9610ffbbf4d6d0d70110e 100755
--- a/LArCalorimeter/LArMonTools/share/LArMonTools_RTT_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArMonTools_RTT_jobOptions.py
@@ -69,7 +69,7 @@ ByteStreamInputSvc = Service( "ByteStreamInputSvc" )
ByteStreamInputSvc.InputDirectory = [ InputDir ]
ByteStreamInputSvc.FilePrefix = [ FilePrefix ]
ByteStreamInputSvc.RunNumber = [ RunNumber ]
-# ByteStreamInputSvc.FullFileName += [ InputFileName ]
+# EventSelector.Input += [ InputFileName ]
ByteStreamEventStorageInputSvc = Service( "ByteStreamEventStorageInputSvc" )
ByteStreamEventStorageInputSvc.ReaderType = "Castor"
diff --git a/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py b/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
index 8eda9ae6343d53ac5116af8b9bdd444e5b0bc681..dfedb684105f50529af77fc409483a89ca5fb6df 100644
--- a/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
+++ b/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
@@ -102,7 +102,7 @@ svcMgr.IOVDbSvc.GlobalTag=currentGlobalES
#"COMCOND-BLKP-005-05"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
svcMgr.EventSelector.SkipEvents=skipEvents
diff --git a/LArCalorimeter/LArROD/share/LArDigit2Ntuple.py b/LArCalorimeter/LArROD/share/LArDigit2Ntuple.py
index 1aa27646486d803acfad42826b818bba299eb053..3d353bb2e68b1292c86011b0e6d20e66aa11131c 100644
--- a/LArCalorimeter/LArROD/share/LArDigit2Ntuple.py
+++ b/LArCalorimeter/LArROD/share/LArDigit2Ntuple.py
@@ -15,7 +15,7 @@ include("LArConditionsCommon/LArMinimalSetup.py")
svcMgr.IOVDbSvc.GlobalTag="COMCOND-ES1C-001-00"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=CafJobInputs[0]
+svcMgr.EventSelector.Input=CafJobInputs[0]
# Specify the object you want to read from ByteStream
theByteStreamAddressProviderSvc = svcMgr.ByteStreamAddressProviderSvc
diff --git a/LArCalorimeter/LArROD/share/LArOFCIter2Ntuple.py b/LArCalorimeter/LArROD/share/LArOFCIter2Ntuple.py
index 7e8e9c56f60c1db6e576f2869094625d09d42fa6..5fe01fc9859e97b79f0fc0e51c16d3e704197f53 100644
--- a/LArCalorimeter/LArROD/share/LArOFCIter2Ntuple.py
+++ b/LArCalorimeter/LArROD/share/LArOFCIter2Ntuple.py
@@ -18,7 +18,7 @@ include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
svcMgr.IOVDbSvc.GlobalTag="COMCOND-BLKPA-RUN1-06"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=CafJobInputs[0]
+svcMgr.EventSelector.Input=CafJobInputs[0]
# Specify the object you want to read from ByteStream
theByteStreamAddressProviderSvc = svcMgr.ByteStreamAddressProviderSvc
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py b/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
index de2eefef723cd1ac10ff195e4629ba4a650a80a2..fce09c206b5213ca0a913c75294c6c030551adb2 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
+++ b/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
@@ -54,7 +54,7 @@ from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr,ToolSvc)
theApp.EvtMax=1
## theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
-## theByteStreamInputSvc.FullFileName=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
+## svcMgr.EventSelector.Input=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArCablingTest_atlas.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArCablingTest_atlas.py
index 39d48683a7f048156442a0b70930646b03596f98..fd6ac36f1fdbc5dc0986cce7be7202401acdb2a1 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/share/LArCablingTest_atlas.py
+++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArCablingTest_atlas.py
@@ -43,7 +43,7 @@ IOVDbSvc.Folders += ["/lar/LArElecCalibTB04/LArCalibParams"]
theApp.Dlls += [ "LArByteStream"]
ByteStreamInputSvc = Service( "ByteStreamInputSvc" )
-ByteStreamInputSvc.FullFileName += ["/castor/cern.ch/atlas/LargFec/Installation/daq_ROS-1_HIGH_InstCalib_0010157_file01.data"]
+EventSelector.Input += ["/castor/cern.ch/atlas/LargFec/Installation/daq_ROS-1_HIGH_InstCalib_0010157_file01.data"]
ByteStreamAddressProviderSvc = Service( "ByteStreamAddressProviderSvc" )
ByteStreamAddressProviderSvc.TypeNames += ["LArDigitContainer/LOW"]
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits.py
index 14adbb10ee739adc008705bd6eb1feeba9f75a64..b6f4a12c4f9a804d17dfb806013efdcf20fce8ba 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits.py
@@ -10,7 +10,7 @@ include("LArConditionsCommon/LArMinimalSetup.py")
svcMgr.IOVDbSvc.GlobalTag="CONDBR2-ES1PA-2015-05"
#Specify the input file(s)
-svcMgr.ByteStreamInputSvc.FullFileName=["/scratch/wlampl/data15_13TeV/data15_13TeV.00267073.express_express.merge.RAW._lb0706._SFO-ALL._0001.1",]
+svcMgr.EventSelector.Input=["/scratch/wlampl/data15_13TeV/data15_13TeV.00267073.express_express.merge.RAW._lb0706._SFO-ALL._0001.1",]
# Specify the object you want to read from ByteStream
theByteStreamAddressProviderSvc = svcMgr.ByteStreamAddressProviderSvc
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
index bb8c4626b0eb1933ee6979cc4e8cee789e1c0b9e..19cbbfd44be6b11097c2aaf1e26fb7b5ee4b43cb 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
@@ -153,8 +153,8 @@ include ( "MuonEventAthenaPool/MuonEventAthenaPool_joboptions.py" )
printfunc ('File list is')
printfunc (myInputFiles)
-ServiceMgr.ByteStreamInputSvc.FullFileName = myInputFiles
-#ServiceMgr.ByteStreamInputSvc.FullFileName = myTestFiles
+ServiceMgr.EventSelector.Input = myInputFiles
+#ServiceMgr.EventSelector.Input = myTestFiles
#---------------------------------------------------------------
# CSC Calibration from DB
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
index 656c122bdea83b0ff882f0db507cc6dd13e616f0..d549f9c85cec2779b9c4d9f506f9bc3704aefce0 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
@@ -113,7 +113,7 @@ include ( "MuonEventAthenaPool/MuonEventAthenaPool_joboptions.py" )
#Set input files
-ServiceMgr.ByteStreamInputSvc.FullFileName = myInputFiles
+ServiceMgr.EventSelector.Input = myInputFiles
#---------------------------------------------------------------
# CSC Calibration from DB
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
index c6be1c55d2031e6c09521fb8d7b3528e3a54802e..0e3953526aef2be9f3dd4617d64cb35c7f2e5d7a 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
@@ -102,7 +102,7 @@ if('inputFiles' not in dir()):
printfunc ('the input files are: ' )
printfunc (inputFiles)
-ServiceMgr.ByteStreamInputSvc.FullFileName= inputFiles
+ServiceMgr.EventSelector.Input = inputFiles
include ("CscCalibTools/CscCalibTool_jobOptions.py")
ToolSvc.CscCalibTool.ReadFromDatabase = True
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/share/ReadCscByteStream_topOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/share/ReadCscByteStream_topOptions.py
index 7a74b3dc5f2691b60307bd49bd845796012b4c5f..0fcc132c536220a3772f91db4c6f60081011f046 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/share/ReadCscByteStream_topOptions.py
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/share/ReadCscByteStream_topOptions.py
@@ -20,11 +20,11 @@ include( "MuonByteStream/ReadCscRDO_jobOptions.py" )
#ServiceMgr.ByteStreamInputSvc.DumpEvent = True
# Simulated data
-#ServiceMgr.ByteStreamInputSvc.FullFileName=["daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data"]
+#ServiceMgr.eventSelector.Input=["daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data"]
# Real data - from cosmic test for example
# Old cosmic data before the ROB id = ROD id fix
-#ServiceMgr.ByteStreamInputSvc.FullFileName=[
+#ServiceMgr.EventSelector.Input=[
#"rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001090_file01.data",
#"rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001105_file01.data",
#"rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001109_file01.data",
@@ -45,7 +45,7 @@ include( "MuonByteStream/ReadCscRDO_jobOptions.py" )
# Real data - from cosmic test for example
# New cosmic data after the ROB id = ROD id fix
-ServiceMgr.ByteStreamInputSvc.FullFileName=[
+ServiceMgr.EventSelector.Input=[
"/afs/cern.ch/user/k/ketevi/w0/data/daq_CSC-EB-RCD__0001190_file01.data"
]
diff --git a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/share/CscDataBuilder.py b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/share/CscDataBuilder.py
index f0c8c017c99e5e1ef0f57340f46d0b695b00303f..d12f21d39cab2c1a16b0ed3aef215d0e7f1098ab 100755
--- a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/share/CscDataBuilder.py
+++ b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/share/CscDataBuilder.py
@@ -119,7 +119,7 @@ elif inputStreamType == "RAW":
svcMgr = theApp.serviceMgr()
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageInputSvc
svcMgr += ByteStreamEventStorageInputSvc("ByteStreamInputSvc")
- cscEventSelector = svcMgr.ByteStreamInputSvc
+ cscEventSelector = svcMgr.EventSelector
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamCnvSvc
svcMgr += ByteStreamCnvSvc()
ByteStreamCnvSvc = svcMgr.ByteStreamCnvSvc
@@ -133,5 +133,5 @@ elif inputStreamType == "RDO":
"/afs/usatlas.bnl.gov/users/dladams/data/calib0.005145.PythiaZmumu.digit.RDO.v12003101_tid003432._00001.pool.root.1"
]
elif inputStreamType == "RAW":
-# cscEventSelector.FullFileName=["/afs/usatlas.bnl.gov/users/dladams/data/daq_CSC-EB-RCD__0001190_file01.data"]
- cscEventSelector.FullFileName=["rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001215_file01.data"]
+# cscEventSelector.Input=["/afs/usatlas.bnl.gov/users/dladams/data/daq_CSC-EB-RCD__0001190_file01.data"]
+ cscEventSelector.Input=["rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001215_file01.data"]
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runRPCdecodingDumpOnNtuple.py b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runRPCdecodingDumpOnNtuple.py
index f7fbac22feab38d620a57fd7d10879891360bacc..b798c5ee27b6b9272dc6fee0b4fa90c4e66dbe1b 100644
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runRPCdecodingDumpOnNtuple.py
+++ b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runRPCdecodingDumpOnNtuple.py
@@ -118,7 +118,7 @@ MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
#MessageSvc.setDebug+=["RpcROD_Decoder"]
from ByteStreamCnvSvc import ReadByteStream
-ServiceMgr.ByteStreamInputSvc.FullFileName=["root://eosatlas.cern.ch//eos/atlas/atlastier0/rucio/data15_cos/physics_CosmicMuons/00256385/data15_cos.00256385.physics_CosmicMuons.merge.RAW/data15_cos.00256385.physics_CosmicMuons.merge.RAW._lb0615._SFO-13._0001.1"]
+ServiceMgr.EventSelector.Input=["root://eosatlas.cern.ch//eos/atlas/atlastier0/rucio/data15_cos/physics_CosmicMuons/00256385/data15_cos.00256385.physics_CosmicMuons.merge.RAW/data15_cos.00256385.physics_CosmicMuons.merge.RAW._lb0615._SFO-13._0001.1"]
#import AthenaPoolCnvSvc.ReadAthenaPool
#ServiceMgr.EventSelector.InputBSCollections = [ "root://eosatlas.cern.ch//eos/atlas/atlastier0/rucio/data15_cos/physics_CosmicMuons/00256385/data15_cos.00256385.physics_CosmicMuons.merge.RAW/data15_cos.00256385.physics_CosmicMuons.merge.RAW._lb0615._SFO-13._0001.1" ]
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/SctNtuple_topOptions.py b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/SctNtuple_topOptions.py
index e3d6354c040ba3032a71836770a6ec48dfb56a65..c3b364890c302e0c10bd60d189e2e23df9e7f29a 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/SctNtuple_topOptions.py
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/SctNtuple_topOptions.py
@@ -56,6 +56,6 @@ if hasattr(runArgs,"maxEvents"):
#ServiceMgr.EventSelector.SkipEvents=1870
if globalflags.InputFormat() == 'bytestream':
- ServiceMgr.FullFileName=athenaCommonFlags.BSRDOInput()
+ ServiceMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
else:
ServiceMgr.EventSelector.InputCollections = InDetD3PDSCTFlags.inputFiles()
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 35d98527c10fe6f4d57fec0d9e9ab40391c70dc7..a30313ddc6a95be817a2fb0e5bc50183b4a3c845 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -466,9 +466,9 @@ if globalflags.InputFormat.is_bytestream():
# Specify input file
if len(athenaCommonFlags.FilesInput())>0:
- svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.FilesInput()
+ svcMgr.EventSelector.Input=athenaCommonFlags.FilesInput()
elif len(athenaCommonFlags.BSRDOInput())>0:
- svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+ svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
# --> AK
else:
logRecExCommon_topOptions.info("Read ByteStream file(s)")
@@ -476,9 +476,9 @@ if globalflags.InputFormat.is_bytestream():
# Specify input file
if len(athenaCommonFlags.FilesInput())>0:
- svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.FilesInput()
+ svcMgr.EventSelector.Input=athenaCommonFlags.FilesInput()
elif len(athenaCommonFlags.BSRDOInput())>0:
- svcMgr.ByteStreamInputSvc.FullFileName=athenaCommonFlags.BSRDOInput()
+ svcMgr.EventSelector.Input=athenaCommonFlags.BSRDOInput()
if globalflags.DataSource()=='geant4':
logRecExCommon_topOptions.info("DataSource is 'geant4'")
diff --git a/Reconstruction/RecExample/RecExConfig/python/PyComps.py b/Reconstruction/RecExample/RecExConfig/python/PyComps.py
index 58662d8077896ad7290f172d2498397e8e99f2d0..3dfb72e15a41d96287345f1953d7d8959fc43154 100644
--- a/Reconstruction/RecExample/RecExConfig/python/PyComps.py
+++ b/Reconstruction/RecExample/RecExConfig/python/PyComps.py
@@ -41,7 +41,7 @@ class AutoConfigConsistencyCheckSvc(PyAthena.Svc):
if esName=="EventSelectorAthenaPool":
ic=ServiceMgr.EventSelector.InputCollections
elif esName=="EventSelectorByteStream":
- ic=ServiceMgr.ByteStreamInputSvc.FullFileName
+ ic=ServiceMgr.EventSelector.Input
else:
self.msg.warning("Unknown EventSelector instance.Cannot check AutoCOnfig.")
return
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
index 1ff37a2cda997661b7d5436fb4ed9df2d95890c9..3b5cdc8c45164806c6c9b9149536b3583a1c5441 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
@@ -337,7 +337,7 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
theApp.ExtSvc += [ "ByteStreamCnvSvc" ]
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName += FileNameVec
+EventSelector.Input += FileNameVec
# read ByteStream and reconstruct data
include( "TileTBRec/TileTBRec_jobOptions.py" )
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
index 73667cff0c8497ed4a9f919c0a45b3d69c452e7a..1d5ef2d98437e4482a67131d61dbe337e792ef41 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
@@ -344,7 +344,7 @@ include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
theApp.ExtSvc += [ "ByteStreamCnvSvc" ]
ByteStreamInputSvc = svcMgr.ByteStreamInputSvc
-ByteStreamInputSvc.FullFileName += FileNameVec
+EventSelector.Input += FileNameVec
# read ByteStream and reconstruct data
include( "TileTBRec/TileTBRec_jobOptions.py" )
diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py
index 0cf62675c8923cc48b48f6ec9be1012af665202d..3cc44b408a36183264ec3d4eed2fb8495f2157a8 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py
@@ -308,7 +308,7 @@ printfunc (tileInfoConfigurator)
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
theApp.ExtSvc += [ "ByteStreamCnvSvc" ]
-svcMgr.ByteStreamInputSvc.FullFileName += FileNameVec
+svcMgr.EventSelector.Input += FileNameVec
svcMgr.ByteStreamCnvSvc.ROD2ROBmap = [ "-1" ]
svcMgr.ByteStreamAddressProviderSvc.TypeNames += ["TileBeamElemContainer/TileBeamElemCnt",
"TileRawChannelContainer/TileRawChannelCnt",
diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py
index 465f6796ff8ba9a85ce865f9672508fd84aa79ad..b3c00014d093f388b3c90a42c74e4fa7c0e142b1 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py
@@ -311,7 +311,7 @@ printfunc (tileInfoConfigurator)
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
theApp.ExtSvc += [ "ByteStreamCnvSvc" ]
-svcMgr.ByteStreamInputSvc.FullFileName += FileNameVec
+svcMgr.EventSelector.Input += FileNameVec
svcMgr.ByteStreamCnvSvc.ROD2ROBmap = [ "-1" ]
svcMgr.ByteStreamAddressProviderSvc.TypeNames += ["TileBeamElemContainer/TileBeamElemCnt",
"TileRawChannelContainer/TileRawChannelCnt",
diff --git a/TileCalorimeter/TileMonitoring/share/jobOptions_TileLasMon.py b/TileCalorimeter/TileMonitoring/share/jobOptions_TileLasMon.py
index 69f7f4e00e66c0b8cc070d3aca2debcb32b7a53d..a87a099bffaa7b9fc549f5dfbdf146511d6f4a87 100644
--- a/TileCalorimeter/TileMonitoring/share/jobOptions_TileLasMon.py
+++ b/TileCalorimeter/TileMonitoring/share/jobOptions_TileLasMon.py
@@ -143,7 +143,7 @@ if not athenaCommonFlags.isOnline():
log.info( "Skip Events is " + str(EvtMin) )
log.info( "Max events is " + str(EvtMax) )
- svcMgr.ByteStreamInputSvc.FullFileName = FileNameVec
+ svcMgr.EventSelector.Input = FileNameVec
svcMgr.EventSelector.MaxBadEvents = MaxBadEvents
athenaCommonFlags.FilesInput = FileNameVec
diff --git a/TileCalorimeter/TileMonitoring/share/jobOptions_TileTBMon.py b/TileCalorimeter/TileMonitoring/share/jobOptions_TileTBMon.py
index 0bc93c7dd42fb0deb4d31ba833ef876fa0d3f6fb..b4b335268179ef410f31a9d10576dc9d99d6b8af 100644
--- a/TileCalorimeter/TileMonitoring/share/jobOptions_TileTBMon.py
+++ b/TileCalorimeter/TileMonitoring/share/jobOptions_TileTBMon.py
@@ -204,7 +204,7 @@ if not athenaCommonFlags.isOnline() or TestOnline:
log.info( "Skip Events is " + str(EvtMin) )
log.info( "Max events is " + str(EvtMax) )
- svcMgr.ByteStreamInputSvc.FullFileName = FileNameVec
+ svcMgr.EventSelector.Input = FileNameVec
svcMgr.EventSelector.MaxBadEvents = MaxBadEvents
athenaCommonFlags.FilesInput = FileNameVec
diff --git a/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py b/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py
index c26788947fd75a62d086565b00d9030ee1573617..64f0f5f5fb2f03ea259f6e68b1247195d2b044f4 100644
--- a/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py
+++ b/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py
@@ -22,7 +22,7 @@ include( "AthenaServices/AthenaSealSvc_joboptions.py" )
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageInputSvc
svcMgr += ByteStreamEventStorageInputSvc("ByteStreamInputSvc")
-svcMgr.ByteStreamInputSvc.FullFileName = BSFileList
+svcMgr.EventSelector.Input = BSFileList
from ByteStreamCnvSvcBase.ByteStreamCnvSvcBaseConf import ROBDataProviderSvc
svcMgr += ROBDataProviderSvc()
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py b/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
index 44e7450d244a2809ef2254831bc143c9a859a7c8..504f3c2fa6fcdc0e2260d8eea68115b138b96c9f 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
@@ -39,10 +39,10 @@ if not ('BSRDOInput' in dir()) or len(BSRDOInput) < 1:
BSRDOInput = readInputFiles('input_files.txt', 'RAW')
if ('BSRDOInput' in dir()):
- svcMgr.ByteStreamInputSvc.FullFileName = BSRDOInput
+ svcMgr.EventSelector.Input = BSRDOInput
-if len(svcMgr.ByteStreamInputSvc.FullFileName) == 0:
- print 'ERROR! svcMgr.ByteStreamInputSvc.FullFileName is empty'
+if len(svcMgr.EventSelector.Input) == 0:
+ print 'ERROR! svcMgr.EventSelector.Input is empty'
sys.exit(1)
#----------------------------------------------------------------------
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/share/readTrigCost.py b/Trigger/TrigMonitoring/TrigCostMonitor/share/readTrigCost.py
index 9040992541f6ae2bf84a9d8b7aba93356b642f5d..ceff0d601a144c8a1f85eafd50f3b27bceb5c891 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/share/readTrigCost.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/share/readTrigCost.py
@@ -59,10 +59,10 @@ svcMgr.ByteStreamAddressProviderSvc.TypeNames += [ "HLT::HLTResult/HLTResult_L2"
# Set input files
#
if ('BSRDOInput' in dir()):
- svcMgr.ByteStreamInputSvc.FullFileName = BSRDOInput
+ svcMgr.EventSelector.Input = BSRDOInput
-if len(svcMgr.ByteStreamInputSvc.FullFileName) == 0:
- print 'ERROR! svcMgr.ByteStreamInputSvc.FullFileName is empty'
+if len(svcMgr.EventSelector.Input) == 0:
+ print 'ERROR! svcMgr.EventSelector.Input is empty'
sys.exit(1)
#----------------------------------------------------------------------
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/run/standalone_TrigHLTMonCommon.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/run/standalone_TrigHLTMonCommon.py
index 4bbe53bf4f91c0c9bfd57193543d3623cdc8fc79..1cbc21188c31ba1e3833eb32eccbfbc1454c5f61 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/run/standalone_TrigHLTMonCommon.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/run/standalone_TrigHLTMonCommon.py
@@ -24,7 +24,7 @@ topSequence = AlgSequence()
#-- set up BS reading ------------------------------------------------------------------------------
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = [InputFile]
+svcMgr.EventSelector.Input = [InputFile]
#-- set up output histogram file ------------------------------------------------------------------------------
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
index 79cc8819bae691dedb8cf87895f321edf5e6cfae..3c0032bd774f7e69d8edd1727db38c61cc5cedad 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
@@ -86,7 +86,7 @@ if data_type == 'bytestream':
#-- set up BS reading ------------------------------------------------------------------------------
from ByteStreamCnvSvc import ReadByteStream
- svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.BSRDOInput()
+ svcMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
if hasattr(runArgs,"skipEvents"):
svcMgr.EventSelector.SkipEvents=runArgs.skipEvents
diff --git a/Trigger/TrigT1/L1Topo/L1TopoMonitoring/share/L1Topo_ReadBS_test.py b/Trigger/TrigT1/L1Topo/L1TopoMonitoring/share/L1Topo_ReadBS_test.py
index 5602fe8a7af710d84f9cd3d927499d4cea0c0e8c..2cc9f3d4a9bfd27d4d1a00621715b310d1bb36f5 100755
--- a/Trigger/TrigT1/L1Topo/L1TopoMonitoring/share/L1Topo_ReadBS_test.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoMonitoring/share/L1Topo_ReadBS_test.py
@@ -21,10 +21,10 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
-# older file, has wrong ROD id: svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/m/mzinser/public/l1calo-event.sim"]
-#svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/m/mzinser/public/InputSimon/Mode7/l1calo-event.sim" ]
-svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/m/mzinser/public/InputSimon/Mode8/l1calo-event.sim" ]
-#svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/user/s/sgeorge/atlaspublic/L1TopoCnv/mergedsim._0001.data" ]
+# older file, has wrong ROD id: svcMgr.EventSelector.Input = [ "/afs/cern.ch/user/m/mzinser/public/l1calo-event.sim"]
+#svcMgr.EventSelector.Input = [ "/afs/cern.ch/user/m/mzinser/public/InputSimon/Mode7/l1calo-event.sim" ]
+svcMgr.EventSelector.Input = [ "/afs/cern.ch/user/m/mzinser/public/InputSimon/Mode8/l1calo-event.sim" ]
+#svcMgr.EventSelector.Input = [ "/afs/cern.ch/user/s/sgeorge/atlaspublic/L1TopoCnv/mergedsim._0001.data" ]
svcMgr.ByteStreamInputSvc.ValidateEvent = True
svcMgr.EventSelector.ProcessBadEvent = True
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
index 051d937ebeb6585d25b24e906217006f0d25f69e..00ff054f95a82ee4c67e377db001c23a572538bc 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
@@ -258,7 +258,7 @@ svcMgr.THistSvc.Output = [ CTmonMan.FileKey + " DATAFILE='HistFile.root' OPT='RE
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.FilesInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.FilesInput()
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RIO_jobOptions.py" )
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/share/BS2xAOD.py b/Trigger/TrigT1/TrigT1CaloByteStream/share/BS2xAOD.py
index 2935b7e3f467b226799285fc89754b437ec13901..5e98b8a2710fabfa5582ee79c922c45fde86a400 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/share/BS2xAOD.py
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/share/BS2xAOD.py
@@ -61,7 +61,7 @@ xaodStream = MSMgr.NewPoolRootStream("StreamXAOD", OutFile)
# Tell Athena about the input file(s)
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = InFiles
+svcMgr.EventSelector.Input = InFiles
topSequence = CfgMgr.AthSequencer("AthAlgSeq")
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/share/TestTrigT1CaloDataAccess_jobOptions.py b/Trigger/TrigT1/TrigT1CaloByteStream/share/TestTrigT1CaloDataAccess_jobOptions.py
index c384aade9d0a53a3eb8b8f473d1a6c3c1450f312..8475188c07cd635d4e2be0d97f22581b62afc20f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/share/TestTrigT1CaloDataAccess_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/share/TestTrigT1CaloDataAccess_jobOptions.py
@@ -9,7 +9,7 @@ from ByteStreamCnvSvc import ReadByteStream
import struct
-svcMgr.ByteStreamInputSvc.FullFileName = [InputFile]
+svcMgr.EventSelector.Input = [InputFile]
from AthenaCommon.GlobalFlags import globalflags
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/share/xAODWrite_jobOptions.py b/Trigger/TrigT1/TrigT1CaloByteStream/share/xAODWrite_jobOptions.py
index 58e368eca367070b23e8fd6cf8ae3a06b33d5aa2..8152488094958cc800187e5cf7ee7e28dce5c270 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/share/xAODWrite_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/share/xAODWrite_jobOptions.py
@@ -31,7 +31,7 @@ InputFiles = [
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = InputFiles
+svcMgr.EventSelector.Input = InputFiles
include("TrigT1CaloByteStream/ReadLVL1CaloBSRun2_jobOptions.py")
svcMgr.MessageSvc.defaultLimit = 1000000
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/share/L1Calo_BS2xAOD_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibTools/share/L1Calo_BS2xAOD_jobOptions.py
index 7fca6aa505bd4756f7d5dbe9bbe44fae861afcf0..cd6a28378fa76b9da1c598d6c3c65c49401755a3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/share/L1Calo_BS2xAOD_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/share/L1Calo_BS2xAOD_jobOptions.py
@@ -35,7 +35,7 @@ nEvents = -1
# Tell Athena about the input file(s)
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = InFiles
+svcMgr.EventSelector.Input = InFiles
topSequence = CfgMgr.AthSequencer("AthAlgSeq")
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
index dff67a3e653bc1419e4614bca4ca988f902957ea..cdcd505107c3cd71a637de2b60e3770102fe1bea 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
@@ -99,7 +99,7 @@ from AtlasGeoModel import SetupRecoGeometry
# setup bytestream reading
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.FilesInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.FilesInput()
theApp.EvtMax = athenaCommonFlags.EvtMax()
svcMgr.EventSelector.SkipEvents = athenaCommonFlags.SkipEvents()
# Level-1 bs data
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
index 5a4b97b870865c468dc91edef96762a46bcd1108..f4f09421cd7715975e4449de3d57223a8afaf457 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
@@ -70,7 +70,7 @@ from AtlasGeoModel import SetupRecoGeometry
# setup bytestream reading
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.FilesInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.FilesInput()
theApp.EvtMax = athenaCommonFlags.EvtMax()
svcMgr.EventSelector.SkipEvents = athenaCommonFlags.SkipEvents()
# Level-1 bs data
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
index 5f9eb2afc43c0aec82762413a8110df7229469e8..69ff40592c7336e8fd71369b9fd79b5f8d067e73 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
@@ -72,7 +72,7 @@ from AtlasGeoModel import SetupRecoGeometry
# setup bytestream reading
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.FilesInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.FilesInput()
theApp.EvtMax = athenaCommonFlags.EvtMax()
svcMgr.EventSelector.SkipEvents = athenaCommonFlags.SkipEvents()
# Level-1 bs data
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
index fbe2c5141ec88e07c74c7f126418f1661029fe93..45837539ee1e56e5161b40f9a6fbd2197ebb6694 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
@@ -14,7 +14,7 @@ FilesInput = [
from ByteStreamCnvSvc import ReadByteStream
-svcMgr.ByteStreamInputSvc.FullFileName = FilesInput
+svcMgr.EventSelector.Input = FilesInput
include("TrigT1CaloByteStream/ReadLVL1CaloBSRun2_jobOptions.py")
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
index c8eb43ff757bf89478ab4fdf06c839f6b350af4e..448ed45b44f30a7527fe2324c346c7d22361983c 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
@@ -27,7 +27,7 @@ from AthenaCommon.AppMgr import ServiceMgr
# Set up the reading of the BS file:
#
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.ByteStreamInputSvc.FullFileName = [
+svcMgr.EventSelector.Input = [
"daq.lvl1test.0000000.Single.Stream.LB0000.Athena._0001.data"
]
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
index 47c3e1799bfa044c63c5509d55beca08c4dd9045..f14c69448623359521be90f4f3fcec143745138f 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
@@ -87,7 +87,7 @@ if globalflags.InputFormat()=='bytestream':
if not hasattr(svcMgr,"ByteStreamCnvSvc"):
from ByteStreamCnvSvc import ReadByteStream
# Define the input
- svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.BSRDOInput()
+ svcMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
index a5e3aedd2d02bb17b18cf0b568b77f6b702334b0..3fd1dfa6997f98019a74a16ad3bab0089250e7cb 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
@@ -82,7 +82,7 @@ svcMgr += StoreGateSvc("BSStoreGate")
svcMgr += ByteStreamEventStorageInputSvc("ByteStreamInputSvc")
svcMgr.ByteStreamInputSvc.EventStore = svcMgr.BSStoreGate
svcMgr.ByteStreamInputSvc.MetaDataStore = svcMgr.BSMetaDataStore
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
svcMgr += EventSelectorByteStream("BSEventSelector")
svcMgr.BSEventSelector.ByteStreamInputSvc = "ByteStreamInputSvc"
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
index b610d5e5466bfffb9d2e6778f1c67b70509eee4b..5057d3d6c75af0363c4307547ce0b24b1d57892a 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
@@ -196,7 +196,7 @@ include ("RecExCond/AllDet_detDescr.py")
if not hasattr(svcMgr,"ByteStreamCnvSvc"):
from ByteStreamCnvSvc import ReadByteStream
# Define the input
- svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.BSRDOInput()
+ svcMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
theApp.ExtSvc += [ "ByteStreamCnvSvc"]
# Online specific setup of BS converters
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.py
index f002ff31e3de9ecd80ecf8c4befb7484ed81ee5a..697b39d2711f7064d9c5d33a49f8986a208b6abc 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.py
@@ -465,7 +465,7 @@ print '######################## End of Storegate dump ########################'
print svcMgr
-svcMgr.ByteStreamInputSvc.FullFileName = athenaCommonFlags.BSRDOInput()
+svcMgr.EventSelector.Input = athenaCommonFlags.BSRDOInput()
#svcMgr.ByteStreamCnvSvc.OutputLevel = DEBUG