Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
176
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
!57279
2022-10-05: daily merge of 22.0 into master
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
2022-10-05: daily merge of 22.0 into master
fwinkl/athena:sweep_22.0_master_2022-10-05
into
master
Overview
8
Commits
48
Pipelines
1
Changes
92
All threads resolved!
Hide all comments
Merged
Frank Winklmeier
requested to merge
fwinkl/athena:sweep_22.0_master_2022-10-05
into
master
2 years ago
Overview
8
Commits
48
Pipelines
1
Changes
92
All threads resolved!
Hide all comments
Expand
Conflicts in ITk CA config from
!57192 (merged)
resolved by taking 22.0 version
Edited
2 years ago
by
Frank Winklmeier
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
256ef3ec
48 commits,
2 years ago
92 files
+
6600
−
1568
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
92
Search (e.g. *.vue) (Ctrl+P)
AtlasTest/CITest/Athena.cmake
+
0
−
15
Options
@@ -190,18 +190,3 @@ atlas_add_citest( Trigger_athenaHLT_v1PhysP1
atlas_add_citest
(
Trigger_athenaHLT_v1Cosmic
SCRIPT test_trigP1_v1Cosmic_build.py
)
# TODO: We stop here for now (migration ongoing...)
return
()
#################################################################################
# Digitization/Simulation
#################################################################################
atlas_add_citest
(
MuonDigiReco_digi
SCRIPT Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/Run3/HITS/AsymmetricLayout_HITS_v2.root --imf False --outputRDOFile OUT_RDO.root --conditionsTag OFLCOND-MC16-SDR-RUN3-02
)
atlas_add_citest
(
MuonDigiReco_reco
SCRIPT Reco_tf.py --inputRDOFile ../MuonDigiReco_digi/OUT_RDO.root --autoConfiguration everything --imf False --outputESDFile OUT_ESD.root
DEPENDS_SUCCESS MuonDigiReco_digi
POST_EXEC_SCRIPT
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/checkMuonDigiReco.sh
)
Loading