Skip to content
Snippets Groups Projects
Commit 11f6ce6a authored by Frank Berghaus's avatar Frank Berghaus :cityscape: Committed by Walter Lampl
Browse files

Remove defunct job option from ByteStreamInputSvc 

The ByteStreamEventStorageInput service provided a legacy job option called FullFileName to specify bytestream input. With the move to EventSelector this option was all but removed from ByteStreamEventInputSvc. The EventSelectorByteStream provieded the input option to specify input. It captured the FullFileName option of the InputSvc. This commit removes the relevant parts of the ByteStreamEventStorageInputSvc and EventSelectorByteStream. It also attempts to move all references in other job options (unless they specify being for an older release).
parent 5f5ea9bd
No related branches found
No related tags found
5 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 65 deletions
AtlasTest/ControlTest/share/test_seeking_athena_bs.py
+ 2
− 2
View file @ 11f6ce6a
......@@ -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
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaRead.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWrite.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+ 2
− 1
View file @ 11f6ce6a
......@@ -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 )
......
Event/ByteStreamCnvSvc/share/BSFilter_test_jobOptions.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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",
]
......
Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+ 0
− 1
View file @ 11f6ce6a
......@@ -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")
......
Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
+ 0
− 1
View file @ 11f6ce6a
......@@ -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;
......
Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+ 2
− 39
View file @ 11f6ce6a
......@@ -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());
......
Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
+ 3
− 3
View file @ 11f6ce6a
......@@ -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
......
Event/ByteStreamTest/share/MPSharedQueue.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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'
......
Event/ByteStreamTest/share/MPSharedReader.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
Event/ByteStreamTest/share/Selectors.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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",
# ]
......
Event/ByteStreamTest/share/SkipAll.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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
......
Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
+ 3
− 3
View file @ 11f6ce6a
......@@ -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
# ---------------------------
......
ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py
+ 2
− 2
View file @ 11f6ce6a
......@@ -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
......
ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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"]
......
ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v2.py
+ 1
− 1
View file @ 11f6ce6a
......@@ -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/" + \
......
ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/share/ReadZdcBS_jobOptions_v3.py
+ 2
− 2
View file @ 11f6ce6a
......@@ -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"]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment