Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Merge requests
!76383
Revert IDPVM data + Z' ART tests from MP
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Revert IDPVM data + Z' ART tests from MP
tstreble/athena:ART_MP
into
24.0
Overview
3
Commits
1
Pipelines
1
Changes
10
Merged
Thomas Strebler
requested to merge
tstreble/athena:ART_MP
into
24.0
2 months ago
Overview
3
Commits
1
Pipelines
1
Changes
10
Expand
Not running in MP, so giving up...
FYI
@pagessin
0
0
Merge request reports
Compare
24.0
24.0 (base)
and
latest version
latest version
9340c5d5
1 commit,
2 months ago
10 files
+
115
−
221
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
10
Search (e.g. *.vue) (Ctrl+P)
InnerDetector/InDetValidation/InDetPhysValMonitoring/share/test_data_reco.sh
+
54
−
93
Options
@@ -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
Loading