Commits · nightly/21.0-TrigMC/2018-11-05T2139 · Jonathan Bossio / athena

Nov 01, 2018
- Merge branch 'TrigMC-fix-dphi-cut-in-LbyL-noise-hypo' into '21.0-TrigMC' · ad6eaa0b
  Pedro Teixeira-Dias authored 6 years ago
  
  fix dphi issue See merge request atlas/athena!15506 Former-commit-id: 9604d4c96c71f690b38db038b48c595dee58d336
  7 tags
  
  ad6eaa0b
Oct 31, 2018

fix dphi issue · 789c29f7
Tomasz Bold authored 6 years ago
```
Former-commit-id: ed090d30169ea4250b0fb047b8b414a77c48e1c1
```
789c29f7

Merge branch 'cherry-pick- [formerly eb805fde44]-21.0-TrigMC' into '21.0-TrigMC' · bcef5aa8

Pedro Teixeira-Dias authored 6 years ago

Sweeping !15339 from 21.0 to 21.0-TrigMC.
Add art include in head of test files RecJobTransformTests and RecExRecoTest

See merge request atlas/athena!15469

Former-commit-id: d68b50dff88d4e6fdc8aec8032bbee5b4d5fc93a

bcef5aa8

Merge branch 'add-arthead' into '21.0' · 749ee6da

James Beacham authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Add art include in head of test files RecJobTransformTests and RecExRecoTest

See merge request atlas/athena!15339

(cherry picked from commit f76694fc [formerly eb805fde445ee2d227616623b69d85a55db94a8e])

9ff8d0e2 add art include in head RecJobTransformTests
d250335d add art head and new tests from master in RecExRecoTest
31ad6d75 minor updates in recjobtrasnformtests

Former-commit-id: 7076398f5262a45cb864c71bc0d96603e0fd3fba

749ee6da

Oct 26, 2018

Merge branch 'patch-75' into '21.0-TrigMC' · cf7960b3

Pedro Teixeira-Dias authored 6 years ago

Update version.txt: new release candidate number (21.5.11)

See merge request atlas/athena!15386

Former-commit-id: 6e1cb6541ce1147f9f4ac9cbb901d7255c0cb4b3

cf7960b3

Update version.txt: new release candidate number (21.5.11) · 049235cf
Pedro Teixeira-Dias authored 6 years ago
```
Former-commit-id: bf90f6c62e538436373055a662480edf7e368ab1
```
049235cf

Oct 25, 2018

Merge branch 'update_TrigMC_to_21.0.85' into '21.0-TrigMC' · f9627836

Pedro Teixeira-Dias authored 6 years ago

Merge release/21.0.85 into 21.0-TrigMC

See merge request atlas/athena!15317

Former-commit-id: d7185a85022d9399c6d8f6ccd7afbdeaf9c9384b

f9627836

Oct 24, 2018

Merge tag 'release/21.0.85' into update_TrigMC_to_21.0.85 · 0ed89727

Rafal Bielski authored 6 years ago

Conflicts resolved:
* Projects/Athena/version.txt -> keeping the one from 21.0-TrigMC
* Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py -> accepting the version from 21.0
* Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py -> accepting the version from 21.0


Former-commit-id: e80b30cbc0571c0f07dc430539acf5213fc98c36

0ed89727

Oct 23, 2018

Merge branch 'updateTrigMC_to_21.1_2018-10-21' into '21.0-TrigMC' · 97645cdc

Pedro Teixeira-Dias authored 6 years ago

Merge nightly/21.1/2018-10-21T2147 into 21.0-TrigMC

See merge request atlas/athena!15232

Former-commit-id: fb4fe71df2dd6967fd375a80603d2def0cd005c7

97645cdc

Oct 22, 2018

Merge tag 'nightly/21.1/2018-10-21T2147' into updateTrigMC_to_21.1_2018-10-21 · 3590a853

Rafal Bielski authored 6 years ago

There were conflicts in MuonSpectrometer/MuonValidation due to MRs !14692 vs !15074. Resolved by keeping the version which was in 21.0-TrigMC.


Former-commit-id: 8ae1911b1a5cf08ab0dd68d74e14b560f96dddb9

3590a853

Oct 21, 2018

Merge branch '21.0-fix-q223-v3' into '21.0' · 09d19ba6

James Beacham authored 6 years ago

Fix a bug due to MR !14920 when running test_run00342075_cosmiccalo_toroidoff.sh

See merge request atlas/athena!15224

Former-commit-id: a4ad6ad05df206031060cbae342677be916c6d1b

09d19ba6

