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
!68367
Remove Legacy configuration jobs from ISF_ValidationMT ART tests
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Remove Legacy configuration jobs from ISF_ValidationMT ART tests
jchapman/athena:DropLegacyISF_ValidationMT_main
into
main
Overview
4
Commits
1
Pipelines
1
Changes
23
Merged
John Derek Chapman
requested to merge
jchapman/athena:DropLegacyISF_ValidationMT_main
into
main
1 year ago
Overview
4
Commits
1
Pipelines
1
Changes
23
Expand
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
60bde927
1 commit,
1 year ago
23 files
+
147
−
1268
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
23
Search (e.g. *.vue) (Ctrl+P)
Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh
+
9
−
54
Options
@@ -20,10 +20,11 @@ then
echo
"skipping initial-simOLD step"
else
Sim_tf.py
\
--CA
\
--conditionsTag
'default:OFLCOND-MC16-SDR-14'
\
--simulator
'FullG4'
\
--postInclude
'default:PyJobTransforms
/
UseFrontier
.py
'
\
--preInclude
'EVNTtoHITS:Campaigns
/
MC16SimulationSingleIoV
.py
'
\
--simulator
'FullG4
MT
'
\
--postInclude
'default:PyJobTransforms
.
UseFrontier'
\
--preInclude
'EVNTtoHITS:Campaigns
.
MC16SimulationSingleIoV'
\
--geometryVersion
'default:ATLAS-R2-2016-01-00-01'
\
--inputEVNTFile
$INPUTEVNTFILE
\
--outputHITSFile
"original.HITS.pool.root"
\
@@ -59,63 +60,17 @@ fi
echo
"art-result:
$rc1
resimCA"
rc2
=
-9999
if
[
$rc
-eq
0
]
then
ReSim_tf.py
\
--conditionsTag
'ReSim:OFLCOND-MC16-SDR-14'
\
--simulator
'FullG4MT_QS'
\
--postInclude
'ReSim:PyJobTransforms/UseFrontier.py'
\
--preInclude
'ReSim:Campaigns/MC16SimulationNoIoV.py'
\
--geometryVersion
'ReSim:ATLAS-R2-2016-01-00-01'
\
--inputHITSFile
"original.HITS.pool.root"
\
--outputHITS_RSMFile
"resim.CA.HITS.pool.root"
\
--maxEvents
$MAXEVENTS
\
--imf
False
\
--athenaopts
'"--config-only=ConfigSimCG.pkl"'
ReSim_tf.py
\
--conditionsTag
'ReSim:OFLCOND-MC16-SDR-14'
\
--simulator
'FullG4MT_QS'
\
--postInclude
'ReSim:PyJobTransforms/UseFrontier.py'
\
--preInclude
'ReSim:Campaigns/MC16SimulationNoIoV.py'
\
--geometryVersion
'ReSim:ATLAS-R2-2016-01-00-01'
\
--inputHITSFile
"original.HITS.pool.root"
\
--outputHITS_RSMFile
"resim.CG.HITS.pool.root"
\
--maxEvents
$MAXEVENTS
\
--imf
False
rc2
=
$?
status
=
$rc2
mv
log.ReSim log.ReSim.CG
fi
echo
"art-result:
$rc2
resimOLD"
rc3
=
-9999
if
[
$status
-eq
0
]
then
# Compare the outputs
acmd.py diff-root resim.CG.HITS.pool.root resim.CA.HITS.pool.root
\
--error-mode
resilient
\
--mode
semi-detailed
\
--order-trees
rc3
=
$?
status
=
$rc3
fi
echo
"art-result:
$rc3
OLDvsCA"
rc4
=
-9999
if
[
$rc2
-eq
0
]
if
[
$rc1
-eq
0
]
then
ArtPackage
=
$1
ArtJobName
=
$2
art.py compare grid
--entries
10
${
ArtPackage
}
${
ArtJobName
}
--order-trees
--mode
=
semi-detailed
--diff-root
--file
=
resim.C
G
.HITS.pool.root
rc
4
=
$?
art.py compare grid
--entries
10
${
ArtPackage
}
${
ArtJobName
}
--order-trees
--mode
=
semi-detailed
--diff-root
--file
=
resim.C
A
.HITS.pool.root
rc
2
=
$?
if
[
$status
-eq
0
]
then
status
=
$rc
4
status
=
$rc
2
fi
fi
echo
"art-result:
$rc
4
regression"
echo
"art-result:
$rc
2
regression"
exit
$status
Loading