Merge branch 'ART' into 'master'

tauRec: use a consistent naming convention for ART

See merge request atlas/athena!37194

Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py

 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input/standalone.ESD.pool.root"]
+athenaCommonFlags.FilesInput = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input/standalone.ESD.pool.root"]
+athenaCommonFlags.PoolAODOutput = "EMPFlow_AOD.pool.root"
 
 from RecExConfig.RecFlags import rec
 rec.doEgamma.set_Value_and_Lock(False)

Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py

 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input/standalone.ESD.pool.root"]
+athenaCommonFlags.FilesInput = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input/standalone.ESD.pool.root"]
+athenaCommonFlags.PoolAODOutput = "LCTopo_AOD.pool.root"
 
 from RecExConfig.RecFlags import rec
 rec.doEgamma.set_Value_and_Lock(False)

Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh

@@ -17,15 +17,15 @@ athena.py --evtMax ${NEVENTS}  tauRec/tau_standalone_EMPFlow_ESDtoAOD.py >> tau_
 echo "art-result: $? Reconstrution"
 
 # compare the AOD file
-art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root AOD.pool.root ${REF_DIR}/EMPFlow_AOD.pool.root >> AOD_diff_root.log 2>&1
+art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root EMPFlow_AOD.pool.root ${REF_DIR}/EMPFlow_AOD.pool.root >> AOD_diff_root.log 2>&1
 echo "art-result: $? diff-root"
 
 # run the physics validation
-Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile AOD.pool.root  --outputNTUP_PHYSVALFile NTUP_PHYSVAL.root
+Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile EMPFlow_AOD.pool.root  --outputNTUP_PHYSVALFile EMPFlow_NTUP_PHYSVAL.root
 echo "art-result: $? PhysVal"
 
 # compare the histograms
-rootcomp.py NTUP_PHYSVAL.root ${REF_DIR}/NTUP_PHYSVAL.root >> rootcomp.log 2>&1
+rootcomp.py EMPFlow_NTUP_PHYSVAL.root ${REF_DIR}/EMPFlow_NTUP_PHYSVAL.root >> rootcomp.log 2>&1
 echo "art-result: $? rootcomp"
 
 # run dcube
@@ -33,6 +33,6 @@ INPUT_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input"
 $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
     --plot --output dcube \
     --config ${INPUT_DIR}/config_mc.xml \
-    --reference ${REF_DIR}/NTUP_PHYSVAL.root \
-    NTUP_PHYSVAL.root
+    --reference ${REF_DIR}/EMPFlow_NTUP_PHYSVAL.root \
+    EMPFlow_NTUP_PHYSVAL.root
 echo "art-result: $? dcube"

Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh

@@ -18,15 +18,15 @@ athena.py --threads 4 --evtMax ${NEVENTS}  tauRec/tau_standalone_LCTopo_ESDtoAOD
 echo "art-result: $? Reconstrution"
 
 # compare the AOD file
-art.py compare ref --entries ${NEVENTS} --mode detailed --excluded-vars=mc_event_number --order-trees --diff-root AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
+art.py compare ref --entries ${NEVENTS} --mode detailed --excluded-vars=mc_event_number --order-trees --diff-root LCTopo_AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
 echo "art-result: $? diff-root"
 
 # run the physics validation
-Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile AOD.pool.root  --outputNTUP_PHYSVALFile NTUP_PHYSVAL.root
+Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile LCTopo_AOD.pool.root  --outputNTUP_PHYSVALFile LCTopo_NTUP_PHYSVAL.root
 echo "art-result: $? PhysVal"
 
 # compare the histograms
-rootcomp.py NTUP_PHYSVAL.root ${REF_DIR}/NTUP_PHYSVAL.root >> rootcomp.log 2>&1
+rootcomp.py LCTopo_NTUP_PHYSVAL.root ${REF_DIR}/LCTopo_NTUP_PHYSVAL.root >> rootcomp.log 2>&1
 echo "art-result: $? rootcomp"
 
 # run dcube
@@ -34,6 +34,6 @@ INPUT_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input"
 $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
     --plot --output dcube \
     --config ${INPUT_DIR}/config_mc.xml \
-    --reference ${REF_DIR}/NTUP_PHYSVAL.root \
-    NTUP_PHYSVAL.root
+    --reference ${REF_DIR}/LCTopo_NTUP_PHYSVAL.root \
+    LCTopo_NTUP_PHYSVAL.root
 echo "art-result: $? dcube"

Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh

@@ -17,15 +17,15 @@ athena.py --evtMax ${NEVENTS}  tauRec/tau_standalone_LCTopo_ESDtoAOD.py >> tau_s
 echo "art-result: $? Reconstrution"
 
 # compare the AOD file
-art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
+art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root LCTopo_AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
 echo "art-result: $? diff-root"
 
 # run the physics validation
-Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile AOD.pool.root  --outputNTUP_PHYSVALFile NTUP_PHYSVAL.root
+Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile LCTopo_AOD.pool.root  --outputNTUP_PHYSVALFile LCTopo_NTUP_PHYSVAL.root
 echo "art-result: $? PhysVal"
 
 # compare the histograms
-rootcomp.py NTUP_PHYSVAL.root ${REF_DIR}/NTUP_PHYSVAL.root >> rootcomp.log 2>&1
+rootcomp.py LCTopo_NTUP_PHYSVAL.root ${REF_DIR}/LCTopo_NTUP_PHYSVAL.root >> rootcomp.log 2>&1
 echo "art-result: $? rootcomp"
 
 # run dcube
@@ -33,6 +33,6 @@ INPUT_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input"
 $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
     --plot --output dcube \
     --config ${INPUT_DIR}/config_mc.xml \
-    --reference ${REF_DIR}/NTUP_PHYSVAL.root \
-    NTUP_PHYSVAL.root
+    --reference ${REF_DIR}/LCTopo_NTUP_PHYSVAL.root \
+    LCTopo_NTUP_PHYSVAL.root
 echo "art-result: $? dcube"