Fix a bug of test_run00342075_cosmiccalo_toroidoff.sh due to MR 14920 · 168d9732
Susumu Oda authored 6 years ago
```
Former-commit-id: 30caf8663c5f7e71b689fe7fc021a85235915cf4
```
168d9732

Oct 20, 2018

Merge branch '21.0_apipickle' into '21.0' · 9d3a1f89

James Beacham authored 6 years ago

Fix initialization in TriggerAPI

See merge request atlas/athena!15034

Former-commit-id: 8ca39e0bfb7d22b88397349f8d14af3f902e88c4

9d3a1f89

Merge branch '21.0-fix-q223-v2' into '21.0' · 0d6a66bc

James Beacham authored 6 years ago

Fix a bug of q223 job due to MR !14920

See merge request atlas/athena!15210

Former-commit-id: 0101e3292544fed367704a8e552f3dbbe511e3ae

0d6a66bc

Merge branch 'TM-20-10-18' into '21.1' · abd8ee19

Olga Igonkina authored 6 years ago

Fixing seed for hi_upc_FgapAC3_hi_gg_upc_noiseSup_L1TAU1_TE5_VTE200 (ATR-18401)

See merge request atlas/athena!15212

Former-commit-id: 8e9db7739dfdd130112e0623cba6afb4de1eec74

abd8ee19

Merge branch '21.1-HIJetMonitoringUpdate' into '21.1' · fb5802ee

Olga Igonkina authored 6 years ago

Adding in the HI jet chains to be monitored (ATR-18911 ATR-18398 ATR-18897)

See merge request atlas/athena!15209

Former-commit-id: 8d71bd48653382f7a158d8f1385233045c5a5887

fb5802ee

Fixing seed for hi_upc_FgapAC3_hi_gg_upc_noiseSup_L1TAU1_TE5_VTE200 (ATR-18401) · 85345bd1

Martin Rybar authored 6 years ago

- L1_TAU1_TE4_VTE200 -> L1_TAU1_TE5_VTE200 as seed for hi_upc_FgapAC3_hi_gg_upc_noiseSup_L1TAU1_TE5_VTE200
- all tests are Ok


Former-commit-id: c09e6bf7146ee0821a22a4484fd3ba06f3c162ff

85345bd1

Fix a bug of q223 job due to MR 14920 · 9612be23
Susumu Oda authored 6 years ago
```
Former-commit-id: 3e2355376069b259de1d58a0cfbb6d56c710bc43
```
9612be23

Merge branch 'cherry-pick- [formerly 9573334f96]-21.1' into '21.1' · 8801de66

Olga Igonkina authored 6 years ago

Sweeping !15162 from 21.1-dev to 21.1.
Add layer hit histograms

See merge request atlas/athena!15191

Former-commit-id: aa3cd78532065a1d32b4ef8d4db42f1676abd66c

8801de66

Adding in the HI jet chains to be monitored · d2c717d6
Alex Martyniuk authored 6 years ago
```
Former-commit-id: a9bc8b978e09367e08aa7dd650713b6a4c6bf855
```
d2c717d6

Merge branch '21.1-dev-ftkhp' into '21.1-dev' · 2cec9db2

Olga Igonkina authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Add layer hit histograms

See merge request atlas/athena!15162

(cherry picked from commit 4e8849c5 [formerly 9573334f969c643e8ebadda36f72451f1058556d])

c123c2da Add layer hit histograms
6ed1c275 Revert trivial change in code for comparisons sake

Former-commit-id: 5fb5d9ffb79aefee879fe894341f8d6f883cc9e2

2cec9db2

Oct 19, 2018

Merge branch '21.1_mu3' into '21.1' · a0fdc5e2

Olga Igonkina authored 6 years ago

Define thresholds for mu3 items

See merge request atlas/athena!15166

Former-commit-id: 546b4075c3b10f64de696ac15ceb4cd07d12901a

a0fdc5e2

Merge branch 'TM-19-10-18' into '21.1' · bc87d8be

Olga Igonkina authored 6 years ago

Adding UPC chains to express stream (ATR-18401)

See merge request atlas/athena!15164

Former-commit-id: fdf0e4a04b481bf1b5e06be59ba86923dc7e7a22

bc87d8be

Merge branch 'TrigP1Test_HIFTK' into '21.1' · 56083d05

Olga Igonkina authored 6 years ago

TrigP1Test: new HI FTK test (ATR-18575)

See merge request atlas/athena!15155

Former-commit-id: adf0b24cb1e5b4a25ee42212dd23d7a3ed96f40a

56083d05

