From 4546234beab702893730a3643ef111a96b6783a9 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Tue, 11 Jun 2019 17:56:07 +0200
Subject: [PATCH 1/2] Install SimuJobTransforms art scripts, so that they are
 easily accessible

---
 Simulation/SimuJobTransforms/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simulation/SimuJobTransforms/CMakeLists.txt b/Simulation/SimuJobTransforms/CMakeLists.txt
index 9054a395527..74274ea82ca 100644
--- a/Simulation/SimuJobTransforms/CMakeLists.txt
+++ b/Simulation/SimuJobTransforms/CMakeLists.txt
@@ -16,5 +16,5 @@ find_package( PythonLibs )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( scripts/*.py )
-atlas_install_scripts( scripts/*.sh )
+atlas_install_scripts( scripts/*.sh test/*.sh )
 
-- 
GitLab


From 9314ffd436ee49d730a17b8e52b7e68d5c892a43 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Tue, 11 Jun 2019 18:00:54 +0200
Subject: [PATCH 2/2] Rather than merging two copies of the same file, simulate
 two HITS files in test_diffmerged

In `test_diffmerged.sh` we were creating a HITS file, then copying it using `mergePOOL`
then merging the original and the copy into a new HITS file. This no longer works in
master, so have switched to running two simulation jobs instead.

Should fix ATLASSIM-4198.
---
 .../SimuJobTransforms/test/test_diffmerged.sh | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/Simulation/SimuJobTransforms/test/test_diffmerged.sh b/Simulation/SimuJobTransforms/test/test_diffmerged.sh
index 0d0fe135d4d..fd788139550 100755
--- a/Simulation/SimuJobTransforms/test/test_diffmerged.sh
+++ b/Simulation/SimuJobTransforms/test/test_diffmerged.sh
@@ -24,6 +24,21 @@ AtlasG4_tf.py \
 --DataRunNumber 222525
 
 echo  "art-result: $? simulation"
+cp log.AtlasG4Tf log.AtlasG4Tf1
+
+AtlasG4_tf.py \
+--inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root \
+--outputHITSFile mu_E200_eta0-25_${GEOMETRY}.2.HITS.pool.root \
+--maxEvents 5 \
+--skipEvents 5 \
+--geometryVersion ${GEOMETRY} \
+--physicsList 'FTFP_BERT_ATL' \
+--preInclude 'SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+--conditionsTag OFLCOND-RUN12-SDR-30 \
+--DataRunNumber 222525
+
+echo  "art-result: $? simulation2"
+cp log.AtlasG4Tf log.AtlasG4Tf2
 
 INPUTFILE=mu_E200_eta0-25_${GEOMETRY}.HITS.pool.root
 FILENAME=`basename ${INPUTFILE}`
@@ -31,20 +46,13 @@ FILEBASE=${FILENAME%.HITS.pool.root}
 INPUTFILE2=${FILEBASE}.2.HITS.pool.root
 RDOFILE1=${FILEBASE}.unmerged.RDO.pool.root
 RDOFILE2=${FILEBASE}.merged.RDO.pool.root
-# Copy the file.  We can't use cp here, since we need the copy to get
-# a new GUID.  Otherwise, we'll get errors about duplicate GUIDs
-# in the file catalog.
-mergePOOL -o $INPUTFILE2 -i $INPUTFILE
 
-echo  "art-result: $? copyHITS"
 
 INPUTLIST=$INPUTFILE,$INPUTFILE2
 MERGEHITSFILE=${FILEBASE}.merged.HITS.pool.root
 echo $INPUTLIST
 
-## TODO: Temporary hack until log files are found!
-cp log.AtlasG4Tf log.AtlasG4Tf2
-INPUTLOGLIST=log.AtlasG4Tf,log.AtlasG4Tf2
+INPUTLOGLIST=log.AtlasG4Tf1,log.AtlasG4Tf2
 
 HITSMerge_tf.py \
 --inputHITSFile "$INPUTLIST" \
-- 
GitLab