diff --git a/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py b/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py index 6db4f8ab4bcd399c9ef4983d0bbd4ec51b2dfd25..28e43e49d3a45451b0987c1580ead7cc4ce2e613 100644 --- a/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py +++ b/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py @@ -1,5 +1,6 @@ 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) diff --git a/Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py b/Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py index aa9aa66da1571e0c044db77b39b4afb43f986b40..cd4fe2c5999e229f9e0d4e26eafc63742d0f8436 100644 --- a/Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py +++ b/Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py @@ -1,5 +1,6 @@ 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) diff --git a/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh b/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh index 75abe15b5b8245f49e8961a619b5f405799e01ac..03eb7c3417b31b8c7fdb90ad55bae50907d64538 100755 --- a/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh +++ b/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" diff --git a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh index 0d4cd79d42e761f0ce7ce209a2dc5bcd66173df3..2cae1a2a38c6325000218b3a599ec9dc2c8fc922 100755 --- a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh +++ b/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" diff --git a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh index bd8d31d55a5560229f12b82bb1444f0bc4ee4fd1..cc4c9338eb8fffd3190e2bbed917539df27c12d6 100755 --- a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh +++ b/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"