Commits · f420a8cdc6dd0d760e11c52b2a282ed93c0ad898 · Lawrence Davou Christopher / athena

Feb 19, 2019

Merge branch 'master-fix-physval' into 'master' · f420a8cd

Vakhtang Tsulaia authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Additional fixes for ATLASDQ-508

See merge request atlas/athena!21226

(cherry picked from commit c74bf0bc)

8ce913e8 Additional fixes for ATLASDQ-508

f420a8cd

Feb 08, 2019
- Update TrugAnalysisTest ART tests · 6d71948f
  Julie Kirk authored 6 years ago
  
  Change name of regtest file to copy.
  6d71948f
Feb 04, 2019
- Fix name of the test mc_pp_v7_rdotoaodslim_build · 67aab17d
  Joerg Stelzer authored 6 years ago and John Kenneth Anders committed 6 years ago
  
  67aab17d
Jan 25, 2019
- 21.0 fix nightly test2 · 30be36a9
  Joerg Stelzer authored 6 years ago and John Kenneth Anders committed 6 years ago
  
  30be36a9
Jan 23, 2019

Merge branch 'master-RunTier0Tests-CI-Reference-File-Versioning' into 'master' · 8f493c89

Vakhtang Tsulaia authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Start versioning the CI reference files for the RunTier0Tests

See merge request atlas/athena!20514

(cherry picked from commit 7c40e9d8)

5bbd088e Start versioning the CI reference files for the RunTier0Tests

8f493c89

Jan 15, 2019

Merge branch 'update_art_include_TriggerTest' into '21.3' · 1d6b38fa

John Derek Chapman authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Update art-include in TriggerTest

See merge request atlas/athena!20318

(cherry picked from commit c528a8c8)

bf1f74f1 Update art-include in TriggerTest

1d6b38fa

Merge branch 'TriggerTest_run_on_data' into '21.3' · 98df890e

John Derek Chapman authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

TriggerTest: add a few tests running on data

See merge request atlas/athena!20324

(cherry picked from commit 41ed6324)

d1927fae TriggerTest: add a few tests running on data

98df890e

Jan 12, 2019

Remove non-existing input file from HI build test · 67246961

Joerg Stelzer authored 6 years ago

The first file used by the test test_physics_hi_v5_build
disappeared for some reason from the filesystem and the
dataset does not exist any longer. Use only the two
remaining files (ATR-19210)

67246961

Dec 26, 2018

Merge branch 'trig_art_result_parser' into 'master' · 3718eeb4

Walter Lampl authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Add script to summarise results of locally-ran trigger ART tests

See merge request atlas/athena!20078

(cherry picked from commit 3e3553f5)

0a11e065 add trig-art-result-parser.sh

3718eeb4

Dec 18, 2018
- Enable xAOD::EventInfo deep copy when needed · b2b262c4
  Tadej Novak authored 6 years ago
  
  b2b262c4
Dec 17, 2018

Fix file permissions of identical files · bd8610f1

Walter Lampl authored 6 years ago

Files with identical content (same SHA1) but different file permissions
cause confusing differences shown in GitLab. The file permissions of
68 files were set to 644 (ATLINFR-2011).

bd8610f1

Dec 13, 2018

Fixed the bug addressed in Jira ticket FTKSIM-94... · 9f656978

Yumeng Cao authored 6 years ago

