Skip to content
Snippets Groups Projects
Commit 55e64205 authored by Jean-Baptiste De Vivie De Regie's avatar Jean-Baptiste De Vivie De Regie
Browse files

Merge branch 'ART_MP' into '24.0'

Revert IDPVM data + Z' ART tests from MP

See merge request !76383
parents 382ef938 aef7373d
No related branches found
No related tags found
2 merge requests!764202024-12-05: merge of 24.0 into main,!76383Revert IDPVM data + Z' ART tests from MP
Showing
with 115 additions and 221 deletions
......@@ -4,108 +4,69 @@
#
# Steering script for IDPVM ART jobs with Data Reco config
ArtProcess=$1
ArtInFile=$2
dcubeRef=$3
conditions=$4
geotag=$5
dcubeRef=$1
conditions=$2
geotag=$3
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
dcubeShifterXml=${artdata}/InDetPhysValMonitoring/dcube/config/IDPVMPlots_data_baseline.xml
dcubeExpertXml=${artdata}/InDetPhysValMonitoring/dcube/config/IDPVMPlots_data_expert.xml
set -x
echo "ArtProcess: $ArtProcess"
lastref_dir=last_results
script="`basename \"$0\"`"
success_run=0
case $ArtProcess in
"start")
echo "Starting"
echo "List of files = " ${ArtInFile}
;;
"end")
echo "Ending"
if [ ${success_run} -eq 0 ] ;then
echo "download latest result"
art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
ls -la "$lastref_dir"
echo "Merging physval.root"
hadd physval.root art_core_*/physval.ntuple.root
echo "postprocess"
postProcessIDPVMHistos physval.root
echo "compare with fixed reference"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter \
-c ${dcubeShifterXml} \
-r ${dcubeRef} \
physval.root
echo "art-result: $? shifter_plots"
echo "compare with last build"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter_last \
-c ${dcubeShifterXml} \
-r last_results/physval.root \
physval.root
echo "art-result: $? shifter_plots_last"
run() { (set -x; exec "$@") }
if $doExpert ; then
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_expert \
-c ${dcubeExpertXml} \
-r ${dcubeRef} \
physval.root
run Reco_tf.py \
--inputBSFile "$inputBS" \
--maxEvents 1000 \
--autoConfiguration everything \
--conditionsTag "$conditions" \
--geometryVersion "$geotag" \
--outputAODFile physval.AOD.root \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True
rec_tf_exit_code=$?
echo "art-result: $rec_tf_exit_code reco"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_expert_last \
-c ${dcubeExpertXml} \
-r last_results/physval.root \
physval.root
fi
else
echo "reco failed"
fi
;;
*)
echo "Test $ArtProcess"
mkdir "art_core_${ArtProcess}"
cd "art_core_${ArtProcess}"
IFS=',' read -r -a file <<< "${ArtInFile}"
file=${file[${ArtProcess}]}
x="../$file"
echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
unset ATHENA_NUM_PROC
unset ATHENA_PROC_NUMBER
run runIDPVM.py \
--filesInput physval.AOD.root \
--outputFile physval.ntuple.root \
--doHitLevelPlots \
--doExpertPlots
idpvm_tf_exit_code=$?
echo "art-result: $idpvm_tf_exit_code idpvm"
Reco_tf.py \
--inputBSFile $x \
--maxEvents 1000 \
--autoConfiguration everything \
--conditionsTag "$conditions" \
--geometryVersion "$geotag" \
--outputAODFile physval.AOD.root \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True
rec_tf_exit_code=$?
if [ $rec_tf_exit_code -eq 0 ] ;then
echo "download latest result"
run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
run ls -la "$lastref_dir"
echo "art-result: $rec_tf_exit_code reco_${file}"
echo "compare with fixed reference"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter \
-c ${dcubeShifterXml} \
-r ${dcubeRef} \
physval.ntuple.root
echo "art-result: $? shifter_plots"
echo "compare with last build"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter_last \
-c ${dcubeShifterXml} \
-r ${lastref_dir}/physval.ntuple.root \
physval.ntuple.root
echo "art-result: $? shifter_plots_last"
run runIDPVM.py \
--filesInput physval.AOD.root \
--outputFile physval.ntuple.root \
--doHitLevelPlots \
--doExpertPlots
idpvm_tf_exit_code=$?
echo "art-result: $idpvm_tf_exit_code idpvm"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_expert \
-c ${dcubeExpertXml} \
-r ${dcubeRef} \
physval.ntuple.root
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_expert_last \
-c ${dcubeExpertXml} \
-r ${lastref_dir}/physval.ntuple.root \
physval.ntuple.root
if [ $rec_tf_exit_code -ne 0 ] ;then
success_run=$rec_tf_exit_code
fi
ls -lR
;;
esac
fi
......@@ -4,12 +4,10 @@
#
# Steering script for IDPVM ART jobs with Run 2 Data Reco config
ArtProcess=$1
ArtInFile=$2
dcubeRef=$3
dcubeRef=$1
conditions="CONDBR2-BLKPA-RUN2-11"
geotag="ATLAS-R2-2016-01-00-01"
script=test_data_reco.sh
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef} ${conditions} ${geotag}
"$script" ${dcubeRef} ${conditions} ${geotag}
#!/bin/bash
# art-description: Standard test for 2015 data
# art-type: grid
# art-input: data15_13TeV:data15_13TeV.00283429.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.65"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data15_13TeV.00283429.physics_Main.daq.RAW._lb0154._SFO-1._0001.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data15_13TeV_1000evt.root
......@@ -27,4 +24,4 @@ script=test_data_reco_Run2.sh
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef}
"$script" ${inputBS} ${dcubeRef}
#!/bin/bash
# art-description: Standard test for 2016 data
# art-type: grid
# art-input: data16_13TeV:data16_13TeV.00310809.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.65"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data16_13TeV.00310809.physics_Main.daq.RAW._lb1219._SFO-2._0001.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data16_13TeV_1000evt.root
......@@ -27,4 +24,4 @@ script=test_data_reco_Run2.sh
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef}
"$script" ${inputBS} ${dcubeRef}
#!/bin/bash
# art-description: Standard test for 2017 data
# art-type: grid
# art-input: data17_13TeV:data17_13TeV.00324910.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.65"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data17_13TeV.00324910.physics_Main.daq.RAW._lb0713._SFO-6._0001.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data17_13TeV_1000evt.root
......@@ -27,4 +24,4 @@ script=test_data_reco_Run2.sh
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef}
"$script" ${inputBS} ${dcubeRef}
#!/bin/bash
# art-description: Standard test for 2018 data
# art-type: grid
# art-input: data18_13TeV:data18_13TeV.00348885.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.65"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data18_13TeV_1000evt.root
......@@ -27,4 +24,4 @@ script=test_data_reco_Run2.sh
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef}
"$script" ${inputBS} ${dcubeRef}
#!/bin/bash
# art-description: Standard test for 2022 data
# art-type: grid
# art-input: data22_13p6TeV:data22_13p6TeV.00430536.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.67"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data22_13p6TeV/data22_13p6TeV.00430536.physics_Main.daq.RAW/data22_13p6TeV.00430536.physics_Main.daq.RAW._lb1015._SFO-20._0001.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data22_13p6TeV_1000evt.root
script=test_data_reco.sh
......@@ -29,4 +26,4 @@ geotag="ATLAS-R3S-2021-03-02-00"
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef} ${conditions} ${geotag}
"$script" ${inputBS} ${dcubeRef} ${conditions} ${geotag}
#!/bin/bash
# art-description: Standard test for 2023 data
# art-type: grid
# art-input: data23_13p6TeV:data23_13p6TeV.00452463.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.67"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/CampaignInputs/data23/RAW/data23_13p6TeV.00452463.physics_Main.daq.RAW/540events.data23_13p6TeV.00452463.physics_Main.daq.RAW._lb0514._SFO-16._0004.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data23_13p6TeV_1000evt.root
script=test_data_reco.sh
......@@ -29,4 +26,4 @@ geotag="ATLAS-R3S-2021-03-02-00"
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef} ${conditions} ${geotag}
"$script" ${inputBS} ${dcubeRef} ${conditions} ${geotag}
#!/bin/bash
# art-description: Standard test for 2024 data
# art-type: grid
# art-input: data24_13p6TeV:data24_13p6TeV.00484909.physics_Main.daq.RAW
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_shifter_last
......@@ -20,6 +16,7 @@ run() { (set -x; exec "$@") }
relname="r24.0.67"
artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
inputBS=${artdata}/RecJobTransformTests/data24_13p6TeV.00484909.physics_Main.daq.RAW/data24_13p6TeV.00484909.physics_Main.daq.RAW._lb0098._SFO-16._0001.data
dcubeRef=${artdata}/InDetPhysValMonitoring/ReferenceHistograms/${relname}/physval_data24_13p6TeV_1000evt.root
script=test_data_reco.sh
......@@ -29,4 +26,4 @@ geotag="ATLAS-R3S-2021-03-02-00"
echo "Executing script ${script}"
echo " "
"$script" ${ArtProcess} ${ArtInFile} ${dcubeRef} ${conditions} ${geotag}
"$script" ${inputBS} ${dcubeRef} ${conditions} ${geotag}
......@@ -2,14 +2,12 @@
# art-description: Standard test for MC23a zprime for IDTIDE
# art-input: mc23_13p6TeV:mc23_13p6TeV.801271.Py8EG_A14NNPDF23LO_flatpT_Zprime.merge.HITS.e8514_e8528_s4159_s4114
# art-input-nfiles: 1
# art-cores: 4
# art-memory: 4096
# art-type: grid
# art-include: main/Athena
# art-include: 24.0/Athena
# art-output: physval*.root
# art-output: *.xml
# art-output: art_core_0
# art-output: dcube*
# art-html: dcube_idtide_last
......@@ -26,95 +24,53 @@ idtide=DAOD_TIDE.pool.root
conditionsTag=OFLCOND-MC23-SDR-RUN3-07
set -x
# Digi for MC23d HITS inputs
run Digi_tf.py \
--conditionsTag default:$conditionsTag \
--digiSeedOffset1 100 --digiSeedOffset2 100 \
--inputHITSFile=${ArtInFile} \
--maxEvents -1 \
--outputRDOFile $rdo \
--preInclude 'HITtoRDO:Campaigns.MC23dNoPileUp' \
--preInclude 'HITtoRDO:Campaigns.MC23NoPileUp' \
--postInclude 'PyJobTransforms.UseFrontier'
echo "art-result: $? digi"
echo "ArtProcess: $ArtProcess"
lastref_dir=last_results
script="`basename \"$0\"`"
success_run=0
case $ArtProcess in
"start")
echo "Starting"
echo "List of files = " ${ArtInFile}
;;
"end")
echo "Ending"
if [ ${success_run} -eq 0 ] ;then
echo "download latest result"
art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
ls -la "$lastref_dir"
echo "Merging physval.root"
hadd physval.root art_core_*/physval.ntuple.root
echo "postprocess"
postProcessIDPVMHistos physval.root
echo "compare with fixed reference"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter \
-c ${dcubeXml} \
-r ${dcubeRef} \
physval.root
echo "art-result: $? shifter_plots"
echo "compare with last build"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_shifter_last \
-c ${dcubeXml} \
-r last_results/physval.root \
physval.root
echo "art-result: $? shifter_plots_last"
else
echo "reco failed"
fi
;;
*)
echo "Test $ArtProcess"
mkdir "art_core_${ArtProcess}"
cd "art_core_${ArtProcess}"
IFS=',' read -r -a file <<< "${ArtInFile}"
file=${file[${ArtProcess}]}
x="../$file"
echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
unset ATHENA_NUM_PROC
unset ATHENA_PROC_NUMBER
# Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
run Reco_tf.py \
--inputRDOFile $rdo \
--outputAODFile $aod \
--outputDAOD_IDTIDEFile $idtide \
--conditionsTag default:$conditionsTag \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
--maxEvents -1
rec_tf_exit_code=$?
echo "art-result: $rec_tf_exit_code reco"
# Digi for MC23d HITS inputs
Digi_tf.py \
--conditionsTag default:$conditionsTag \
--digiSeedOffset1 100 --digiSeedOffset2 100 \
--inputHITSFile=${ArtInFile} \
--maxEvents -1 \
--outputRDOFile $rdo \
--preInclude 'HITtoRDO:Campaigns.MC23dNoPileUp' \
--postInclude 'PyJobTransforms.UseFrontier'
echo "art-result: $? digi"
if [ $rec_tf_exit_code -eq 0 ] ;then
#run IDPVM for IDTIDE derivation
run runIDPVM.py --doIDTIDE --doTracksInJets --doTracksInBJets --filesInput $idtide --outputFile physval_idtide.ntuple.root
# Reco
Reco_tf.py \
--inputRDOFile $rdo \
--outputAODFile $aod \
--outputDAOD_IDTIDEFile $idtide \
--conditionsTag default:$conditionsTag \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
--maxEvents -1
rec_tf_exit_code=$?
echo "art-result: $rec_tf_exit_code reco"
echo "download latest result"
run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
run ls -la "$lastref_dir"
#run IDPVM for IDTIDE derivation
run runIDPVM.py \
--doIDTIDE --doTracksInJets --doTracksInBJets \
--filesInput $idtide \
--outputFile physval.ntuple.root
idpvm_tf_exit_code=$?
echo "art-result: $idpvm_tf_exit_code idpvm"
echo "compare with fixed reference"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_idtide \
-c ${dcubeXml_idtide} \
-r ${dcubeRef_idtide} \
physval_idtide.ntuple.root
echo "art-result: $? shifter_plots_idtide"
echo "compare with last build"
$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
-p -x dcube_idtide_last \
-c ${dcubeXml_idtide} \
-r ${lastref_dir}/physval_idtide.ntuple.root \
physval_idtide.ntuple.root
echo "art-result: $? shifter_plots_idtide_last"
if [ $rec_tf_exit_code -ne 0 ] ;then
success_run=$rec_tf_exit_code
fi
ls -lR
;;
esac
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment