diff --git a/Event/EventOverlay/EventOverlayJobTransforms/scripts/chain.sh b/Event/EventOverlay/EventOverlayJobTransforms/scripts/chain.sh
index b11fe0be3ac467206339ddd6a657ad81f95c34ec..d7114743bebe4b31280f237972196d50f344b304 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/scripts/chain.sh
+++ b/Event/EventOverlay/EventOverlayJobTransforms/scripts/chain.sh
@@ -46,11 +46,9 @@ Reco_tf.py \
--inputRDOFile testRTT.RDO.pool.root --outputESDFile testRTT.ESD.pool.root $aodout $rdotrig \
--preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' \
--postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' \
---preExec "from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock('4samples1phase'); $dotrig $trigflag $domon $dojive " \
---postExec "r2e:from AthenaCommon import CfgGetter;CfgGetter.getPublicTool('LArCellBuilderFromLArRawChannelTool').RawChannelsName='LArRawChannels_FromDigits';"
+--preExec "from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock('4samples1phase'); $dotrig $trigflag $domon $dojive "
#svcMgr.MdtCalibrationSvc.OutputLevel=VERBOSE; svcMgr.MessageSvc.verboseLimit=100000; '
fi
#Reco_tf.py --inputESDFile testRTT.ESD.pool.root --outputAODFile testRTT.AOD.pool.root
-
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/scripts/overlay_notrig_grid_rel20.7.sh b/Event/EventOverlay/EventOverlayJobTransforms/scripts/overlay_notrig_grid_rel20.7.sh
index 255ce2829f5726f2772a87be0034833e457a899c..3fdce936b9d14f2cb9e05212567df066145a3dc3 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/scripts/overlay_notrig_grid_rel20.7.sh
+++ b/Event/EventOverlay/EventOverlayJobTransforms/scripts/overlay_notrig_grid_rel20.7.sh
@@ -63,7 +63,7 @@ fsamp="LARElecCalibMCfSampl-G496-19213-"
OverlayChain="OverlayChain_tf.py --inputZeroBiasBSFile $ffile --outputRDOFile %OUT.RDO.pool.root $filterstring --skipEvents 0 --maxEvents $teste --triggerBit 240 --DataRunNumber $run --inputEVNTFile %MININ --randomSeed %RNDM:${inputevgenfile} --geometryVersion $geo --conditionsTag $dco --digiSeedOffset1 211 --digiSeedOffset2 122 --conditionsTag $dco --samplingFractionDbTag FTFP_BERT_BIRK --fSampltag $fsamp --preInclude 'sim:EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/magfield.py' 'overlayBS:EventOverlayJobTransforms/custom.py' --preExec 'from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from LArConditionsCommon.LArCondFlags import larCondFlags; larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\")' --postInclude 'sim:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign.py,EventOverlayJobTransforms/g4runnumber.py' 'overlayBS:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
-Reco="; Reco_tf.py --autoConfiguration 'everything' --inputRDOFile %OUT.RDO.pool.root --outputESDFile %OUT.ESD.pool.root --outputAODFile %OUT.AOD.pool.root --maxEvents $teste --skipEvents 0 --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\");rec.doTrigger=False' --postExec 'r2e:from AthenaCommon import CfgGetter;CfgGetter.getPublicTool(\"LArCellBuilderFromLArRawChannelTool\").RawChannelsName=\"LArRawChannels_FromDigits\"' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
+Reco="; Reco_tf.py --autoConfiguration 'everything' --inputRDOFile %OUT.RDO.pool.root --outputESDFile %OUT.ESD.pool.root --outputAODFile %OUT.AOD.pool.root --maxEvents $teste --skipEvents 0 --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\");rec.doTrigger=False' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
tmp6dir="/tmp/tkharlam/"
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
index 7b66c9dcb0655b58d11edfa123526782cf21b70d..4d46993cd518c75a65fb076159b354c5d62b7fbe 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
@@ -27,25 +27,30 @@ if DetFlags.overlay.LAr_on():
#include( "LArAthenaPool/LArAthenaPool_joboptions.py" )
# We also need the conditions svc for MC constants:
if overlayFlags.isDataOverlay():
+ from LArROD.LArRODFlags import larRODFlags
+ larRODFlags.keepDSPRaw = False
+
theApp.Dlls += [ "LArByteStream"]
LArDigitKey = "FREE"
ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += ["LArDigitContainer/"+LArDigitKey]
ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += ["LArFebHeaderContainer/LArFebHeader"]
ServiceMgr.ByteStreamAddressProviderSvc.TypeNames+=["LArDigitContainer/LArDigitContainer_MC"]
- from LArROD.LArRawChannelGetter import LArRawChannelGetter
- LArRawChannelGetter()
+ from LArDigitization.LArDigitGetter import LArDigitGetter
+ theLArDigitGetter = LArDigitGetter()
+
+ if overlayFlags.isDataOverlay():
+ from LArROD.LArRawChannelBuilderDefault import LArRawChannelBuilderDefault
+ LArRawChannelBuilderDefault()
+ else:
+ job += CfgGetter.getAlgorithm("LArRawChannelBuilder", tryDefaultConfigurable=True)
from LArROD.LArDigits import DefaultLArDigitThinner
LArDigitThinner = DefaultLArDigitThinner('LArDigitThinner') # automatically added to topSequence
+
if overlayFlags.isDataOverlay():
- job.LArDigitThinner.InputContainerName = overlayFlags.dataStore()+"+FREE"
- job.LArDigitThinner.RawChannelContainerName = "LArRawChannels_FromDigits"
- #job.digitmaker1.LArPileUpTool.OutputLevel=DEBUG
- #MessageSvc.debugLimit = 100000
- #job.digitmaker1.LArPileUpTool.useLArFloat=False
- job.digitmaker1.LArPileUpTool.PedestalKey = "LArPedestal"
- job.LArRawChannelBuilder.DataLocation = "LArDigitContainer_MC"
+ job.LArDigitThinner.InputContainerName = overlayFlags.dataStore()+"+FREE"
+ job.LArRawChannelBuilderAlg.LArDigitKey = "LArDigitContainer_MC"
#----------------------------------------------------------------
if DetFlags.overlay.Tile_on():
diff --git a/Event/EventOverlay/OverlayMonitoringRTT/CMakeLists.txt b/Event/EventOverlay/OverlayMonitoringRTT/CMakeLists.txt
index 8d860e1e27afa9409f92487f496b6a93d7a04a03..45f2888d617a6cf6cf90b8a26ce02e2f8dec7b07 100644
--- a/Event/EventOverlay/OverlayMonitoringRTT/CMakeLists.txt
+++ b/Event/EventOverlay/OverlayMonitoringRTT/CMakeLists.txt
@@ -11,5 +11,3 @@ atlas_depends_on_subdirs( PRIVATE
# Install files from the package:
atlas_install_headers( OverlayMonitoringRTT )
-atlas_install_runtime( test/OverlayMonitoringRTT_TestConfiguration.xml )
-
diff --git a/Event/EventOverlay/OverlayMonitoringRTT/test/OverlayMonitoringRTT_TestConfiguration.xml b/Event/EventOverlay/OverlayMonitoringRTT/test/OverlayMonitoringRTT_TestConfiguration.xml
deleted file mode 100644
index 273579b5dcf5beda1c2d2ebf1775bda27e6cd924..0000000000000000000000000000000000000000
--- a/Event/EventOverlay/OverlayMonitoringRTT/test/OverlayMonitoringRTT_TestConfiguration.xml
+++ /dev/null
@@ -1,780 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
- <atn/>
- <kv/>
- <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt" >
- <rttContactPerson>Overlay SRL</rttContactPerson>
- <mailto>atlas-srl-Overlay@cern.ch</mailto>
- <jobList>
-
- <chain>
- <chainName>MC15_2016_Legacy</chainName>
- <abortOnError />
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC15_2016_Legacy_OverlayChain_tf">
- <doc></doc>
- <jobTransformJobName>MC15_2016_Legacy_OverlayChain_tf</jobTransformJobName>
- <jobTransformCmd>
- OverlayChain_tf.py --inputZeroBiasBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1 --DataRunNumber 2015 --inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.merge.EVNT.e3601_e5984/EVNT.12228944._002158.pool.root.1 --outputRDOFile testRTT.RDO.pool.root --outputHITSFile testRTT.HITS.pool.root --triggerBit 240 --skipEvents 0 --maxEvents 10 --randomSeed 123456789 --geometryVersion ATLAS-R2-2015-03-01-00 --conditionsTag CONDBR2-BLKPA-2016-12 --digiSeedOffset1=211 --digiSeedOffset2=122 --samplingFractionDbTag FTFP_BERT_BIRK --fSampltag LARElecCalibMCfSampl-G496-19213- --preInclude 'sim:EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/magfield.py' 'overlayBS:EventOverlayJobTransforms/custom.py' --preExec 'from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from LArConditionsCommon.LArCondFlags import larCondFlags; larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase")' --postInclude 'sim:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign.py,EventOverlayJobTransforms/g4runnumber.py' 'overlayBS:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py' --ignorePatterns "L1TopoMenuLoader.+ERROR."
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- </jobTransform>
- <chainfileout>testRTT.RDO.pool.root</chainfileout>
- </chainElement>
-
- <parallel>
- <chainElement>
- <!-- Regression Test on HITS -->
- <jobTransform userJobId="MC15_2016_Legacy_HITS_Reg">
- <doc>Regression test for HITS created by OverlayChain_tf.py</doc>
- <jobTransformJobName>MC15_2016_Legacy_HITS_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2016_Legacy_OverlayChain_tf testRTT.HITS.pool.root HITS.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>HITS_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.HITS.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.HITS.pool.root</argvalue>
- </arg>
- <arg>
- <argname>optionString</argname>
- <argvalue>--ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings</argvalue>
- </arg>
- <keepFilePattern>today.HITS.pool.root_yesterday.HITS.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- <chainElement>
- <!-- Regression Test on RDOs -->
- <jobTransform userJobId="MC15_2016_Legacy_RDO_Reg">
- <doc>Regression test for RDOs created by OverlayChain_tf.py</doc>
- <jobTransformJobName>MC15_2016_Legacy_RDO_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2016_Legacy_OverlayChain_tf testRTT.RDO.pool.root RDO.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>RDO_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.RDO.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.RDO.pool.root</argvalue>
- </arg>
- <keepFilePattern>today.RDO.pool.root_yesterday.RDO.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC15_2016_Legacy_Reco_tf">
- <doc>Reco of MC+Data overlay</doc>
- <jobTransformJobName>MC15_2016_Legacy_Reco_tf</jobTransformJobName>
- <jobTransformCmd>
- Reco_tf.py --inputRDOFile testRTT.RDO.pool.root --outputESDFile testRTT.ESD.pool.root --outputAODFile testRTT.AOD.pool.root --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase");rec.doTrigger=False;' --ignorePatterns "L1TopoMenuLoader.+ERROR." --postExec 'r2e:from LArCellRec.LArCellRecConf import LArCellBuilderFromLArRawChannelTool;LArCellBuilderFromLArRawChannelTool.RawChannelsName="LArRawChannels_FromDigits"'
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <chaindataset_info>
- <jobTransformData />
- <chaindatasetName>testRTT.RDO.pool.root</chaindatasetName>
- <dataset_info>
- <dc2 />
- <datasetName>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/MC11.nightly.RDO.pool.root</datasetName>
- </dataset_info>
- </chaindataset_info>
- <queue>medium</queue>
- </jobTransform>
- <chainfileout>testRTT.ESD.pool.root</chainfileout>
- </chainElement>
- <chainElement>
- <!-- Regression Test on ESDs -->
- <jobTransform userJobId="MC12_2016_Legacy_ESD_Reg">
- <doc>Regression test for Reco_tf"</doc>
- <jobTransformJobName>MC15_2016_Legacy_ESD_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2016_Legacy_Reco_tf testRTT.ESD.pool.root ESD.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>ESD_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>optionString</argname>
- <argvalue>--ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings RecoTimingObj_p1_HITStoRDO_timings RecoTimingObj_p1_RAWtoESD_timings RecoTimingObj_p1_RAWtoESD_mems TrackParticleAssocs_p1_GSFTrackAssociation</argvalue>
- </arg>
- <keepFilePattern>today.ESD.pool.root_yesterday.ESD.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- </sequential>
-
- </parallel>
-
- </sequential>
-
- </chain>
-
- <chain>
- <chainName>MC15_2015_Legacy</chainName>
- <abortOnError />
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC15_2015_Legacy_OverlayChain_tf">
- <doc></doc>
- <jobTransformJobName>MC15_2015_Legacy_OverlayChain_tf</jobTransformJobName>
- <jobTransformCmd>
- OverlayChain_tf.py --inputZeroBiasBSFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/mc15_valid.00200010.overlay_stream9_2015_3.skim.DRAW.r7677_tid07898510_00/DRAW.07898510._001574.pool.root.1 --DataRunNumber 2015 --inputEVNTFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/mc15_13TeV.147407.PowhegPythia8_AZNLO_Zmumu.evgen.EVNT.e4032/EVNT.05685490._000002.pool.root.1 --outputRDOFile testRTT.RDO.pool.root --outputHITSFile testRTT.HITS.pool.root --triggerBit 240 --skipEvents 0 --maxEvents 10 --randomSeed 123456789 --geometryVersion ATLAS-R2-2015-03-01-00 --conditionsTag CONDBR2-BLKPA-2015-12 --digiSeedOffset1=211 --digiSeedOffset2=122 --samplingFractionDbTag FTFP_BERT_BIRK --fSampltag LARElecCalibMCfSampl-G496-19213- --preInclude 'sim:EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/magfield.py' 'overlayBS:EventOverlayJobTransforms/custom.py' --preExec 'from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from LArConditionsCommon.LArCondFlags import larCondFlags; larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase")' --postInclude 'sim:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign.py,EventOverlayJobTransforms/g4runnumber.py' 'overlayBS:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py' --ignorePatterns "L1TopoMenuLoader.+ERROR."
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- </jobTransform>
- <chainfileout>testRTT.RDO.pool.root</chainfileout>
- </chainElement>
-
- <parallel>
- <chainElement>
- <!-- Regression Test on HITS -->
- <jobTransform userJobId="MC15_2015_Legacy_HITS_Reg">
- <doc>Regression test for HITS created by OverlayChain_tf.py</doc>
- <jobTransformJobName>MC15_2015_Legacy_HITS_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2015_Legacy_OverlayChain_tf testRTT.HITS.pool.root HITS.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>HITS_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.HITS.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.HITS.pool.root</argvalue>
- </arg>
- <arg>
- <argname>optionString</argname>
- <argvalue>--ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings</argvalue>
- </arg>
- <keepFilePattern>today.HITS.pool.root_yesterday.HITS.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- <chainElement>
- <!-- Regression Test on RDOs -->
- <jobTransform userJobId="MC15_2015_Legacy_RDO_Reg">
- <doc>Regression test for RDOs created by OverlayChain_tf.py</doc>
- <jobTransformJobName>MC15_2015_Legacy_RDO_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2015_Legacy_OverlayChain_tf testRTT.RDO.pool.root RDO.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>RDO_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.RDO.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.RDO.pool.root</argvalue>
- </arg>
- <keepFilePattern>today.RDO.pool.root_yesterday.RDO.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC15_2015_Legacy_Reco_tf">
- <doc>Reco of MC+Data overlay</doc>
- <jobTransformJobName>MC15_2015_Legacy_Reco_tf</jobTransformJobName>
- <jobTransformCmd>
- Reco_tf.py --inputRDOFile testRTT.RDO.pool.root --outputESDFile testRTT.ESD.pool.root --outputAODFile testRTT.AOD.pool.root --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --postExec 'r2e:from LArCellRec.LArCellRecConf import LArCellBuilderFromLArRawChannelTool;LArCellBuilderFromLArRawChannelTool.RawChannelsName="LArRawChannels_FromDigits"' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase");rec.doTrigger=False' --ignorePatterns "L1TopoMenuLoader.+ERROR."
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <chaindataset_info>
- <jobTransformData />
- <chaindatasetName>testRTT.RDO.pool.root</chaindatasetName>
- <dataset_info>
- <dc2 />
- <datasetName>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/MC15.nightly.RDO.pool.root</datasetName>
- </dataset_info>
- </chaindataset_info>
- <queue>medium</queue>
- </jobTransform>
- <chainfileout>testRTT.ESD.pool.root</chainfileout>
- </chainElement>
- <chainElement>
- <!-- Regression Test on ESDs -->
- <jobTransform userJobId="MC15_2015_Legacy_ESD_Reg">
- <doc>Regression test for Reco_tf"</doc>
- <jobTransformJobName>MC15_2015_Legacy_ESD_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC15_2015_Legacy_Reco_tf testRTT.ESD.pool.root ESD.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>ESD_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>optionString</argname>
- <argvalue>--ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings RecoTimingObj_p1_HITStoRDO_timings RecoTimingObj_p1_RAWtoESD_timings RecoTimingObj_p1_RAWtoESD_mems TrackParticleAssocs_p1_GSFTrackAssociation</argvalue>
- </arg>
- <keepFilePattern>today.ESD.pool.root_yesterday.ESD.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- </sequential>
-
- </parallel>
-
- </sequential>
-
- </chain>
-
- <chain>
- <chainName>MC_plus_MC_Overlay_Legacy</chainName>
- <abortOnError />
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC_Legacy_OverlayPool_tf">
- <doc></doc>
- <jobTransformJobName>MC_Legacy_OverlayPool_tf</jobTransformJobName>
- <jobTransformCmd>
- Reco_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc16_13TeV.424000.ParticleGun_single_mu_Pt100.simul.HITS.e3580_s3126/HITS.11330296._000376.pool.root.1 --inputRDO_BKGFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/user.tkharlam.PileupPremixing.r21.0.22.159000.ParticleGenerator_nu_E50.pileup.mc16a_caseA_EXT0/user.tkharlam.11805093.EXT0._000346.RDO.pool.root --outputRDOFile MC_plus_MC.RDO.pool.root --maxEvents 20 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 --conditionsTag OFLCOND-MC16-SDR-14 --geometryVersion ATLAS-R2-2016-01-00-01 --triggerConfig 'OverlayPool=NONE' --postExec 'ServiceMgr.TGCcablingServerSvc.forcedUse=True' --preExec 'from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' --steering="doOverlay"
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- </jobTransform>
- <chainfileout>MC_plus_MC.RDO.pool.root</chainfileout>
- </chainElement>
-
- <parallel>
- <chainElement>
- <!-- Regression Test on RDOs -->
- <jobTransform userJobId="MC_OverlayPool_Legacy_RDO_Reg">
- <doc>Regression test for RDOs created by OverlayPool_tf.py</doc>
- <jobTransformJobName>MC_OverlayPool_Legacy_RDO_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC_Legacy_OverlayPool_tf MC_plus_MC.RDO.pool.root RDO.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>RDO_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.RDO.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.RDO.pool.root</argvalue>
- </arg>
- <keepFilePattern>today.RDO.pool.root_yesterday.RDO.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC_OverlayPool_Legacy_Reco_tf">
- <doc>Reco of MC+Data overlay</doc>
- <jobTransformJobName>MC_OverlayPool_Legacy_Reco_tf</jobTransformJobName>
- <jobTransformCmd>
- Reco_tf.py --inputRDOFile MC_plus_MC.RDO.pool.root --outputESDFile MC_plus_MC.ESD.pool.root --outputAODFile MC_plus_MC.AOD.pool.root --maxEvents -1 --skipEvents 0 --autoConfiguration everything --preExec 'rec.doTrigger=False;from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True);' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False'
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <chaindataset_info>
- <jobTransformData />
- <chaindatasetName>MC_plus_MC.RDO.pool.root</chaindatasetName>
- <dataset_info>
- <dc2 />
- <datasetName>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/MC_plus_MC.RDO.pool.root</datasetName>
- </dataset_info>
- </chaindataset_info>
- <queue>medium</queue>
- </jobTransform>
- <chainfileout>MC_plus_MC.ESD.pool.root</chainfileout>
- </chainElement>
- <chainElement>
- <!-- Regression Test on ESDs -->
- <jobTransform userJobId="MC_OverlayPool_Legacy_ESD_Reg">
- <doc>Regression test for Reco_tf"</doc>
- <jobTransformJobName>MC_OverlayPool_Legacy_ESD_Reg</jobTransformJobName>
- <jobTransformCmd>
- sim_reg_test.py MC_OverlayPool_Legacy_Reco_tf MC_plus_MC.ESD.pool.root ESD.pool
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>short</queue>
- <test>
- <modulename>FlexibleDiffPoolFilesRunner</modulename>
- <testname>FlexibleDiffPoolFilesRunner</testname>
- <testidentifier>ESD_RegressionTestRunner</testidentifier>
- <arg>
- <argname>platformDependent</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>doDetailedChecks</argname>
- <argvalue>True</argvalue>
- </arg>
- <arg>
- <argname>fileName</argname>
- <argvalue>today.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>refFileName</argname>
- <argvalue>yesterday.ESD.pool.root</argvalue>
- </arg>
- <arg>
- <argname>optionString</argname>
- <argvalue>--ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings RecoTimingObj_p1_HITStoRDO_timings RecoTimingObj_p1_RAWtoESD_timings RecoTimingObj_p1_RAWtoESD_mems TrackParticleAssocs_p1_GSFTrackAssociation</argvalue>
- </arg>
- <keepFilePattern>today.ESD.pool.root_yesterday.ESD.pool.root.diffPool</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- </sequential>
-
- </parallel>
-
- </sequential>
-
- </chain>
-
- <chain>
- <chainName>MC15_BSFilter_Legacy</chainName>
- <abortOnError />
-
- <sequential>
- <chainElement>
- <jobTransform userJobId="MC15_simpletest_Legacy_BSOverlayFilter_tf">
- <doc>Simple Filtering</doc>
- <jobTransformJobName>MC15_simpletest_Legacy_BSOverlayFilter_tf</jobTransformJobName>
- <jobTransformCmd>
- BSOverlayFilter_tf.py --inputZeroBiasBSFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1 --outputBS_SKIMFile simpledummy.RAW --triggerBit 240 --maxEvents 10 --outputTXT_EVENTIDFile events.txt
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- <!-- Comparison Test on events.txt -->
- <test position="1">
- <modulename>RttLibraryTools</modulename>
- <testname>FileComparatorRunner</testname>
- <outputFile>events.txt_events_ref.txt.diffTXT</outputFile>
- <testidentifier>SimpleBSOverlayFilter_eventstxt_FilesDiff</testidentifier>
- <arg>
- <argname>testFile</argname>
- <argvalue>events.txt</argvalue>
- </arg>
- <arg>
- <argname>refFile</argname>
- <argvalue>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/events_ref.txt</argvalue>
- </arg>
- <keepFilePattern>events.txt_events_ref.txt.diffTXT</keepFilePattern>
- </test>
- <!-- BSFilter log file tests -->
- <test position="2">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 10</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_results.txt</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <parallel>
- <chainElement>
- <jobTransform userJobId="MC15_completeskimming_Legacy_BSOverlayFilter_tf">
- <doc>Trigger Filtering and Skimming with direct input</doc>
- <jobTransformJobName>MC15_completeskimming_Legacy_BSOverlayFilter_tf</jobTransformJobName>
- <jobTransformCmd>
- BSOverlayFilter_tf.py --inputZeroBiasBSFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1 --outputBS_SKIMFile dummy.RAW --outputBS_TRIGSKIMFile trigskim.RAW --triggerBit 240 --inputFilterFile trigs.txt --lumiBlockMapFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/lbn_anal_map.txt
- rm -f *.RAW
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- <!-- Comparison Test on trigs.txt -->
- <test position="1">
- <modulename>RttLibraryTools</modulename>
- <testname>FileComparatorRunner</testname>
- <outputFile>trigs.txt_trigs_ref.txt.diffTXT</outputFile>
- <testidentifier>BSOverlayFilter_trigstxt_Diff</testidentifier>
- <arg>
- <argname>testFile</argname>
- <argvalue>trigs.txt</argvalue>
- </arg>
- <arg>
- <argname>refFile</argname>
- <argvalue>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/trigs_ref.txt</argvalue>
- </arg>
- <keepFilePattern>trigs.txt_trigs_ref.txt.diffTXT</keepFilePattern>
- </test>
- <!-- BSFilter log file tests -->
- <test position="2">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_BSFilter_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 625</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_BSFilter_results.txt</keepFilePattern>
- </test>
- <!-- BSTrigFilter log file tests -->
- <test position="3">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_BSTrigFilter_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSTrigFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 625</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>number of events written: 400</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_BSTrigFilter_results.txt</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <chainElement>
- <jobTransform userJobId="MC15_completeskimmingtar_Legacy_BSOverlayFilter_tf">
- <doc>Trigger Filtering with tar input file</doc>
- <jobTransformJobName>MC15_completeskimmingtar_Legacy_BSOverlayFilter_tf</jobTransformJobName>
- <jobTransformCmd>
- BSOverlayFilter_tf.py --jobNumber 23 --inputBSCONFIGFile /afs/cern.ch/work/t/tkharlam/public/overlay_RTT/test23.tar --inputFileValidation False --outputBS_TRIGSKIMFile trigskim.RAW --triggerBit 240 --inputFilterFile trigs_tar.txt
- rm -f *.RAW
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- <!-- Comparison Test on trigs_tar.txt -->
- <test position="1">
- <modulename>RttLibraryTools</modulename>
- <testname>FileComparatorRunner</testname>
- <outputFile>trigs_tar.txt_trigs_ref.txt.diffTXT</outputFile>
- <testidentifier>BSOverlayFilter_trigstartxt_Diff</testidentifier>
- <arg>
- <argname>testFile</argname>
- <argvalue>trigs_tar.txt</argvalue>
- </arg>
- <arg>
- <argname>refFile</argname>
- <argvalue>/afs/cern.ch/work/t/tkharlam/public/overlay_RTT/trigs_ref.txt</argvalue>
- </arg>
- <keepFilePattern>trigs_tar.txt_trigs_ref.txt.diffTXT</keepFilePattern>
- </test>
- <!-- BSFilter log file tests -->
- <test position="2">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_BSFilter_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 625</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_BSFilter_results.txt</keepFilePattern>
- </test>
- <!-- BSTrigFilter log file tests -->
- <test position="3">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_BSTrigFilter_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSTrigFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 625</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>number of events written: 400</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_BSTrigFilter_results.txt</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
-
- <chainElement>
- <jobTransform userJobId="MC15_HIMinBiasSkimming_Legacy_BSOverlayFilter_tf">
- <doc>Trigger Filtering with tar input file</doc>
- <jobTransformJobName>MC15_HIMinBiasSkimming_Legacy_BSOverlayFilter_tf</jobTransformJobName>
- <jobTransformCmd>
- BSOverlayFilter_tf.py --maxEvents 100 --jobNumber 287 --inputBSCONFIGFile /afs/cern.ch/user/a/ahaas/public/overlay/lists/stream0_2015_HI_1.tar.gz --inputFileValidation False --outputBS_SKIMFile HIskim.RAW --outputTAR_CONFIGFile HITAR.tar.gz --HIfiltervtxdirectory /eos/atlas/atlascerngroupdisk/phys-hi/DataOverlay2015
- rm -f *.RAW
- </jobTransformCmd>
- <group>Overlay_JobTransforms</group>
- <queue>long</queue>
- <!-- BSFilter log file tests -->
- <test position="1">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_BSFilter_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.BSFilter</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>Events processed: 100</fileGrepperPattern>
- </fileGrepperSearchPattern>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0: "successful run"</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_BSFilter_results.txt</keepFilePattern>
- </test>
- <!-- BSTrigFilter log file tests -->
- <test position="2">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>fileGrepper_HITARMaker_results.txt</outputFile>
- <testidentifier>SkipFileGrepper</testidentifier>
- <arg>
- <argname>inputFile</argname>
- <argvalue>log.HITARMaker</argvalue>
- </arg>
- <arg>
- <fileGrepperArgs>
- <fileGrepperSearchPattern>
- <fileGrepperPattern>leaving with code 0: "successful run"</fileGrepperPattern>
- </fileGrepperSearchPattern>
- </fileGrepperArgs>
- </arg>
- <keepFilePattern>fileGrepper_HITARMaker_results.txt</keepFilePattern>
- </test>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </chainElement>
- </parallel>
- </sequential>
-
- </chain>
-
- </jobList>
-
-
-
- <jobGroups>
-
-
- <jobGroup name="Overlay_JobTransforms" parent="Transform">
- <keepFilePattern>*</keepFilePattern>
- </jobGroup>
-
-
- </jobGroups>
-
- </rtt>
-</unifiedTestConfiguration>
diff --git a/Event/EventOverlay/OverlayMonitoringRTT/test/test_DataOverlayMC16.sh b/Event/EventOverlay/OverlayMonitoringRTT/test/test_DataOverlayMC16.sh
index ca67374f567063db1a790517189cc88de5e274ed..591f5cf5b4429b707421a5e110d07bd942381c67 100755
--- a/Event/EventOverlay/OverlayMonitoringRTT/test/test_DataOverlayMC16.sh
+++ b/Event/EventOverlay/OverlayMonitoringRTT/test/test_DataOverlayMC16.sh
@@ -39,7 +39,6 @@ Reco_tf.py \
--postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' \
--preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase");rec.doTrigger=False;from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArThinnedDigits.set_Value_and_Lock(False)' \
--ignorePatterns "L1TopoMenuLoader.+ERROR." \
---postExec 'r2e:from LArCellRec.LArCellRecConf import LArCellBuilderFromLArRawChannelTool;LArCellBuilderFromLArRawChannelTool.RawChannelsName="LArRawChannels_FromDigits"' \
--imf False
echo "art-result: $? reco"