Fixed the bug addressed in Jira ticket FTKSIM-94 (https://its.cern.ch/jira/browse/FTKSIM-94). Fixed other firmware-like code compatibility issues in FTKSIM. Added comments on some lines. Also changed some print statements to FTKSetup::PrintMessage.


Former-commit-id: 2b6f6f1edca4303c792a5cef241b7faddaf620fd

9f656978

Dec 12, 2018

Merge branch '21.3-ftk' into '21.3' · 299979b3

John Derek Chapman authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Add FTK analyses for the PhysValMonitoring

See merge request atlas/athena!16492

(cherry picked from commit b4381f5c [formerly 06a9650b42d9a13b797b6489f5f757e5490de078])

03dd5292 Add FTK analyses for the PhysValMonitoring

Former-commit-id: dbb0cb56b09f8e0b1a2e342f0d6b32f876e9234d

299979b3

Merge branch '21.3-fix-ftk-ds' into '21.3' · 3e868287

John Derek Chapman authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Replace the datasets for the FTK tests

See merge request atlas/athena!16575

(cherry picked from commit 26d01947 [formerly ae0407e8ca3a71275f95a277fb7c25af711266d4])

1ec09e30 Replace the datasets for the FTK tests

Former-commit-id: fb4dd67ebf80746e57c90fd4606ed58d4c2b885e

3e868287

Dec 06, 2018

@rbielski : cherry-pick d76ede91 into merge_21.1_into_21.0 · 0f0753d6

John Kenneth Anders authored 6 years ago and

Rafal Bielski committed 6 years ago

Conflicts resolved:
Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingET.cxx
Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersTracksPUC.cxx
Trigger/TrigAlgorithms/TrigEFMissingET/src/components/TrigEFMissingET_entries.cxx
Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py

Commit d76ede91 (MR !15117) was a sweep of code from 21.1 to 21.0 plus some whitespace and copyright changes. The code was already included in merge_21.1_into_21.0, thus the conflicts were only whitespace or code duplication

Former-commit-id: a44cdffc6d1f2fc432cc3ea33c0a78636cae3653

0f0753d6

Nov 29, 2018
- Fix output name for regtest file in TriggerTest ART · fe94c19a
  Julie Kirk authored 6 years ago
  
  Former-commit-id: f00550c7dd3039c93b60a48c4099f29684a5b9ae
  fe94c19a
Nov 28, 2018
- TrigP1Test: fix for PS test (ATR-16799) · 98405393
  Daniele Zanzi authored 6 years ago
  
  Former-commit-id: 8dc2157963414e611a289b923204ee62d1d2e81e
  98405393
- Revert "Merge branch 'TM_ATR-19034' into '21.1'" · 319d98f1
  Rafal Bielski authored 6 years ago
  
  This reverts merge request !16136 Former-commit-id: 246be50b29dc17c6f2f3175a69b9e29b97c86f12
  319d98f1
- Compare triggers across types as subset of legs · b78fc6f5
  Javier Montejo authored 6 years ago
  
  Former-commit-id: 70eb52fa464cd48b2682911dc904d45a793f43e0
  b78fc6f5
- Fix for trigger ART tests · 40991d00
  Julie Kirk authored 6 years ago
  
  Former-commit-id: 8a01e977ed9a57dfb59cade09db89ca260a68eb6
  40991d00
Nov 26, 2018

updates for Trigger ART tests · f1d3d7af

Julie Kirk authored 6 years ago

change error return code when reference is missing

change art-output file from *.regtest to *.regtest.new files


Former-commit-id: ef9ce1d9d639f5d431e3243633035eca6eabb440

f1d3d7af

Do a proper Tile TTL1 overlay · 701242e0
Tadej Novak authored 6 years ago
```
Former-commit-id: 6f30ce731fbd889037392c76a6857c3cf2cc9e63
```
701242e0
TrigP1Test: fix in PS test (ATR-16799) · 79419c5e
Daniele Zanzi authored 6 years ago
```
Former-commit-id: 39f00ec93b1bb406756fd581aefabc4d6b62682c
```
79419c5e

Nov 25, 2018

Merge branch 'UpdatedEnhancedSlice22Config' into '21.0' · e311135e

James Beacham authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Updated enhanced slice22 config

See merge request atlas/athena!16079

(cherry picked from commit 4dc2fc32 [formerly dd49a2dfdc6fbc69094cad17917f145177e5c638])

973ac77d do not hard-code value of inputNTUP_FTKIPFile
2207785c set FTKRegionalWrapper EmulateDF = True
08a87ba5 re-order ROD list to match the one in FTKSIM-107

Former-commit-id: c7c24e548858d510897444a6c07c94abc1dfa812

e311135e

Nov 24, 2018

Adding LbL supporting trigger (ATR-18401) · 431b123b

Martin Rybar authored 6 years ago

- adding HLT_mb_sptrk_exclusiveloose2_L12TAU1_VTE50
- all test are OK


Former-commit-id: 4947df790a358694c84b6341f6f9da0e277a99ee

431b123b

TrigP1Test: fix for ART PS test (ATR-16799) · 3268bf70
Daniele Zanzi authored 6 years ago
```
Former-commit-id: 83e289289278514b09c3e9d87b6fa77b90d1c6e7
```
3268bf70

Nov 23, 2018

updates for Trigger ART tests · 397b50fc

Julie Kirk authored 6 years ago

- change error return when reference missing
- change art-output file from *.regtest to  *.regtest.new files


Former-commit-id: 1b907642607ba39445fc3e2fc09d4b502437cd55

397b50fc

Merge branch 'check_ART-ref' into '21.1' · 32f1f0ba

Andrea Coccaro authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Add art-result code when references are missing

See merge request atlas/athena!16122

(cherry picked from commit dae0c666 [formerly 6b715a6c9242ad95d616b20c678d2910e60a3e26])

2f5499ec Add art-result when references are missing
8330d17c  Add art-result when references are missing

Former-commit-id: b3c8460e5c2c9d32dfb78aec7fd4dee9a2d0f592

32f1f0ba

Merge branch 'TM_ATR-19034' into '21.1' · a6e98b11

Andrea Coccaro authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

ATR-19034: remove j35_boffperf_split from perf list

See merge request atlas/athena!16136

(cherry picked from commit b7546440 [formerly 8b4cdc3806560351a5898fc2b243be379752dd9f])

f4cf13eb ATR-19034: remove j35_boffperf_split from perf list

Former-commit-id: 4b6044719db0212dc19e4ac7ffcfb411dfe4d3a6

a6e98b11

Nov 22, 2018

TrigP1Test: fix for PS test (ATR-16799 · 0e4fa87c
Daniele Zanzi authored 6 years ago and Andrea Coccaro committed 6 years ago
```
Former-commit-id: 17c6701f41cf921ee2bd154c05aed06bc59c6a54
```
0e4fa87c

Merge branch '21.1-dev-user' into '21.1-dev' · d37b419f

Andrea Coccaro authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Remove unused variable

See merge request atlas/athena!16057

(cherry picked from commit ca288d08 [formerly 62a4a56ed039f05419d1e805579217c3c5e3a206])

ebece441 Remove unused variable

Former-commit-id: 8ca430c01a823c2179e1a8a1df585cbeeb8d0670

d37b419f

Merge branch '21.1-dev-user' into '21.1-dev' · 198dbc21

Andrea Coccaro authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Remove unused variable

See merge request atlas/athena!16057

(cherry picked from commit ca288d08 [formerly 62a4a56ed039f05419d1e805579217c3c5e3a206])

ebece441 Remove unused variable

Former-commit-id: 26ea25b5370e51c9cb3f78c7a5baf9ccf2f9f87e

198dbc21

Nov 21, 2018

ATR-19034: remove j35_boffperf_split from perf list · d254777e
Lidija Zivkovic authored 6 years ago
```
Former-commit-id: f4cf13eb9ae8eb54407c810cca906c1685b8f198
```
d254777e

Add art-result when references are missing · 44bb82cb

Julie Kirk authored 6 years ago

Currently we don't notice when there are missing reference files for the Trigger ART tests.
This change will return an error via art-result if the reference is missing

modified: Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh

Former-commit-id: 8330d17cde7a4bf4e8cb7b1ef4f9fefb683e14e6

44bb82cb

Add art-result when references are missing · 54f92fe5

Julie Kirk authored 6 years ago

Currently we don't notice when there are missing reference files for the Trigger ART tests.
This change will return an error via art-result

modified: Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh

Former-commit-id: 2f5499ecb7c77378ec442b580b839c85293788f7

54f92fe5

Updates to ART tests - add regtest files to output · 1128d99e

Julie Kirk authored 6 years ago

Update to trigger ART tests so that the file athena.regtest is copied to the output directory. This is needed for updating references and debugging problems Effectively a CP of MR!16070 to master (automatic CP failed)

modified: Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_bulkmcprod_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_cpsampleprod_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_tight_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_aod_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_chainorder_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_tight_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_aod_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
modified: Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh

Former-commit-id: 62438c21149eededd20e23c4b527f97b88f7710e

1128d99e

Merge branch 'trigger-ART-fix' into '21.1' · 6ba214a5

Julie Kirk authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Fix to rootcomp.py command in trigger ART tests

See merge request atlas/athena!16092

(cherry picked from commit 2fa8ae3e [formerly a2b5ebd3161fefcdbbee6371a118fe1f7406afec])

6722f176 Fix to rootcomp command in trigger ART tests

Former-commit-id: 5d8a807cecf9bf6395f1d5bf27212082ce935bc8

6ba214a5

Merge branch 'overlay/CI-settings' into 'master' · 8d0cf106

Walter Lampl authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Update Overlay Tier-0 test AMI tag

See merge request atlas/athena!16059

(cherry picked from commit e6f78f01 [formerly 7234d719])

1739916d Update Overlay Tier-0 test AMI tag

Former-commit-id: 20afcec8aedd6cbb953eea0245891d8ff3a2e420

8d0cf106

Nov 20, 2018

Fix to rootcomp command in trigger ART tests · 5447e764

Julie Kirk authored 6 years ago

	modified:   Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh


Former-commit-id: 6722f1769daa69c6e0f52b56b94f6981a19725a5

5447e764

Merge branch '21.2_api' into '21.2' · 27ffcf0c

Nils Erik Krumnack authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Update Trigger API to full run-2 GRL

See merge request atlas/athena!15853

(cherry picked from commit a19bdc52 [formerly bafd0332d4b40fdbe10f0a6f0d5ec28d1dd4269f])

7ed8c5a9 Update Trigger API to full run-2 GRL

Former-commit-id: 9ed28933e8476b4845851ab30fe25a78e8c7b26d

27ffcf0c