Define thresholds for mu3 items · 7f8e3376
Javier Montejo authored 6 years ago
```
Former-commit-id: bcae56caf25c00125534e23590007a0aba31b95a
```
7f8e3376

Merge branch 'development-ereynold-egammaIsolation-FullCheckout-Release21p0' into '21.0' · 416dded9

James Beacham authored 6 years ago

Updated egammaValidation package to print out isolation variables and efficiencies of standard isolation working points

See merge request atlas/athena!15009

Former-commit-id: 7963e128ed0e2a459c759ee9103b792641894a63

416dded9

Updated egammaValidation package to print out isolation variables and... · 1b55dd2a

Elliot Reynolds authored 6 years ago and

James Beacham committed 6 years ago

Updated egammaValidation package to print out isolation variables and efficiencies of standard isolation working points


Former-commit-id: 40286ee172916904daf2bb8682be63cf29cb06cd

1b55dd2a

Merge branch '21.0-TRTConfig_kolmogorov' into '21.0' · 2ab6e231

James Beacham authored 6 years ago

Configurations updated for TRT to have less false red and yellow flags

See merge request atlas/athena!15087

Former-commit-id: 3e7449e6d85861d32813e0642685137d9d363903

2ab6e231

Merge branch 'AUX_Doctor' into '21.0' · 221a25e8

James Beacham authored 6 years ago

Aux Doctor

See merge request atlas/athena!15144

Former-commit-id: e7759606cfd9a33140997299ee878e556454c57f

221a25e8

Merge branch '21.0-my-InDetGlobalMonitoring-devel' into '21.0' · 37ac72bf

James Beacham authored 6 years ago

update in InDetGlobalMonitoring for heavy-ion runs

See merge request atlas/athena!15066

Former-commit-id: 443a34a7d6ce7297f247064245d7d4f4bb131f06

37ac72bf

Merge branch 'tct-oct15' into '21.0' · e8109299

James Beacham authored 6 years ago

Add art-include to the TCT tests

See merge request atlas/athena!15040

Former-commit-id: 65d8933213182f666cc9201b8bb4eda23116ce69

e8109299

Merge branch 'athena-21.0-ATLASSIM-3873' into '21.0' · e9aa2f3d

James Beacham authored 6 years ago

update ISF_FastCaloSimV2 infrastructure for physics A validation production (ATLASSIM-3873)

See merge request atlas/athena!15038

Former-commit-id: 236d36851afc0a3ebdd7b12b5292ed27295758c4

e9aa2f3d

Merge branch '21.0-SCT-Coverage-Merge' into '21.0' · 6ed4f621

James Beacham authored 6 years ago

Enabling the CoverageCheck

See merge request atlas/athena!14920

Former-commit-id: 7705b7bc355064677a2c808d8509c9f227ac4d07

6ed4f621

Adding UPC chains to express stream (ATR-18401) · a8f83032

Martin Rybar authored 6 years ago

- adding 6 requested chains to the express stream
- TMX, ctest and HI test are Ok


Former-commit-id: ff726c47e512319bb951f999c6b16faff9737fd6

a8f83032

Merge branch '21.0_HI_FixForTrigEgammaMon' into '21.0' · 0d77c3dd

James Beacham authored 6 years ago

Fix TrigEgammaMon and TrigEgammaAnaloysisTools for HI

See merge request atlas/athena!14875

Former-commit-id: 56e4c42d8243ba0727f3bd8ce7eea045d539e4ec

0d77c3dd

Merge branch 'cherry-pick- [formerly 62dbca368a]-21.0' into '21.0' · 62508184

James Beacham authored 6 years ago

Sweeping !10685 from 21.1 to 21.0.
ATR-17870, adding thresholds to HI menu to restore MBTS counts

See merge request atlas/athena!14851

Former-commit-id: c4bbc77db2a18adc7c965173ec43945700789c86

62508184

Update version.txt · a88ffdc0
James Beacham authored 6 years ago
```
Former-commit-id: 81602ad84d578f5905a46e69e0d91f3759090c8e
```
a88ffdc0
Update version.txt · 6b801610
James Beacham authored 6 years ago
```
Former-commit-id: 46acf320080d3f269edfe4af9081468797ac1433
```
6b801610
Update version.txt · f86687fb
James Beacham authored 6 years ago
```
Former-commit-id: 8096233a82d2aa7631c49ae9df1d472190f3ad0a
```
f86687fb

Merge branch 'l1_topo_muon_sorting' into '21.1' · d8c95049

Olga Igonkina authored 6 years ago

fixing muon sorting

See merge request atlas/athena!15107

Former-commit-id: ea310a4a957145e166e072a17e56ce2d73cfaca1

d8c95049