From 9130bde65e170797745831e6908ebf1d93682192 Mon Sep 17 00:00:00 2001 From: Peter van Gemmeren Date: Fri, 30 Aug 2019 15:17:35 -0500 Subject: [PATCH 1/2] Change Stream default for ForceRead to true, triggering reading of data objects that are scheduled to be written and not yet available in StoreGate. --- .../AthenaPoolMultiTest/share/DecisionPropagation_jo.py | 1 - .../DatabaseTest/AthenaPoolMultiTest/share/EventNoSplit_jo.py | 4 ---- .../AthenaPoolMultiTest/share/EventSplitDecision_jo.py | 1 - .../DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py | 4 ---- .../DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py | 1 - .../DatabaseTest/TagCollectionTest/share/ExplicitToAOD_jo.py | 1 - .../DatabaseTest/TagCollectionTest/share/ExplicitToESD_jo.py | 1 - AtlasTest/PyAthenaTests/share/pythin_jobOptions.py | 1 - AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py | 1 - .../PyAthenaTests/share/utest_thin_cells_release_140100.py | 1 - Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitRec.py | 1 - .../CaloCalibHitRec/share/jobOptions_CalibHitToCaloCell.py | 1 - Calorimeter/CaloExample/CaloDigEx/share/CaloDigCTB.py | 1 - Calorimeter/CaloExample/CaloRecEx/share/CaloRecCTB.py | 1 - Calorimeter/CaloRec/python/CaloTopoClusterConfig.py | 1 - Commission/CommissionUtils/share/DigitCosmic.py | 1 - Commission/CommissionUtils/share/RecoCosmic.py | 1 - Control/AthenaPython/python/ConfigLib.py | 1 - Control/AthenaServices/share/MixingEventSelector_test.py | 1 - .../AthenaServices/share/MultiplePassWithAlgFilter_test.py | 1 - Control/AthenaServices/share/MultiplePass_test.py | 1 - Control/AthenaServices/src/AthenaOutputStream.cxx | 2 +- Control/AthenaServices/test/OutStreamExcludeTest.py | 1 - .../share/AthenaPoolExample_CopyJobOptions.py | 1 - Database/AthenaPOOL/AthenaPoolTools/share/CopyFiles.py | 1 - .../OutputStreamAthenaPool/python/MultipleStreamManager.py | 1 - .../AthenaRootComps/share/tests/test_athena_ntuple_dumper.py | 2 -- .../share/tests/test_athena_ntuple_eventless.py | 2 -- .../AthenaRootComps/share/tests/test_athena_ntuple_filter.py | 2 -- .../share/tests/test_athena_variable_shape_ntuple.py | 1 - Event/ByteStreamCnvSvc/python/WriteByteStream.py | 2 -- ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py | 1 - Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py | 1 - Generators/Epos_i/share/jobOptions.crmc.py | 1 - Generators/EvgenJobTransforms/share/skeleton.ABtoEVGEN.py | 1 - .../EvgenJobTransforms/share/skeleton.EvtGenFromEVNT.py | 1 - Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py | 1 - Generators/EvtGen_i/share/PythiaBEvtGen.py | 1 - Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py | 1 - Generators/EvtGen_i/share/PythiaEvtGen.py | 1 - .../EventBoost/share/jobOptions.EventBoost.py | 1 - Generators/ParticleDecayer/share/jobOptions.decayer.py | 1 - Generators/Pyquench_i/share/r1040b0quenchJobOpt.py | 1 - Generators/Reldis_i/share/jobOptions.reldis.py | 1 - .../InDetSurveyConstraintTool/run/MyJobOptions.py | 1 - .../share/PixelWriteBS_jobOptions.py | 1 - .../PixelRawDataByteStreamCnv/share/Pixel_main.py | 1 - .../InDetAlignExample/ErrorScaling/ReadInDet_jobOptions.py | 2 -- .../InDetBeamSpotExample/share/900GeV-BSToDPDTemplate.py | 2 -- .../share/900GeV-FirstData-BSToDPDTemplate.py | 2 -- .../InDetBeamSpotExample/share/BSToDPDTemplate.py | 2 -- .../InDetBeamSpotExample/share/ReadInDetRecFragment.py | 2 -- .../InDetExample/InDetRecExample/share/InDetRec_all.py | 3 --- .../InDetRecExample/share/InDetWriteBS_jobOptions.py | 1 - .../InDetTrigRecExample/share/InDetTrigWriteBS_jobOptions.py | 1 - .../InDetTrigRecExample/share/jobOptionsNewSteering.py | 2 -- .../share/jobOptions_RTT_InDetTrigRecExample.py | 2 -- .../share/jobOptions_RTT_InDetTrigRecExample_backTracking.py | 2 -- .../share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py | 2 -- .../LArCnv/LArByteStream/share/WriteLArBS_G4_jobOptions.py | 1 - .../LArCnv/LArByteStream/share/jobOptions_WriteLArROD_G4.py | 1 - .../LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py | 1 - .../LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py | 1 - .../LArG4TB/H6G4Sim/share/jobOptions.DigTB_LArH6-2004.py | 1 - .../LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py | 1 - .../LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py | 1 - .../MuonCnv/MuonByteStream/share/WriteCscRDO_jobOptions.py | 1 - .../MuonCnv/MuonByteStream/share/WriteMdtRDO_jobOptions.py | 1 - .../MuonByteStream/share/WriteMuonByteStream_jobOptions.py | 1 - .../MuonCnv/MuonByteStream/share/WriteRpcRDO_jobOptions.py | 1 - .../MuonCnv/MuonByteStream/share/WriteTgcRDO_jobOptions.py | 1 - .../MuonCondGeneral/MuonCondCool/share/cscCondCoolRead.py | 1 - .../AnalysisCommon/AnalysisExamples/mergingAOD/Merge.py | 1 - .../AnalysisExamples/mergingAOD/MergeWithTags.py | 1 - .../AnalysisExamples/share/produceGenEvents_jobOptions.py | 1 - .../AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py | 1 - .../AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py | 1 - PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/RecoOptions.py | 2 -- PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py | 1 - PhysicsAnalysis/DPDUtils/share/AODtoDPD_jobOptions.py | 1 - PhysicsAnalysis/DPDUtils/share/ObjectThinner_jobOptions.py | 1 - PhysicsAnalysis/DPDUtils/share/ObjectThinner_topOptions.py | 1 - PhysicsAnalysis/DPDUtils/share/aodtodpd.py | 1 - PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py | 1 - .../DPDUtils/share/pyexample.fdr_makeDPD_config.py | 1 - .../JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py | 1 - .../JetTagAlgs/BTagging/share/BTagging_standAlone.py | 1 - .../NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py | 1 - .../McParticleTests/share/iotest_ReadGenEvent_jobOptions.py | 1 - .../share/iotest_ReadTruthParticles_jobOptions.py | 1 - .../share/iotest_WriteTruthParticles_jobOptions.py | 1 - .../McParticleTests/share/rbtest_ReadGenEvent_jobOptions.py | 1 - .../McParticleTests/share/symlinkTest_mcAod_jobOptions.py | 1 - .../TruthParticleID/McParticleTests/share/test_mcaodfilter.py | 1 - .../McParticleTests/share/test_mcaodfilter_solution.py | 1 - Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py | 1 - .../RecExample/RecExTB/share/RecExTB_H6_jobOptions.py | 1 - Reconstruction/RecJobTransforms/share/skeleton.MergeRDO_tf.py | 1 - Reconstruction/eflowRec/python/PFHLTConfig.py | 1 - Simulation/Digitization/share/Digitization.py | 1 - Simulation/G4Atlas/G4AtlasApps/python/SimSkeleton.py | 1 - .../G4Atlas/G4AtlasApps/share/G4Atlas.flat.configuration.py | 1 - .../G4AtlasApps/share/Tile2000_2003.flat.configuration.py | 1 - Simulation/ISF/ISF_Example/python/ISF_Output.py | 2 -- Simulation/SimuJobTransforms/share/skeleton.FilterHit.py | 1 - Simulation/SimuJobTransforms/share/skeleton.HITSMerge.py | 1 - .../FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py | 1 - Tools/PyJobTransforms/share/skeleton.EVNTMerge.py | 1 - Tools/ValgrindRTTJobs/share/McGenerationPythia.py | 1 - .../TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py | 1 - .../TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py | 1 - .../TrigP1Test/share/TopOptions_WriteBS_LVL1sim_fromAthena.py | 1 - Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py | 1 - .../TriggerRelease/share/jobOfragment_TransBS_standalone.py | 1 - .../share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py | 1 - 115 files changed, 1 insertion(+), 138 deletions(-) diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/DecisionPropagation_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/DecisionPropagation_jo.py index 4c1789e960c..940391c7c32 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/DecisionPropagation_jo.py +++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/DecisionPropagation_jo.py @@ -51,7 +51,6 @@ StreamAll.CheckNumberOfWrites = False StreamAll.WritingTool.AttributeListKey="SimpleTag" StreamAll.WritingTool.SaveDecisions = False StreamAll.TakeItemsFromInput = True -StreamAll.ForceRead=TRUE #EventInfoTagBuilder.FilterString = "Stream" #EventInfoTagBuilder.PropagateInput=True diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventNoSplit_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventNoSplit_jo.py index 4dbbe04d8b2..2ea39c8cf68 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventNoSplit_jo.py +++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventNoSplit_jo.py @@ -111,21 +111,17 @@ StreamAll.WritingTool.SaveDecisions = True # bit 2 Stream2.TakeItemsFromInput = True -Stream2.ForceRead=TRUE Stream2.AcceptAlgs = ["Splitter2"] Stream2.VetoAlgs = ["Splitter1"] # bit 1 Stream1.TakeItemsFromInput = True -Stream1.ForceRead=TRUE Stream1.AcceptAlgs = ["Splitter1"] # bit 3 Stream3.TakeItemsFromInput = True -Stream3.ForceRead=TRUE Stream3.AcceptAlgs = ["Splitter3"] Stream3.VetoAlgs = ["Splitter2"] # Unfiltered StreamAll.TakeItemsFromInput = True -StreamAll.ForceRead=TRUE for stream in [Stream1, Stream2, Stream3]: stream.WriteOnExecute = False diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplitDecision_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplitDecision_jo.py index 7fcf4dc81d2..47019c6c793 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplitDecision_jo.py +++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplitDecision_jo.py @@ -99,7 +99,6 @@ StreamAll.CheckNumberOfWrites = False StreamAll.WritingTool.AttributeListKey="SimpleTag" StreamAll.WritingTool.SaveDecisions = True StreamAll.TakeItemsFromInput = True -StreamAll.ForceRead=TRUE # Add the outputstreams to the execution sequence #athOutSeq+=StreamAll diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py index 9e21855a7d7..12556c702ea 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py +++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py @@ -114,23 +114,19 @@ Bad.CheckNumberOfWrites = False # bit 2 Stream2.TakeItemsFromInput = True -Stream2.ForceRead=TRUE Stream2.AcceptAlgs = ["Splitter2"] Stream2.VetoAlgs = ["Splitter1"] Stream2.WritingTool.SaveDecisions = True # bit 1 Stream1.TakeItemsFromInput = True -Stream1.ForceRead=TRUE Stream1.AcceptAlgs = ["Splitter1"] # bit 3 Stream3.TakeItemsFromInput = True -Stream3.ForceRead=TRUE Stream3.AcceptAlgs = ["Splitter3"] Stream3.VetoAlgs = ["Splitter1"] Stream3.VetoAlgs += ["Splitter2"] # missed Others.TakeItemsFromInput = True -Others.ForceRead=TRUE Others.ExcludeList = ['FauxTriggerMap#ExcludeTestTrigMap'] Others.AcceptAlgs = ["Triggered"] Others.VetoAlgs = ["Splitter1"] diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py index d8b0bc783b7..a7f81e6955f 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py @@ -91,7 +91,6 @@ Stream1.OutputLevel = DEBUG # Copy everything from the input and must force reading of all input # objects Stream1.TakeItemsFromInput = True -Stream1.ForceRead = True # Turn off provenance - means that new copy does NOT point back to its # input file, but it DOES retain the possibility to navigate to the # files upstream of the input. Thus the output "replaces" the input in diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToAOD_jo.py b/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToAOD_jo.py index 16444167d3d..f53b574b4cc 100755 --- a/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToAOD_jo.py +++ b/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToAOD_jo.py @@ -41,6 +41,5 @@ theApp.EvtMax = 200000 # Stream1 is defined in the AODtoPool job options Stream1.OutputLevel = INFO -Stream1.ForceRead = "true" Stream1.OutputFile = "AODExplicit.root" ExampleStreamConfig(Stream1) diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToESD_jo.py b/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToESD_jo.py index 31682e0c3be..2e744454d7c 100755 --- a/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToESD_jo.py +++ b/AtlasTest/DatabaseTest/TagCollectionTest/share/ExplicitToESD_jo.py @@ -73,7 +73,6 @@ theApp.TopAlg += [ "ReadData" ] # print out some data to chk its there # bit 1 theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] Stream1 = Algorithm( "Stream1" ) -Stream1.ForceRead = "true" Stream1.OutputFile = "ESDExplicit.root"; # The output file name include( "RecExCommon/RecoOutputItemList_jobOptions.py") ExampleStreamConfig(Stream1) diff --git a/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py index 6eb802a32e8..6bdf37ab378 100644 --- a/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py +++ b/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py @@ -50,7 +50,6 @@ job += CfgMgr.AthenaOutputStream( # Copy everything from the input and must force reading of all input # objects job.OutStream.TakeItemsFromInput = True -job.OutStream.ForceRead = True job.OutStream.OutputFile = OUTPUT ## configure the ThinningSvc from AthenaServices.Configurables import ThinningSvc, createThinningSvc diff --git a/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py index d51b7728212..9d75b4bafa7 100644 --- a/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py +++ b/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py @@ -60,7 +60,6 @@ job += CfgMgr.AthenaOutputStream( WritingTool = "AthenaOutputStreamTool" ) job.OutStream.TakeItemsFromInput = False -job.OutStream.ForceRead = True job.OutStream.OutputFile = OUTPUT job.OutStream.ItemList = [ 'EventInfo#*', 'McEventCollection#GEN_DPD', diff --git a/AtlasTest/PyAthenaTests/share/utest_thin_cells_release_140100.py b/AtlasTest/PyAthenaTests/share/utest_thin_cells_release_140100.py index 16eb10091d9..3db2ce43215 100644 --- a/AtlasTest/PyAthenaTests/share/utest_thin_cells_release_140100.py +++ b/AtlasTest/PyAthenaTests/share/utest_thin_cells_release_140100.py @@ -31,7 +31,6 @@ def filter_fct(x): job.Thinner.filter_fct = filter_fct job.OutStream.TakeItemsFromInput = True -job.OutStream.ForceRead = True # make sure our thinned stream is the only one del job.StreamESD diff --git a/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitRec.py b/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitRec.py index 70b33a1e07d..3a8c3e2451d 100755 --- a/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitRec.py +++ b/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitRec.py @@ -88,7 +88,6 @@ if writePool: "LArHitContainer#*", # LAr hits "McEventCollection#*" # mc truth (hepmc) ] - Stream1.ForceRead=TRUE #force read of output data # LAr hits diff --git a/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitToCaloCell.py b/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitToCaloCell.py index 4265b05f281..e4b5e437a2e 100755 --- a/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitToCaloCell.py +++ b/Calorimeter/CaloCalibHitRec/share/jobOptions_CalibHitToCaloCell.py @@ -82,7 +82,6 @@ if writePool: "McEventCollection#*", # mc truth (hepmc) "CaloCellContainer#*" # CaloCells ] - Stream1.ForceRead=TRUE #force read of output data theApp.Dlls += [ "CaloTools" ] diff --git a/Calorimeter/CaloExample/CaloDigEx/share/CaloDigCTB.py b/Calorimeter/CaloExample/CaloDigEx/share/CaloDigCTB.py index 5af09b607eb..d7a3ceccadf 100644 --- a/Calorimeter/CaloExample/CaloDigEx/share/CaloDigCTB.py +++ b/Calorimeter/CaloExample/CaloDigEx/share/CaloDigCTB.py @@ -105,7 +105,6 @@ svcMgr += MessageSvc( defaultLimit = 100000000 ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream("Stream1") Stream1.OutputFile = "ctb_CaloDigit.pool.root" -Stream1.ForceRead=TRUE Stream1.ItemList+=["EventInfo#*"] Stream1.ItemList+=["LArRawChannelContainer#*"] Stream1.ItemList+=["TileRawChannelContainer#*"] diff --git a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecCTB.py b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecCTB.py index ddb2031e1f7..6f4431ebe81 100644 --- a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecCTB.py +++ b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecCTB.py @@ -132,7 +132,6 @@ svcMgr += MessageSvc( defaultLimit = 100000000 ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream("Stream1") Stream1.OutputFile = "ctb_CaloESD.pool.root" -Stream1.ForceRead=TRUE Stream1.ItemList+=["EventInfo#*"] Stream1.ItemList+=["McEventCollection#*"] Stream1.ItemList += ["CaloCalibrationHitContainer#*"] diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py index 436cb7f1847..1340a01e140 100644 --- a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py +++ b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py @@ -388,7 +388,6 @@ if __name__=="__main__": "xAOD::CaloClusterAuxContainer#*CaloCalTopoClusters*Aux.",#+theKey+"Aux.", # "CaloClusterCellLinkContainer#"+theKey+"_links" ])) - cfg.getEventAlgo("OutputStreamxAOD").ForceRead=True from AthenaServices.AthenaServicesConf import ThinningSvc, ThinningOutputTool cfg.addService(ThinningSvc()) diff --git a/Commission/CommissionUtils/share/DigitCosmic.py b/Commission/CommissionUtils/share/DigitCosmic.py index ae165b2302c..86e5cbebeac 100644 --- a/Commission/CommissionUtils/share/DigitCosmic.py +++ b/Commission/CommissionUtils/share/DigitCosmic.py @@ -65,7 +65,6 @@ Stream1.ItemList += ["TileTTL1Container#*"] Stream1.ItemList += ["ComTime#*"] # Stream1.ItemList += ["LArDigitContainer#*"] # Stream1.ItemList += ["TileDigitsContainer#*"] -Stream1.ForceRead = True theApp.EvtMax = 2000 IOVDbSvc.ManageConnections = TRUE diff --git a/Commission/CommissionUtils/share/RecoCosmic.py b/Commission/CommissionUtils/share/RecoCosmic.py index 855286b7049..1ecc8c3e400 100644 --- a/Commission/CommissionUtils/share/RecoCosmic.py +++ b/Commission/CommissionUtils/share/RecoCosmic.py @@ -115,7 +115,6 @@ Stream1 = Algorithm( "Stream1" ) Stream1.EvtConversionSvc = "AthenaPoolCnvSvc" # allows objects to be copied in output even if not read in Stream1 = Algorithm( "Stream1" ) -Stream1.ForceRead= True Stream1.ItemList +=["EventInfo#*"] Stream1.ItemList +=["McEventCollection#*"] diff --git a/Control/AthenaPython/python/ConfigLib.py b/Control/AthenaPython/python/ConfigLib.py index 6aae57900a6..fcfe095a62d 100644 --- a/Control/AthenaPython/python/ConfigLib.py +++ b/Control/AthenaPython/python/ConfigLib.py @@ -117,7 +117,6 @@ def _copy_file_impl(cfg, hints): import AthenaPoolCnvSvc.WriteAthenaPool as wap outstream = wap.AthenaPoolOutputStream(af.infos['stream_names'][0], dst) - outstream.ForceRead=True outstream.TakeItemsFromInput=True pass diff --git a/Control/AthenaServices/share/MixingEventSelector_test.py b/Control/AthenaServices/share/MixingEventSelector_test.py index c2ef7967ae1..4a248885017 100644 --- a/Control/AthenaServices/share/MixingEventSelector_test.py +++ b/Control/AthenaServices/share/MixingEventSelector_test.py @@ -60,7 +60,6 @@ include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "Stream1" ) Stream1.OutputFile = "MixedFile.root"; # ** mandatory parameter ** // The output file name -Stream1.ForceRead=TRUE; #force read of output data objs Stream1.ItemList=["MergedEventInfo#*", "EventInfo#*", "McEventCollection#*", diff --git a/Control/AthenaServices/share/MultiplePassWithAlgFilter_test.py b/Control/AthenaServices/share/MultiplePassWithAlgFilter_test.py index 77f66d91103..01bffbf962e 100644 --- a/Control/AthenaServices/share/MultiplePassWithAlgFilter_test.py +++ b/Control/AthenaServices/share/MultiplePassWithAlgFilter_test.py @@ -45,7 +45,6 @@ include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "Stream1" ) Stream1.OutputFile = "MultiplePassFile.root"; # ** mandatory parameter ** // The output file name -Stream1.ForceRead=TRUE #force read of output data objs Stream1.ItemList=["EventInfo#*", "McEventCollection#*"] #-------------------------------------------------------------- diff --git a/Control/AthenaServices/share/MultiplePass_test.py b/Control/AthenaServices/share/MultiplePass_test.py index 7764d950bcd..ac22b5e2c54 100644 --- a/Control/AthenaServices/share/MultiplePass_test.py +++ b/Control/AthenaServices/share/MultiplePass_test.py @@ -40,7 +40,6 @@ include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "Stream1" ) Stream1.OutputFile = "MultiplePassFile.root"; # ** mandatory parameter ** // The output file name -Stream1.ForceRead=TRUE #force read of output data objs Stream1.ItemList=["EventInfo#*", "McEventCollection#*"] #-------------------------------------------------------------- diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx index 8aaeca78078..187418c83f1 100644 --- a/Control/AthenaServices/src/AthenaOutputStream.cxx +++ b/Control/AthenaServices/src/AthenaOutputStream.cxx @@ -162,7 +162,7 @@ AthenaOutputStream::AthenaOutputStream(const string& name, ISvcLocator* pSvcLoca declareProperty("WritingTool", m_streamer); declareProperty("Store", m_dataStore); declareProperty("MetadataStore", m_metadataStore); - declareProperty("ForceRead", m_forceRead=false); + declareProperty("ForceRead", m_forceRead=true); declareProperty("ExtendProvenanceRecord", m_extendProvenanceRecord=true); declareProperty("WriteOnExecute", m_writeOnExecute=true); declareProperty("WriteOnFinalize", m_writeOnFinalize=false); diff --git a/Control/AthenaServices/test/OutStreamExcludeTest.py b/Control/AthenaServices/test/OutStreamExcludeTest.py index 7df6933c06f..a7f4f0aa73b 100644 --- a/Control/AthenaServices/test/OutStreamExcludeTest.py +++ b/Control/AthenaServices/test/OutStreamExcludeTest.py @@ -97,7 +97,6 @@ StreamDPD.ExcludeList+=['Rec::TrackParticleContainer#TrackParticleCandidate'] StreamDPD.OutputLevel = DEBUG StreamDPD.OutputFile = "SkimmedThin.AOD.pool.root" #StreamDPD.OutputFile = outFileName -StreamDPD.ForceRead=TRUE; #force read of output data objs StreamDPD.AcceptAlgs=["ttbarFilter"] diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_CopyJobOptions.py b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_CopyJobOptions.py index e00adebc778..097ce739322 100644 --- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_CopyJobOptions.py +++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_CopyJobOptions.py @@ -72,7 +72,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "Stream1" , "SimplePoolReplica1.root" ) Stream1.ItemList += [ "ExampleHitContainer#MyHits" ] Stream1.ExtendProvenanceRecord = FALSE; -Stream1.ForceRead = True #Stream1.PersToPers = True #-------------------------------------------------------------- diff --git a/Database/AthenaPOOL/AthenaPoolTools/share/CopyFiles.py b/Database/AthenaPOOL/AthenaPoolTools/share/CopyFiles.py index 9f00c36168b..a54ed64ea50 100755 --- a/Database/AthenaPOOL/AthenaPoolTools/share/CopyFiles.py +++ b/Database/AthenaPOOL/AthenaPoolTools/share/CopyFiles.py @@ -61,7 +61,6 @@ try: except: Stream1 = AthenaPoolOutputStream( "Stream1", "DidNotSetOutputName.root", True ) Stream1.TakeItemsFromInput=TRUE; -Stream1.ForceRead=TRUE; #force read of output data objs # The next line is an example on how to exclude clid's if they are causing a problem #Stream1.ExcludeList = ['6421#*'] diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py index d9303435285..0905050256d 100644 --- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py +++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py @@ -167,7 +167,6 @@ class AugmentedPoolStream( AugmentedStreamBase ): #event-by-event stream from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream self.Stream = AthenaPoolOutputStream( StreamName, FileName, asAlg, noTag=noTag ) - self.Stream.ForceRead=True; #force read of output data objs if isVirtual == True: self.Stream.WriteOnExecute=False self.Stream.WriteOnFinalize=False diff --git a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py index a2170eb1ae6..13427382042 100644 --- a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py +++ b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py @@ -58,7 +58,6 @@ if DOWRITE: "el_eta", "el_jetcone_dr", ] - out.ForceRead = True if DOWRITE>1: # another output stream... with the same content. out = arcw.createNtupleOutputStream("StreamD3PD_2", @@ -69,7 +68,6 @@ if DOWRITE: "el_eta", "el_jetcone_dr", ] - out.ForceRead = True pass diff --git a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_eventless.py b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_eventless.py index 867bac501c9..b1ae12139d0 100755 --- a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_eventless.py +++ b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_eventless.py @@ -57,14 +57,12 @@ metadataTool.StreamName = StreamName metadataTool.TupleName = tupleName theApp.serviceMgr().ToolSvc += metadataTool Eventless.HelperTools = [metadataTool] -Eventless.ForceRead = True; Eventless.RequireAlgs += ["PassNoneFilter"] #Eventless.RequireAlgs += ["PassAllFilter"] #from NTUPtoNTUPCore import NTUPUtils #MNSMgr = NTUPUtils.MNSMgr() #Eventless = MNSMgr.NewNTUPStream("StreamNTUP","testNTUP.root","test") -#Eventless.GetStream().ForceRead = True #Eventless.AddRequireAlgs("PassNoneFilter") #athOutSeq += Eventless diff --git a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_filter.py b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_filter.py index 175c68dff48..4c08790c592 100644 --- a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_filter.py +++ b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_filter.py @@ -39,9 +39,7 @@ svcMgr += CfgMgr.DecisionSvc() import AthenaRootComps.WriteAthenaRoot as arcw out = arcw.createNtupleOutputStream("StreamD3PD", "d3pd.root", "egamma", asAlg=True) -out.ForceRead = True # force reading and accessing all input keys -out.ForceRead = True # copy the whole input tree layout out.ItemList = ["*"] # honor the event selection diff --git a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_variable_shape_ntuple.py b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_variable_shape_ntuple.py index 448e51dd582..01a872fcd61 100644 --- a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_variable_shape_ntuple.py +++ b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_variable_shape_ntuple.py @@ -115,5 +115,4 @@ if DOWRITE: "el_jetcone_dr", ] out.ItemList += OUTBRANCHES - out.ForceRead = True diff --git a/Event/ByteStreamCnvSvc/python/WriteByteStream.py b/Event/ByteStreamCnvSvc/python/WriteByteStream.py index 8e6a914df78..d2b267493af 100644 --- a/Event/ByteStreamCnvSvc/python/WriteByteStream.py +++ b/Event/ByteStreamCnvSvc/python/WriteByteStream.py @@ -48,7 +48,6 @@ def getStream(type,name): name, EvtConversionSvc = "ByteStreamCnvSvc", OutputFile = "ByteStreamEventStorageOutputSvc", - ForceRead=True ) theApp.addOutputStream( StreamBS ) theApp.OutStreamType ="AthenaOutputStream"; @@ -106,7 +105,6 @@ def getStream(type,name): name, EvtConversionSvc = "ByteStreamCnvSvc", OutputFile = "ByteStreamRDP_OutputSvc", - ForceRead=True ) from AthenaCommon.AlgSequence import AlgSequence topSequence = AlgSequence() diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py b/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py index 7e83f354f10..ba693856347 100644 --- a/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py +++ b/ForwardDetectors/ALFA/ALFA_Ntuple/share/joAlfaRecoChain.py @@ -240,7 +240,6 @@ topSeq += ALFA_Ntuple("ALFA_Ntuple", RootStreamName = streamName) #from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream #Stream1 = AthenaPoolOutputStream("Stream1") #Stream1.OutputFile = "outPool.root" -#Stream1.ForceRead= True #Stream1.ItemList+= ["ALFA_RawDataContainer#*"] #Stream1.ItemList+= ["ALFA_HitCollection#*"] #Stream1.ItemList+= ["ALFA_ODHitCollection#*"] diff --git a/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py b/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py index 8363ab2c9df..aa3286d6516 100644 --- a/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py +++ b/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py @@ -84,7 +84,6 @@ ServiceMgr += PoolSvc() from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "StreamEVGEN" ) -#Stream1.ForceRead=TRUE Stream1.OutputFile = "charybdisHerwig.evgen.pool.root" Stream1.ItemList += [ "EventInfo#*", "McEventCollection#*" ] diff --git a/Generators/Epos_i/share/jobOptions.crmc.py b/Generators/Epos_i/share/jobOptions.crmc.py index d2a93c2b910..e2f8c2ada2c 100644 --- a/Generators/Epos_i/share/jobOptions.crmc.py +++ b/Generators/Epos_i/share/jobOptions.crmc.py @@ -88,7 +88,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream stream1 = AthenaPoolOutputStream( "StreamEVGEN" ) stream1.WritingTool = "AthenaOutputStreamTool" stream1.OutputFile = "epos_events.pool.root" -stream1.ForceRead = TRUE; stream1.TakeItemsFromInput = True stream1.ItemList += [ 'EventInfo#*', 'McEventCollection#*' ] # ---------------------------------------------------------------------- diff --git a/Generators/EvgenJobTransforms/share/skeleton.ABtoEVGEN.py b/Generators/EvgenJobTransforms/share/skeleton.ABtoEVGEN.py index 1634728c1a2..b85ec8860f7 100644 --- a/Generators/EvgenJobTransforms/share/skeleton.ABtoEVGEN.py +++ b/Generators/EvgenJobTransforms/share/skeleton.ABtoEVGEN.py @@ -342,7 +342,6 @@ if hasattr(runArgs, "inputEVNT_PreFile") : svcMgr.EventSelector.InputCollections = runArgs.inputEVNT_PreFile StreamEVGEN.TakeItemsFromInput = True -StreamEVGEN.ForceRead = True StreamEVGEN.ItemList += ["EventInfo#*", "McEventCollection#*"] StreamEVGEN.RequireAlgs += ["EvgenFilterSeq"] ## Used for pile-up (remove dynamic variables except flavour labels) diff --git a/Generators/EvgenJobTransforms/share/skeleton.EvtGenFromEVNT.py b/Generators/EvgenJobTransforms/share/skeleton.EvtGenFromEVNT.py index 455c440d300..15a3fcee6f6 100644 --- a/Generators/EvgenJobTransforms/share/skeleton.EvtGenFromEVNT.py +++ b/Generators/EvgenJobTransforms/share/skeleton.EvtGenFromEVNT.py @@ -31,7 +31,6 @@ if hasattr(runArgs,"preInclude"): ## copy everything from the input file ## must force reading of all input objects outStream.TakeItemsFromInput = True -outStream.ForceRead = True outStream.ItemList += [ "McEventCollection#*" ] diff --git a/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py b/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py index 72fd318d239..cb2de0e7472 100644 --- a/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py +++ b/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py @@ -355,7 +355,6 @@ else: #StreamEVGEN = AthenaPoolOutputStream("StreamEVGEN", runArgs.outputEVNTFile) StreamEVGEN = AthenaPoolOutputStream("StreamEVGEN", poolFile) -StreamEVGEN.ForceRead = True StreamEVGEN.ItemList += ["EventInfo#*", "McEventCollection#*"] StreamEVGEN.RequireAlgs += ["EvgenFilterSeq"] ## Used for pile-up (remove dynamic variables except flavour labels) diff --git a/Generators/EvtGen_i/share/PythiaBEvtGen.py b/Generators/EvtGen_i/share/PythiaBEvtGen.py index e5da0d3c338..cf2338fd5f8 100644 --- a/Generators/EvtGen_i/share/PythiaBEvtGen.py +++ b/Generators/EvtGen_i/share/PythiaBEvtGen.py @@ -122,7 +122,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.ForceRead=TRUE Stream1.OutputFile = "pythiaB.pool.root" # 2101 = EventInfo # 133273 = MCTruth (HepMC) diff --git a/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py b/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py index 488300aa8d0..333c1c2cf1f 100644 --- a/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py +++ b/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py @@ -125,7 +125,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.ForceRead=TRUE Stream1.OutputFile = "pythiaB.pool.root" # 2101 = EventInfo # 133273 = MCTruth (HepMC) diff --git a/Generators/EvtGen_i/share/PythiaEvtGen.py b/Generators/EvtGen_i/share/PythiaEvtGen.py index 66b19bcab98..5a3c0884503 100644 --- a/Generators/EvtGen_i/share/PythiaEvtGen.py +++ b/Generators/EvtGen_i/share/PythiaEvtGen.py @@ -103,7 +103,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.ForceRead=TRUE Stream1.OutputFile = "pythiaB.pool.root" # 2101 = EventInfo # 133273 = MCTruth (HepMC) diff --git a/Generators/GenAnalysisTools/EventBoost/share/jobOptions.EventBoost.py b/Generators/GenAnalysisTools/EventBoost/share/jobOptions.EventBoost.py index d201cdad5e5..a3551304044 100755 --- a/Generators/GenAnalysisTools/EventBoost/share/jobOptions.EventBoost.py +++ b/Generators/GenAnalysisTools/EventBoost/share/jobOptions.EventBoost.py @@ -58,7 +58,6 @@ myOutStream = AthenaPoolOutputStream( "myOutStream" ) myOutStream.EvtConversionSvc = "AthenaPoolCnvSvc" myOutStream.OutputFile = "boosted.pool.root" myOutStream.ItemList += [ "EventInfo#*", "McEventCollection#*" ] -myOutStream.ForceRead=TRUE ################################################## # Do consistency checks # diff --git a/Generators/ParticleDecayer/share/jobOptions.decayer.py b/Generators/ParticleDecayer/share/jobOptions.decayer.py index 3dc770a2273..e657c425fd9 100644 --- a/Generators/ParticleDecayer/share/jobOptions.decayer.py +++ b/Generators/ParticleDecayer/share/jobOptions.decayer.py @@ -121,7 +121,6 @@ job.ParticleDecayer.ThetaEndCapBarrel = 0.628796286 #0.439067982 = eta of 1.5 #--------------------------------------------------------------- from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "StreamEVGEN" ) -Stream1.ForceRead=TRUE Stream1.OutputFile = "ParticleDecayer.EVNT.pool.root" Stream1.ItemList += [ "2101#*", "133273#*" ] diff --git a/Generators/Pyquench_i/share/r1040b0quenchJobOpt.py b/Generators/Pyquench_i/share/r1040b0quenchJobOpt.py index ea0ad799f0d..d1fd824b667 100644 --- a/Generators/Pyquench_i/share/r1040b0quenchJobOpt.py +++ b/Generators/Pyquench_i/share/r1040b0quenchJobOpt.py @@ -64,7 +64,6 @@ AthenaSealSvc.CheckDictionary = TRUE from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "StreamEVGEN" ) -#Stream1.ForceRead=TRUE Stream1.OutputFile = "r1040b0pyquench.root" # 2101 = EventInfo # 133273 = MCTruth (HepMC) diff --git a/Generators/Reldis_i/share/jobOptions.reldis.py b/Generators/Reldis_i/share/jobOptions.reldis.py index 6f4e6aa469e..fd3ced3cd2c 100644 --- a/Generators/Reldis_i/share/jobOptions.reldis.py +++ b/Generators/Reldis_i/share/jobOptions.reldis.py @@ -13,7 +13,6 @@ topSequence.Reldis_i.ReldisTreeName = "h2032" from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream("StreamEVGEN") -Stream1.ForceRead = TRUE Stream1.OutputFile = "evgen.reldis.pool.root" Stream1.ItemList += ["2101#*", "133273#*"] diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py index 7d259b8aa8d..fb73d13ae83 100755 --- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py +++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/run/MyJobOptions.py @@ -131,7 +131,6 @@ multipleELM = Service("MultipleEventLoopMgr") #Stream1.EvtConversionSvc ="AthenaPoolCnvSvc" #Stream1.OutputFile = "MultiplePassFile.root"; # ** mandatory parameter ** #// The output file name -#Stream1.ForceRead=TRUE #force read of output data objs #Stream1.ItemList=["EventInfo#*", "McEventCollection#*"] diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/PixelWriteBS_jobOptions.py b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/PixelWriteBS_jobOptions.py index a48505c3df6..f0a00fa9194 100644 --- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/PixelWriteBS_jobOptions.py +++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/PixelWriteBS_jobOptions.py @@ -29,7 +29,6 @@ from AthenaServices.AthenaServicesConf import AthenaOutputStream StreamBS = AthenaOutputStream("StreamBS", EvtConversionSvc = "ByteStreamCnvSvc") # Force reading of output stream (ostream set externally) -StreamBS.ForceRead = TRUE #StreamBS.ItemList += [ "TRT_RDO_Container#*" ] #StreamBS.ItemList += [ "SCT_RDO_Container#*" ] StreamBS.ItemList += [ "PixelRDO_Container#*" ] diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py index 3fd5d4d3c62..32e30a0b5a1 100644 --- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py +++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py @@ -190,4 +190,3 @@ if doWriteESD or doWriteAOD or ('doCopyRDO' in dir() and doCopyRDO): StreamRDO.ItemList += ['TRT_RDO_Container#*','SCT_RDO_Container#*','PixelRDO_Container#*'] StreamRDO.ItemList += ['InDetSimDataCollection#*','McEventCollection#*'] # --- Force read - StreamRDO.ForceRead = TRUE; #force read of output data objs diff --git a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/ReadInDet_jobOptions.py b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/ReadInDet_jobOptions.py index 8cc65701d3d..9e9a1eba8d8 100755 --- a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/ReadInDet_jobOptions.py +++ b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/ReadInDet_jobOptions.py @@ -218,6 +218,4 @@ TrackCollectionTruthKeys = [InDetKeys.TracksTruth()] include("InDetRecExample/InDetRec_all.py") -if doWriteESD: StreamESD.ForceRead = True -if doWriteAOD: StreamAOD.ForceRead = True diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-BSToDPDTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-BSToDPDTemplate.py index 6ffbe958136..dc559e5f34d 100755 --- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-BSToDPDTemplate.py +++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-BSToDPDTemplate.py @@ -185,11 +185,9 @@ InDetFlags.doPrintConfigurables = jobConfig['doPrintIndetConfig'] include("InDetRecExample/InDetRec_all.py") if doWriteESD: - StreamESD.ForceRead = True StreamESD.OutputFile = jobConfig['outputfile'] if doWriteAOD: - StreamAOD.ForceRead = True StreamAOD.OutputFile = jobConfig['outputfile'] diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-FirstData-BSToDPDTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-FirstData-BSToDPDTemplate.py index 70087353cbb..8ee30ecf301 100755 --- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-FirstData-BSToDPDTemplate.py +++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/900GeV-FirstData-BSToDPDTemplate.py @@ -167,11 +167,9 @@ InDetFlags.doPrintConfigurables = jobConfig['doPrintIndetConfig'] include("InDetRecExample/InDetRec_all.py") if doWriteESD: - StreamESD.ForceRead = True StreamESD.OutputFile = jobConfig['outputfile'] if doWriteAOD: - StreamAOD.ForceRead = True StreamAOD.OutputFile = jobConfig['outputfile'] diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/BSToDPDTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/BSToDPDTemplate.py index 02a9481f7d5..8d0336228cd 100644 --- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/BSToDPDTemplate.py +++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/BSToDPDTemplate.py @@ -222,7 +222,6 @@ include("InDetRecExample/InDetRec_all.py") # - Should we use InDetKeys as in ReadInDetFragment.py instead # - Or use DPD maker? if doWriteESD: - StreamESD.ForceRead = True if not jobConfig['griduser']: # See comment below on version tag info. itemList = StreamESD.ItemList @@ -232,7 +231,6 @@ if doWriteESD: StreamESD.OutputFile = jobConfig['outputfile'] if doWriteAOD: - StreamAOD.ForceRead = True if not jobConfig['griduser']: # The following is a hack to get version tag info into the DPD. Simply # setting StreamAOD.OutputFile to the desired file name does NOT work. diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/ReadInDetRecFragment.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/ReadInDetRecFragment.py index 9b61c60e0f4..170c6cdc60f 100644 --- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/ReadInDetRecFragment.py +++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/ReadInDetRecFragment.py @@ -326,7 +326,6 @@ include("InDetRecExample/InDetRec_all.py") # Remaining streams parameters #-------------------------------------------------------------- if doWriteESD: - StreamESD.ForceRead = True if needsOutputFilePatch: if not jobConfig['griduser']: # See comment below on version tag info. @@ -337,7 +336,6 @@ if doWriteESD: StreamESD.OutputFile = jobConfig['outputfile'] if doWriteAOD: - StreamAOD.ForceRead = True if needsOutputFilePatch: if not jobConfig['griduser']: # The following is a hack to get version tag info into the DPD. Simply diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py index 82a1e7e1421..15e64943f20 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py @@ -237,7 +237,6 @@ if doWriteESD or doWriteAOD or ('doCopyRDO' in dir() and doCopyRDO): StreamESD.ItemList += [ "TrigDec::TrigDecision#TrigDecision" ] StreamESD.ItemList += [ "HLT::HLTResult#HLTResult_L2" ] StreamESD.ItemList += [ "HLT::HLTResult#HLTResult_EF" ] - StreamESD.ForceRead = True # otherwise unread stuff is not copied if InDetFlags.doDBMstandalone(): StreamESD.ItemList+=["TrackCollection#SiSPSeededTracks"] @@ -261,7 +260,6 @@ if doWriteESD or doWriteAOD or ('doCopyRDO' in dir() and doCopyRDO): StreamAOD.ItemList += [ "HLT::HLTResult#HLTResult_EF" ] if InDetFlags.doDBMstandalone(): StreamESD.ItemList+=["TrackCollection#SiSPSeededTracks"] - StreamAOD.ForceRead = True # otherwise unread stuff is not copied if 'doCopyRDO' in dir() and doCopyRDO: # --- create stream @@ -270,4 +268,3 @@ if doWriteESD or doWriteAOD or ('doCopyRDO' in dir() and doCopyRDO): StreamRDO.ItemList += ['TRT_RDO_Container#*','SCT_RDO_Container#*','PixelRDO_Container#*'] StreamRDO.ItemList += ['InDetSimDataCollection#*','McEventCollection#*'] # --- Force read - StreamRDO.ForceRead = TRUE; #force read of output data objs diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetWriteBS_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetWriteBS_jobOptions.py index 0e45083cc3d..311e8185eb9 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetWriteBS_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetWriteBS_jobOptions.py @@ -42,7 +42,6 @@ oStream = AthenaOutputStream( OutputFile = "ByteStreamEventStorageOutputSvc" ) -oStream.ForceRead = TRUE if DetFlags.haveRIO.pixel_on(): oStream.ItemList += [ "PixelRDO_Container#*" ] if DetFlags.haveRIO.SCT_on(): diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigWriteBS_jobOptions.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigWriteBS_jobOptions.py index 17b70fd7e69..1938f5cef50 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigWriteBS_jobOptions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigWriteBS_jobOptions.py @@ -31,7 +31,6 @@ from AthenaServices.AthenaServicesConf import AthenaOutputStream StreamBS = AthenaOutputStream("StreamBS", EvtConversionSvc = "ByteStreamCnvSvc") # Force reading of output stream (ostream set externally) -StreamBS.ForceRead = TRUE StreamBS.ItemList += [ "TRT_RDO_Container#*" ] StreamBS.ItemList += [ "SCT_RDO_Container#*" ] StreamBS.ItemList += [ "PixelRDO_Container#*" ] diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py index def20c510f7..7df158b74b2 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py @@ -434,7 +434,6 @@ if doWriteAOD: StreamAOD.OutputFile = "InDetTrigRecAOD.root" #force read of input data to write in output data - StreamAOD.ForceRead = True # EventInfo - needs to be always saved. StreamAOD.ItemList=[] @@ -451,7 +450,6 @@ if doWriteESD: StreamESD.OutputFile = "InDetTrigRecESD.root" #force read of input data to write in output data - StreamESD.ForceRead = True # EventInfo - needs to be always saved. StreamESD.ItemList=[] diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py index 370a1ac7b89..8d601792673 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py @@ -434,7 +434,6 @@ if doWriteAOD: StreamAOD.OutputFile = "InDetTrigRecAOD.root" #force read of input data to write in output data - StreamAOD.ForceRead = True # EventInfo - needs to be always saved. StreamAOD.ItemList=[] @@ -451,7 +450,6 @@ if doWriteESD: StreamESD.OutputFile = "InDetTrigRecESD.root" #force read of input data to write in output data - StreamESD.ForceRead = True # EventInfo - needs to be always saved. StreamESD.ItemList=[] diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py index 44aa7c83f0d..4b5cf712fe5 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py @@ -387,7 +387,6 @@ if doWriteAOD: StreamAOD.OutputFile = "InDetTrigRecAOD.root" #force read of input data to write in output data - StreamAOD.ForceRead = True # EventInfo - needs to be always saved. StreamAOD.ItemList=[] @@ -404,7 +403,6 @@ if doWriteESD: StreamESD.OutputFile = "InDetTrigRecESD.root" #force read of input data to write in output data - StreamESD.ForceRead = True # EventInfo - needs to be always saved. StreamESD.ItemList=[] diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py index b44c7b1593a..81ef3e9712f 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py @@ -437,7 +437,6 @@ if doWriteAOD: StreamAOD.OutputFile = "InDetTrigRecAOD.root" #force read of input data to write in output data - StreamAOD.ForceRead = True # EventInfo - needs to be always saved. StreamAOD.ItemList=[] @@ -454,7 +453,6 @@ if doWriteESD: StreamESD.OutputFile = "InDetTrigRecESD.root" #force read of input data to write in output data - StreamESD.ForceRead = True # EventInfo - needs to be always saved. StreamESD.ItemList=[] diff --git a/LArCalorimeter/LArCnv/LArByteStream/share/WriteLArBS_G4_jobOptions.py b/LArCalorimeter/LArCnv/LArByteStream/share/WriteLArBS_G4_jobOptions.py index 71823010231..9c0c304ed36 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/share/WriteLArBS_G4_jobOptions.py +++ b/LArCalorimeter/LArCnv/LArByteStream/share/WriteLArBS_G4_jobOptions.py @@ -11,4 +11,3 @@ theApp.Dlls += [ "LArCalibUtils" ] theApp.Dlls += [ "LArByteStream" ] StreamBS = Algorithm( "StreamBS" ) StreamBS.ItemList +=["2721#*"] -StreamBS.ForceRead=True diff --git a/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_WriteLArROD_G4.py b/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_WriteLArROD_G4.py index 405a169e29c..1f9466e2d81 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_WriteLArROD_G4.py +++ b/LArCalorimeter/LArCnv/LArByteStream/share/jobOptions_WriteLArROD_G4.py @@ -93,7 +93,6 @@ theApp.Dlls += [ "LArCalibUtils" ] theApp.Dlls += [ "LArByteStream" ] oStream.ItemList +=["2721#*"] -oStream.ForceRead=True #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py index 4768d8a4154..af79a215858 100755 --- a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py +++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py @@ -84,7 +84,6 @@ StreamDet.EvtConversionSvc="AthenaPoolCnvSvc" StreamDet.ItemList += ["LArOnOffIdMap#*"] StreamDet.ItemList += ["LArFebRodMap#*"] -StreamDet.ForceRead = True; StreamDet.OutputFile = "LArIdMap2.pool.root" # StreamDet.OutputFile = "oracle://devdb/hma" diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py index 6e9580b26d5..fcf327f461b 100755 --- a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py +++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py @@ -74,7 +74,6 @@ StreamDet.EvtConversionSvc="AthenaPoolCnvSvc" StreamDet.ItemList += ["LArOnOffIdMap#*"] StreamDet.ItemList += ["LArFebRodMap#*"] -StreamDet.ForceRead = True; StreamDet.OutputFile = "LArIdMap.pool.root" # StreamDet.OutputFile = "oracle://devdb/hma" diff --git a/LArCalorimeter/LArG4TB/H6G4Sim/share/jobOptions.DigTB_LArH6-2004.py b/LArCalorimeter/LArG4TB/H6G4Sim/share/jobOptions.DigTB_LArH6-2004.py index 6ca7f277281..0c038dacc94 100755 --- a/LArCalorimeter/LArG4TB/H6G4Sim/share/jobOptions.DigTB_LArH6-2004.py +++ b/LArCalorimeter/LArG4TB/H6G4Sim/share/jobOptions.DigTB_LArH6-2004.py @@ -88,7 +88,6 @@ if DetFlags.writeRDOPool.any_on(): Stream1.ItemList+=["EventInfo#*"]; Stream1.ItemList+=["TBEventInfo#*"]; Stream1.ItemList+=["McEventCollection#*"] - Stream1.ForceRead=TRUE; #force read of output data Stream1.OutputFile = PoolRDOOutput diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py index e06f376a80f..8925e326e59 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py @@ -60,7 +60,6 @@ StreamDet.EvtConversionSvc="AthenaPoolCnvSvc" StreamDet.ItemList += ["LArOnOffIdMap#*"] StreamDet.ItemList += ["LArFebRodMap#*"] -StreamDet.ForceRead = True StreamDet.OutputFile = "LArIdMap_H6.pool.root" # StreamDet.OutputFile = "oracle://devdb/hma" diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py index 16ed7bfabb1..09dbe58e368 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py @@ -60,7 +60,6 @@ StreamDet.EvtConversionSvc="AthenaPoolCnvSvc" StreamDet.ItemList += ["LArOnOffIdMap#*"] StreamDet.ItemList += ["LArFebRodMap#*"] -StreamDet.ForceRead = True StreamDet.OutputFile = "LArIdMap_H8.pool.root" # StreamDet.OutputFile = "oracle://devdb/hma" diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteCscRDO_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteCscRDO_jobOptions.py index 2f5b0a07447..b822b569a08 100644 --- a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteCscRDO_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteCscRDO_jobOptions.py @@ -1,5 +1,4 @@ theApp.Dlls += [ "MuonByteStream" ] StreamBS = Algorithm( "StreamBS" ) StreamBS.ItemList +=["4183#*"] -StreamBS.ForceRead=True diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMdtRDO_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMdtRDO_jobOptions.py index ca229f7a298..574af4a4b75 100644 --- a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMdtRDO_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMdtRDO_jobOptions.py @@ -1,4 +1,3 @@ theApp.Dlls += [ "MuonByteStream" ] StreamBS = Algorithm( "StreamBS" ) StreamBS.ItemList +=["4187#*"] -StreamBS.ForceRead=True diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMuonByteStream_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMuonByteStream_jobOptions.py index a8c537456ed..106b7cfa5da 100644 --- a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMuonByteStream_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteMuonByteStream_jobOptions.py @@ -5,5 +5,4 @@ StreamBS.ItemList +=["4187#*"] StreamBS.ItemList +=["4190#*"] StreamBS.ItemList +=["4186#*"] StreamBS.ItemList +=["4183#*"] -StreamBS.ForceRead=True diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteRpcRDO_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteRpcRDO_jobOptions.py index a33f75d45ce..793061f8e5f 100644 --- a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteRpcRDO_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteRpcRDO_jobOptions.py @@ -1,4 +1,3 @@ theApp.Dlls += [ "MuonByteStream" ] StreamBS = Algorithm( "StreamBS" ) StreamBS.ItemList +=["4190#*"] -StreamBS.ForceRead=True diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteTgcRDO_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteTgcRDO_jobOptions.py index b81e81d9428..04c92ab6ec8 100644 --- a/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteTgcRDO_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonByteStream/share/WriteTgcRDO_jobOptions.py @@ -1,4 +1,3 @@ theApp.Dlls += [ "MuonByteStream" ] StreamBS = Algorithm( "StreamBS" ) StreamBS.ItemList +=["4186#*"] -StreamBS.ForceRead=True diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/cscCondCoolRead.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/cscCondCoolRead.py index d0d0441c880..a1a4ce1da33 100755 --- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/cscCondCoolRead.py +++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/cscCondCoolRead.py @@ -68,7 +68,6 @@ CscReadWriteCoolStr.oFile = output CscReadWriteCoolStr.OutFileType ="04-00" CscReadWriteCoolStr.OutParameters = readPars if(forceReadAsChannelCategory): - CscReadWriteCoolStr.ForceReadAsChannelCategory = True print 'Preparing commissioning database COMP200 ' #---Set detector description tag diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/Merge.py b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/Merge.py index 94b55886628..f621802bfc4 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/Merge.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/Merge.py @@ -58,7 +58,6 @@ Stream1 = Algorithm( "Stream1" ) Stream1.Output = OUTPUT Stream1.EvtConversionSvc ="AthenaPoolCnvSvc" PoolSvc = Service( "PoolSvc" ) -Stream1.ForceRead=TRUE; #force read of output data objs # list of output objects include( "ParticleBuilderOptions/AOD_OutputList_jobOptions.py") diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/MergeWithTags.py b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/MergeWithTags.py index 122d6123c16..ec6f5740ff9 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/MergeWithTags.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/mergingAOD/MergeWithTags.py @@ -59,7 +59,6 @@ OutMerge = Algorithm( "OutMerge" ) OutMerge.Output = OUTPUT+".pool.root" OutMerge.EvtConversionSvc = "AthenaPoolCnvSvc" OutMerge.ItemList = AOD_ItemList -OutMerge.ForceRead = TRUE; #force read of output data objs OutMerge.ExtendProvenanceRecord = TRUE cName = "Rome" diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/share/produceGenEvents_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/share/produceGenEvents_jobOptions.py index c5139ab52e4..c544b7f49e0 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/share/produceGenEvents_jobOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/share/produceGenEvents_jobOptions.py @@ -60,7 +60,6 @@ PoolSvc = Service( "PoolSvc" ) Stream1 = AthenaPoolOutputStream( "Stream1" ) Stream1.ItemList+=["EventInfo#*"]; Stream1.ItemList+=[ "McEventCollection#*" ] -Stream1.ForceRead=TRUE Stream1.OutputFile = "McEvent.root" #PoolSvc.Output = "McEvent.root" #============================================================== diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py index 56df1fa392a..9b91460ba51 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py @@ -89,7 +89,6 @@ theApp.OutStream = []; Stream1 = Algorithm( "Stream1" ) Stream1.EvtConversionSvc = "AthenaPoolCnvSvc"; Stream1.OutputFile = "assocs.readback.pool.root" -#Stream1.ForceRead=TRUE; #force read of output data objs # Event Info Stream1.ItemList += [ "EventInfo#*" ] diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py index 474c7c251cd..25ba3e3d9b6 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py @@ -94,7 +94,6 @@ theApp.OutStream = []; Stream1 = Algorithm( "Stream1" ) Stream1.EvtConversionSvc = "AthenaPoolCnvSvc"; Stream1.OutputFile = "assocs.pool.root" -#Stream1.ForceRead=TRUE; #force read of output data objs # Event Info Stream1.ItemList += [ "EventInfo#*" ] diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/RecoOptions.py b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/RecoOptions.py index 5f3938f119e..138c491debf 100644 --- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/RecoOptions.py +++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/share/RecoOptions.py @@ -158,10 +158,8 @@ include("InDetRecExample/InDetRec_all.py") # Event related parameters #-------------------------------------------------------------- if doWriteESD: - StreamESD.ForceRead = True StreamESD.OutputFile = "/tmp/pbehera/InDetRecESD_new.root" if doWriteAOD: - StreamAOD.ForceRead = True StreamAOD.OutputFile = "/tmp/pbehera/InDetRecAOD_new.root" diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py index 9afd072bb76..3e55de74d1d 100644 --- a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py +++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py @@ -100,4 +100,3 @@ StreamDPD.AddItem ('Rec::TrackParticleContainer#StacoTrackParticles') StreamDPD.AddItem ('TruthParticleContainer#SpclMC') StreamDPD.AddItem ('McEventCollection#GEN_AOD') -StreamDPD.ForceRead=TRUE; #force read of output data objs diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_jobOptions.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_jobOptions.py index 18ec2e37dca..024f781e713 100644 --- a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_jobOptions.py +++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_jobOptions.py @@ -27,6 +27,5 @@ StreamDPD.ItemList += ['TruthParticleContainer#SpclMC'] StreamDPD.ItemList += ['McEventCollection#GEN_AOD'] StreamDPD.WritingTool = "AthenaOutputStreamTool" -StreamDPD.ForceRead = True StreamDPD.OutputFile = "DPD.pool.root" diff --git a/PhysicsAnalysis/DPDUtils/share/ObjectThinner_jobOptions.py b/PhysicsAnalysis/DPDUtils/share/ObjectThinner_jobOptions.py index fd20d744ac2..261d16000e0 100644 --- a/PhysicsAnalysis/DPDUtils/share/ObjectThinner_jobOptions.py +++ b/PhysicsAnalysis/DPDUtils/share/ObjectThinner_jobOptions.py @@ -97,6 +97,5 @@ StreamDPD.ItemList += [ 'McEventCollection#GEN_AOD'] StreamDPD.ItemList += ['JetCollection#Cone4TruthJets'] # do the skimming -#StreamDPD.ForceRead=True #force read of output data objs StreamDPD.AcceptAlgs += ["ObjectThinner"] diff --git a/PhysicsAnalysis/DPDUtils/share/ObjectThinner_topOptions.py b/PhysicsAnalysis/DPDUtils/share/ObjectThinner_topOptions.py index 11b98388488..6a0c23d65b9 100644 --- a/PhysicsAnalysis/DPDUtils/share/ObjectThinner_topOptions.py +++ b/PhysicsAnalysis/DPDUtils/share/ObjectThinner_topOptions.py @@ -94,6 +94,5 @@ StreamDPD.ItemList += [ 'McEventCollection#GEN_AOD'] StreamDPD.ItemList += ['JetCollection#Cone4TruthJets'] # do the skimming -#StreamDPD.ForceRead=True #force read of output data objs StreamDPD.AcceptAlgs += ["ObjectThinner"] diff --git a/PhysicsAnalysis/DPDUtils/share/aodtodpd.py b/PhysicsAnalysis/DPDUtils/share/aodtodpd.py index b6201c7504e..c2f76b21afd 100644 --- a/PhysicsAnalysis/DPDUtils/share/aodtodpd.py +++ b/PhysicsAnalysis/DPDUtils/share/aodtodpd.py @@ -92,7 +92,6 @@ StreamDPD.ItemList += ['McEventCollection#GEN_AOD'] StreamDPD.OutputFile = "SkimmedThin.AOD.pool.root" #StreamDPD.OutputFile = outFileName -StreamDPD.ForceRead=TRUE; #force read of output data objs StreamDPD.AcceptAlgs=["ttbarFilter"] diff --git a/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py b/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py index 25af64d8907..f0ff8588ecc 100644 --- a/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py +++ b/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py @@ -51,7 +51,6 @@ StreamDPD.ItemList += ['Rec::TrackParticleContainer#TrackParticleCandidate'] StreamDPD.ItemList += ['Rec::TrackParticleContainer#StacoTrackParticles'] StreamDPD.ItemList += ['VxContainer#*'] -StreamDPD.ForceRead=TRUE; #force read of output data objs #electron Filter #StreamDPD.AcceptAlgs=["ElectronFilter"] diff --git a/PhysicsAnalysis/DPDUtils/share/pyexample.fdr_makeDPD_config.py b/PhysicsAnalysis/DPDUtils/share/pyexample.fdr_makeDPD_config.py index 03df725b5db..e834c4dd388 100644 --- a/PhysicsAnalysis/DPDUtils/share/pyexample.fdr_makeDPD_config.py +++ b/PhysicsAnalysis/DPDUtils/share/pyexample.fdr_makeDPD_config.py @@ -43,7 +43,6 @@ StreamDPD.ItemList += ['Rec::TrackParticleContainer#TrackParticleCandidate'] StreamDPD.ItemList += ['Rec::TrackParticleContainer#StacoTrackParticles'] StreamDPD.ItemList += ['VxContainer#*'] -StreamDPD.ForceRead=TRUE; #force read of output data objs #electron Filter StreamDPD.AcceptAlgs=["ElectronFilter"] diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py index 79cb485e687..7039eb971dc 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py @@ -157,7 +157,6 @@ if __name__=="__main__": from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg cfg.merge(OutputStreamCfg(cfgFlags,"ESD", ItemList=BTaggingFlags.btaggingESDList)) - cfg.getEventAlgo("OutputStreamESD").ForceRead = True #cfg.getService("StoreGateSvc").Dump=True diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py index 307c1078e62..90c3da2f03d 100755 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py @@ -167,7 +167,6 @@ if OverridePixMapOverlay != "": if WriteNewAODFile: from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream StreamAOD = AthenaPoolOutputStream( "StreamAOD", "newAOD.pool.root", True ) - StreamAOD.ForceRead = True StreamAOD.ExtendProvenanceRecord = False StreamAOD.TakeItemsFromInput=True taggedJetList = [] diff --git a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py index 93566181e2a..eb59bdb2354 100644 --- a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py +++ b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py @@ -26,7 +26,6 @@ class AugmentedNTUPStream( AugmentedStreamBase ): metadataTool.TupleName = tupleName theApp.serviceMgr().ToolSvc += metadataTool self.Stream.HelperTools = [metadataTool] - self.Stream.ForceRead=True; return diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadGenEvent_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadGenEvent_jobOptions.py index 69c113a7b03..efa81fa2e54 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadGenEvent_jobOptions.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadGenEvent_jobOptions.py @@ -99,7 +99,6 @@ OUTPUT = os.path.join( os.path.dirname(INPUT[0]), "reaccessed.%s" % os.path.basename(INPUT[0]) ) import os outStream.OutputFile = OUTPUT -outStream.ForceRead = True #force read of output data objs #-------------------------------------------------------------- # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadTruthParticles_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadTruthParticles_jobOptions.py index de89fd1809f..7c6f2702045 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadTruthParticles_jobOptions.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_ReadTruthParticles_jobOptions.py @@ -90,7 +90,6 @@ import os outStream.OutputFile = os.path.join( \ os.path.dirname(INPUT[0]), "reaccessed.%s" % os.path.basename(INPUT[0]) ) -outStream.ForceRead = True outStream.ItemList += [ "EventInfo#McEventInfo" ] outStream.ItemList += [ "McEventCollection#GEN_EVENT" ] diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_WriteTruthParticles_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_WriteTruthParticles_jobOptions.py index 4f06a81a8a6..6d115222063 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_WriteTruthParticles_jobOptions.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/iotest_WriteTruthParticles_jobOptions.py @@ -135,7 +135,6 @@ if 'OUTPUT' not in dir(): OUTPUT = "mc.aod.pool" pass outStream.OutputFile = OUTPUT -outStream.ForceRead = True #force read of output data objs svcMgr.MessageSvc.defaultLimit = 4000000 svcMgr.MessageSvc.OutputLevel = ERROR diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/rbtest_ReadGenEvent_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/rbtest_ReadGenEvent_jobOptions.py index d80ac95c33c..25eea9769fc 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/rbtest_ReadGenEvent_jobOptions.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/rbtest_ReadGenEvent_jobOptions.py @@ -75,7 +75,6 @@ if 'OUTPUT' not in dir(): "reaccessed.%s" % os.path.basename(INPUT[0]) ) import os outStream.OutputFile = OUTPUT -outStream.ForceRead = True #force read of output data objs #-------------------------------------------------------------- # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/symlinkTest_mcAod_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/symlinkTest_mcAod_jobOptions.py index d31e95e8566..de67296fd0c 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/symlinkTest_mcAod_jobOptions.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/symlinkTest_mcAod_jobOptions.py @@ -77,7 +77,6 @@ if 'OUTPUT' not in dir(): pass outStream.OutputFile = OUTPUT outStream.EvtConversionSvc = "AthenaPoolCnvSvc" -outStream.ForceRead = True #force read of output data objs svcMgr.MessageSvc.defaultLimit = 4000000 svcMgr.MessageSvc.OutputLevel = ERROR diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter.py index 9bbb1a98c09..5c1752ee478 100644 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter.py @@ -78,7 +78,6 @@ OUTPUT = os.path.join( os.path.dirname(INPUT[0]), "filtered.%s" % os.path.basename(INPUT[0]) ) import os outStream.OutputFile = OUTPUT -outStream.ForceRead = True #force read of output data objs #-------------------------------------------------------------- # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter_solution.py b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter_solution.py index ff36dcf07bf..275c34bb944 100644 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter_solution.py +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/share/test_mcaodfilter_solution.py @@ -86,7 +86,6 @@ OUTPUT = os.path.join( os.path.dirname(INPUT[0]), "filtered.%s" % os.path.basename(INPUT[0]) ) import os outStream.OutputFile = OUTPUT -outStream.ForceRead = True #force read of output data objs #-------------------------------------------------------------- # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py index e2e5b9f4572..691097782ef 100644 --- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py +++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py @@ -195,7 +195,6 @@ if __name__=="__main__": from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg cfg.merge(OutputStreamCfg(ConfigFlags,"xAOD",ItemList=outputlist)) pprint( cfg.getEventAlgo("OutputStreamxAOD").ItemList ) - cfg.getEventAlgo("OutputStreamxAOD").ForceRead = True # Optionally, print the contents of the store every event cfg.getService("StoreGateSvc").Dump = args.dumpSG diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py index 4202bfa5033..50b7cf13984 100755 --- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py +++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py @@ -1095,7 +1095,6 @@ if doWriteESD: Stream1.ItemList = fullItemList Stream1.TakeItemsFromInput=TRUE - Stream1.ForceRead=TRUE # This is a way to block a usage of those folders from "default" Db: diff --git a/Reconstruction/RecJobTransforms/share/skeleton.MergeRDO_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.MergeRDO_tf.py index d0598df8eac..1bcb9141657 100644 --- a/Reconstruction/RecJobTransforms/share/skeleton.MergeRDO_tf.py +++ b/Reconstruction/RecJobTransforms/share/skeleton.MergeRDO_tf.py @@ -155,7 +155,6 @@ else: from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream StreamRDO = AthenaPoolOutputStream( "StreamRDO", outputFile, asAlg=True, noTag=True, eventInfoKey=eventInfoKey ) StreamRDO.TakeItemsFromInput=TRUE; -StreamRDO.ForceRead=TRUE; #force read of output data objs # The next line is an example on how to exclude clid's if they are causing a problem #StreamRDO.ExcludeList = ['6421#*'] diff --git a/Reconstruction/eflowRec/python/PFHLTConfig.py b/Reconstruction/eflowRec/python/PFHLTConfig.py index 2abdde62976..684a248cda2 100644 --- a/Reconstruction/eflowRec/python/PFHLTConfig.py +++ b/Reconstruction/eflowRec/python/PFHLTConfig.py @@ -284,7 +284,6 @@ if __name__=="__main__": ] from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg cfg.merge(OutputStreamCfg(cfgFlags,"xAOD",ItemList=outputlist)) - cfg.getEventAlgo("OutputStreamxAOD").ForceRead = True from pprint import pprint pprint( cfg.getEventAlgo("OutputStreamxAOD").ItemList ) diff --git a/Simulation/Digitization/share/Digitization.py b/Simulation/Digitization/share/Digitization.py index 36f7a0931cb..c93dccd5f90 100755 --- a/Simulation/Digitization/share/Digitization.py +++ b/Simulation/Digitization/share/Digitization.py @@ -123,7 +123,6 @@ if DetFlags.writeRDOPool.any_on(): else: eventInfoKey = "EventInfo" streamRDO = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput.get_Value(), asAlg=True, noTag=True, eventInfoKey=eventInfoKey) - streamRDO.ForceRead = True from Digitization.DigiOutput import getStreamRDO_ItemList streamRDO.ItemList = getStreamRDO_ItemList(logDigitization_flags) streamRDO.AcceptAlgs += [ digitizationFlags.digiSteeringConf.get_Value() ] diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimSkeleton.py b/Simulation/G4Atlas/G4AtlasApps/python/SimSkeleton.py index eab5eabd1d2..06a9ee195e4 100644 --- a/Simulation/G4Atlas/G4AtlasApps/python/SimSkeleton.py +++ b/Simulation/G4Atlas/G4AtlasApps/python/SimSkeleton.py @@ -68,7 +68,6 @@ class SimSkeleton(object): #import EventInfoMgt.EventInfoMgtInit ## EventInfo & TruthEvent always written by default - stream1.ForceRead=True stream1.ItemList = ["EventInfo#*", "McEventCollection#TruthEvent", "JetCollection#*"] diff --git a/Simulation/G4Atlas/G4AtlasApps/share/G4Atlas.flat.configuration.py b/Simulation/G4Atlas/G4AtlasApps/share/G4Atlas.flat.configuration.py index 58e858a16c9..dce8e404f5d 100644 --- a/Simulation/G4Atlas/G4AtlasApps/share/G4Atlas.flat.configuration.py +++ b/Simulation/G4Atlas/G4AtlasApps/share/G4Atlas.flat.configuration.py @@ -191,7 +191,6 @@ if not simFlags.ISFRun: #import EventInfoMgt.EventInfoMgtInit ## EventInfo & TruthEvent always written by default - stream1.ForceRead=True stream1.ItemList = ["EventInfo#*", "McEventCollection#TruthEvent", "JetCollection#*"] diff --git a/Simulation/G4Atlas/G4AtlasApps/share/Tile2000_2003.flat.configuration.py b/Simulation/G4Atlas/G4AtlasApps/share/Tile2000_2003.flat.configuration.py index ec5dd11ff90..46af4a7f9b6 100644 --- a/Simulation/G4Atlas/G4AtlasApps/share/Tile2000_2003.flat.configuration.py +++ b/Simulation/G4Atlas/G4AtlasApps/share/Tile2000_2003.flat.configuration.py @@ -157,7 +157,6 @@ if not simFlags.ISFRun: #import EventInfoMgt.EventInfoMgtInit ## EventInfo & TruthEvent always written by default - stream1.ForceRead=True stream1.ItemList = ["EventInfo#*", "McEventCollection#TruthEvent", "JetCollection#*"] diff --git a/Simulation/ISF/ISF_Example/python/ISF_Output.py b/Simulation/ISF/ISF_Example/python/ISF_Output.py index 2209375f0ca..4c37e151661 100644 --- a/Simulation/ISF/ISF_Example/python/ISF_Output.py +++ b/Simulation/ISF/ISF_Example/python/ISF_Output.py @@ -154,7 +154,6 @@ class ISF_HITSStream: if athenaCommonFlags.PoolHitsOutput.statusOn: output_file = athenaCommonFlags.PoolHitsOutput() stream1 = AthenaPoolOutputStream("StreamHITS", output_file) - stream1.ForceRead = True stream1.ItemList = getHITSStreamItemList() ## Make stream aware of aborted events stream1.AcceptAlgs = [ISF_Flags.Simulator.KernelName()] @@ -166,7 +165,6 @@ class ISF_HITSStream: if simFlags.SimulationFlavour == "ParametricSimulation": output_file = athenaCommonFlags.PoolAODOutput() xAODStream = AthenaPoolOutputStream("StreamAOD", output_file) - xAODStream.ForceRead = True xAODStream.ItemList = getAODStreamItemList() ## Make stream aware of aborted events xAODStream.AcceptAlgs = [ISF_Flags.Simulator.KernelName()] diff --git a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py index 4d60828a1be..9cbf7394613 100644 --- a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py +++ b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py @@ -181,7 +181,6 @@ Stream1.ItemList+=["RPCSimHitCollection#RPC_Hits"] #TGC Stream1.ItemList+=["TGCSimHitCollection#TGC_Hits"] -Stream1.ForceRead = True #-------------------------------------------------------------- # the Tile, LAr and Calo detector description package diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITSMerge.py b/Simulation/SimuJobTransforms/share/skeleton.HITSMerge.py index 846f13c8e09..2aacca3666c 100644 --- a/Simulation/SimuJobTransforms/share/skeleton.HITSMerge.py +++ b/Simulation/SimuJobTransforms/share/skeleton.HITSMerge.py @@ -114,7 +114,6 @@ try: except: StreamHITS = AthenaPoolOutputStream( "StreamHITS", "DidNotSetOutputName.root", True, noTag=True ) StreamHITS.TakeItemsFromInput=TRUE; -StreamHITS.ForceRead=TRUE; #force read of output data objs # The next line is an example on how to exclude clid's if they are causing a problem #StreamHITS.ExcludeList = ['6421#*'] diff --git a/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py b/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py index 89baa2f53bd..3d7d254f7cd 100644 --- a/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py +++ b/Tools/FullChainTransforms/share/FastChainSkeleton.EVGENtoRDO.py @@ -1252,7 +1252,6 @@ writeDigitizationMetadata() if DetFlags.writeRDOPool.any_on(): from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream streamRDO = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput.get_Value(), asAlg=True) - streamRDO.ForceRead = True from Digitization.DigiOutput import getStreamRDO_ItemList streamRDO.ItemList = getStreamRDO_ItemList(fast_chain_log) streamRDO.AcceptAlgs += [ digitizationFlags.digiSteeringConf.get_Value() ] diff --git a/Tools/PyJobTransforms/share/skeleton.EVNTMerge.py b/Tools/PyJobTransforms/share/skeleton.EVNTMerge.py index 6b329c8ac24..6e8d1be5f31 100644 --- a/Tools/PyJobTransforms/share/skeleton.EVNTMerge.py +++ b/Tools/PyJobTransforms/share/skeleton.EVNTMerge.py @@ -16,7 +16,6 @@ outStream = AthenaPoolOutputStream("StreamEVGEN", runArgs.outputEVNT_MRGFile) ## copy everything from the input file ## must force reading of all input objects outStream.TakeItemsFromInput = True -outStream.ForceRead = True #============================================================== diff --git a/Tools/ValgrindRTTJobs/share/McGenerationPythia.py b/Tools/ValgrindRTTJobs/share/McGenerationPythia.py index 6ed2f1b7761..a4e338f1627 100644 --- a/Tools/ValgrindRTTJobs/share/McGenerationPythia.py +++ b/Tools/ValgrindRTTJobs/share/McGenerationPythia.py @@ -65,5 +65,4 @@ topAlg+=ValgrindHelperAlg() from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream("Stream1") Stream1.ItemList += ["EventInfo#*", "McEventCollection#*" ] -# Stream1.ForceRead=True Stream1.OutputFile = "McEvent.root" diff --git a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py index 41b1f4a78f6..6b1693729f6 100644 --- a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py +++ b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.FTKStandaloneMerge.py @@ -306,7 +306,6 @@ elif hasattr(runArgs,'outputRDO_FTKFile') : from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream StreamRDO = AthenaPoolOutputStream( "StreamRDO", runArgs.outputRDO_FTKFile) #StreamRDO.TakeItemsFromInput=True - StreamRDO.ForceRead=TRUE StreamRDO.ItemList+=["FTK_RawTrackContainer#*"] else : # generate RDO file from scratch, this represents an RDO diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py index dd1cb093c0f..b3cfb610d20 100644 --- a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py +++ b/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py @@ -41,7 +41,6 @@ include( "TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py" ) include( "ByteStreamCnvSvc/WriteByteStream_EventStorage_jobOptions.py" ) ServiceMgr.ByteStreamEventStorageOutputSvc.FileTag = "lvl1test" -oStream.ForceRead = True oStream.ItemList += [ "ROIB::RoIBResult#*" ] oStream.ItemList += [ "CTP_RDO#*" ] oStream.ItemList += [ "MuCTPI_RDO#*" ] diff --git a/Trigger/TrigValidation/TrigP1Test/share/TopOptions_WriteBS_LVL1sim_fromAthena.py b/Trigger/TrigValidation/TrigP1Test/share/TopOptions_WriteBS_LVL1sim_fromAthena.py index 41758f914b6..8a547f5dd69 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/TopOptions_WriteBS_LVL1sim_fromAthena.py +++ b/Trigger/TrigValidation/TrigP1Test/share/TopOptions_WriteBS_LVL1sim_fromAthena.py @@ -109,7 +109,6 @@ lvl1 = Lvl1SimulationGetter() include( "ByteStreamCnvSvc/WriteByteStream_EventStorage_jobOptions.py" ) StreamBS = AthenaOutputStream("StreamBS", EvtConversionSvc = "ByteStreamCnvSvc") -StreamBS.ForceRead=True StreamBS.ItemList += [ "ROIB::RoIBResult#*" ] StreamBS.ItemList += [ "TRT_RDO_Container#*" ] StreamBS.ItemList += [ "SCT_RDO_Container#*" ] diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py index d113221b6fe..d6ef9933154 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py @@ -113,7 +113,6 @@ class TriggerGetter(Configured): # Transient BS construction and intialization from ByteStreamCnvSvc import WriteByteStream StreamBS = WriteByteStream.getStream("Transient","StreamBS") - StreamBS.ForceRead=True StreamBS.ItemList += [ "DataVector#TriggerTowers" ] StreamBS.ItemList += [ "TRT_RDO_Container#TRT_RDOs" ] StreamBS.ItemList += [ "SCT_RDO_Container#SCT_RDOs" ] diff --git a/Trigger/TriggerRelease/share/jobOfragment_TransBS_standalone.py b/Trigger/TriggerRelease/share/jobOfragment_TransBS_standalone.py index 44b8a17d3e6..335fd8a9d57 100644 --- a/Trigger/TriggerRelease/share/jobOfragment_TransBS_standalone.py +++ b/Trigger/TriggerRelease/share/jobOfragment_TransBS_standalone.py @@ -13,7 +13,6 @@ StreamBS = AthenaOutputStream("StreamBS", ('PixelHitDiscCnfgData','ConditionStore+PixelHitDiscCnfgData'), ('MuonMDT_CablingMap','ConditionStore+MuonMDT_CablingMap') ]) -StreamBS.ForceRead=True if not TriggerFlags.fakeLVL1(): #LVL1 theApp.Dlls += [ "TrigT1ResultByteStream" ] diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py index aa39c9372dc..0d04ed67702 100644 --- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py +++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py @@ -190,7 +190,6 @@ from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputStream ostream = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput(), True) ostream.TakeItemsFromInput = True -ostream.ForceRead = True ostream.ItemList += [n.replace("/", "#") for n in svcMgr.ByteStreamAddressProviderSvc.TypeNames] -- GitLab From dbd108a5b07c52cfa3cdcbb45134935c3cdb2985 Mon Sep 17 00:00:00 2001 From: Peter van Gemmeren Date: Tue, 3 Sep 2019 12:04:18 -0500 Subject: [PATCH 2/2] Re-add ForceRead setting for ntuple stream --- .../AthenaRootComps/share/tests/test_athena_ntuple_dumper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py index 13427382042..a2170eb1ae6 100644 --- a/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py +++ b/Database/AthenaRoot/AthenaRootComps/share/tests/test_athena_ntuple_dumper.py @@ -58,6 +58,7 @@ if DOWRITE: "el_eta", "el_jetcone_dr", ] + out.ForceRead = True if DOWRITE>1: # another output stream... with the same content. out = arcw.createNtupleOutputStream("StreamD3PD_2", @@ -68,6 +69,7 @@ if DOWRITE: "el_eta", "el_jetcone_dr", ] + out.ForceRead = True pass -- GitLab