Former-commit-id: 7f692e82b62670772250608b326115ba10036718

Merge branch 'HLTegamma_Restore_13TeV' into '21.0' -- push to 21.0-mc16d

See merge request atlas/athena!7456

Former-commit-id: 151f7b6597d4e988343441626337676b42cdfef2

James Beacham authored 7 years ago and Oleg Kuprash committed 7 years ago

Restored 13TeV configuration from release 21.0.42 --Minyu

See merge request atlas/athena!7014

(cherry picked from commit 69f309ac [formerly 4ce0f29a9377590f1e8e14887864d6c60a66f021])

8e497c98 Restored 13TeV configuration from release 21.0.42 --Minyu

Former-commit-id: 08935abcd95bb20a0fd01090ce2455e64c7b0af7

Former-commit-id: efaa68e691457c7187e6a9966080b0a72ffe8555

Former-commit-id: 146a59a2a04ab39ef67fde146cc819bb123192df

Merge branch 'fix_LArNoisyROMon' into '21.0-mc16d'

See merge request atlas/athena!7283

Former-commit-id: 96b57a4787a014c2dd6cdd9fdd6a67c36dc93b0e

hack to fix the MP tests failing safeDelete

See merge request !6470

(cherry picked from commit 8b938cad [formerly 068e917c8d3498d1cbe1ddc60f2c1af82c4b663c])

5b26423f hack to fix the MP tests failing safeDelete
3ba51e5f correct fix for LArNoisyROMon crash

Former-commit-id: 6814e89174515e3b3b4227b54364f29a2dd73084

Merge branch '21.0-my-dq-development' into '21.0-mc16d'

See merge request atlas/athena!7248

Former-commit-id: 78018cd753d6c425f1d204bf0b743dd661b7ff9b

Merge branch '21.0-webdisplay-newLArFEBMon' into '21.0-mc16d'

See merge request atlas/athena!7245

Former-commit-id: 91fe04b9f3353a3876d3b8fbd1765e725e7b2071

Merge branch 'JetTagDQA-btagDevel-21.0-2017-11-10' into '21.0-mc16d'

See merge request atlas/athena!7249

Former-commit-id: 6755cd18eb5bc2ebd410d0ac1707a53d9f534649

Merge branch '21.0-LArNoisyROMon-dev' into '21.0-mc16d'

See merge request atlas/athena!7247

Former-commit-id: 403ec66a4e74db346ff762543a286f5fc41fb727

Merge branch '21.0-pedestalCorrectionUnderflow' into '21.0-mc16d'

See merge request atlas/athena!7246

Former-commit-id: 14097cb612e14784715f7e15dba40520d3ee6869

Merge branch '21.0-MaM-release-determination-fixes' into '21.0-mc16d'

See merge request atlas/athena!7244

Former-commit-id: 841222f83600220a8c71a6da960f3536cd9e7f5a

Merge branch 'cherry-pick-2feee641' into '21.0-mc16d'

See merge request atlas/athena!7242

Former-commit-id: e35a71072b3f7fee24371f127a875e9b5011a600

Merge branch 'awebb/athena-21.0-han-ref-backup' into '21.0-mc16d'

See merge request atlas/athena!7240

Former-commit-id: 7c65b48d15a089a9f6ff5f247b64dfa94c3d4a6b

Merge branch '21.0-AMUONDQ-65' into '21.0-mc16d'

See merge request atlas/athena!7239

Former-commit-id: becc992d33c48d223accaa623179a3324f0c629f

Merge branch '21.0-SCTCalib2017' into '21.0-mc16d'

See merge request atlas/athena!7251

Former-commit-id: 4d17a0d9594584e88006be83477e373932f047b3

James Beacham authored 7 years ago and Tamara Vazquez Schroeder committed 7 years ago

21.0 sct calib2017

See merge request !4948

(cherry picked from commit 59014e34 [formerly 75e26588baec26a5c54c209873f4425a6e446f0f])

ce9817f1 Two changes to improve prompt calibration loop:
0e090d2d Commented out new noisy strip list filling via condition database check, since…
883ff786 Added back an earlier fix which was accidentally reverted:
17c4aebd - fixed getBSError

Former-commit-id: 27a67ee13508ff4d5c2c784e9f9755c8b12367d1

Update PhysValBTag: b-tagging validation code for new DAOD_PHYSVAL

See merge request !5377

(cherry picked from commit dbe40764 [formerly 9deb94a12640ec758f2b37a5476ac01250eb0d80])

fffb87d0 Update PhysValBTag: b-tagging validation code for DAOD_PHYSVAL

Former-commit-id: bd756f349b04ba571896c46373ef32e854b56a45

James Beacham authored 7 years ago and Tamara Vazquez Schroeder committed 7 years ago

Updated the han-config file for HLT_e/gamma

See merge request !6069

(cherry picked from commit 2b902934 [formerly 1492e8ff1e7a5af2848b316765b97a17acf17a58])

deba1458 Updated the han-config file for HLT_egamma. (pp collision)

Former-commit-id: 5262e17608696c2fdfe59d09390e3f40b51624df

James Beacham authored 7 years ago and Tamara Vazquez Schroeder committed 7 years ago

LArMonTools and LArCellRec updates

See merge request !5401

(cherry picked from commit 3ddc74af [formerly f9c7936afd72c94ca46631da66fa6473d4c0a1b5])

975b05d9 Removing all no-partition hisograms
baedd292 More explict and uniform titles
eff6c1f5 Removing obsolete commented lines + commenting NoisyW histograms
21852763 Minor modif in titles
2f5acacc Passing MNB cut from LArCellRec to LArMonTools to include them in LArNoisyROMon HIST titles
64eb5a06 Passing MNB cut from LArCellRec to LArMonTools to include them in LArNoisyROMon HIST titles
c6abbe56 LArNoisyROMon : major rewriting : step 1
e8299d03 LArNoisyROMon : major rewriting : 1st reliable version
903e6412 LArNoisyROMon : major rewriting : removing commented obsolete code
5206efa0 LArDigit : Adding gain summary plot
2b3bf6e8 LArNoisyROMon: adding histograms of suspicious MNB FEBs
1129837c Removing capitals in LArNoisyROMon function

Former-commit-id: bb890709e8995ab3520325ee57d9fd63dcfaa503

Fixed pedestal correction under-/overflow issue

See merge request !6346

(cherry picked from commit 49087b5d [formerly 06cdd160])

6889018b Fixed pedestal correction under-/overflow issue

Former-commit-id: ad6f9079

Adding new LArFEBMon plot of >=1 FEB in error

See merge request !6158

(cherry picked from commit 64de12aa [formerly 443c39b6a758f91e9830542a6fc06db71628d177])

78ecf6dc Adding new LArFEBMon plot of >=1 FEB in error

Former-commit-id: f7ac495bf1370ae89572bc1d98b9c927f7c2be08

Trigger monitoring/MaM: fixes for release determination (ATR-17374)

See merge request !6458

(cherry picked from commit ad618c28 [formerly ccef817bf9771e03b25a49394d3617399cf4cd00])

59506b29 improvements for get_release_setup and release matching

Former-commit-id: 283dcd372d9322a4c85e383ae4955797136308c3

Merge branch 'master-ATLASRECTS-4156' into 'master'

See merge request !6410

(cherry picked from commit 1dffc760 [formerly 035505f9f8f95677836427c3db29b395275bc42f])

2dcf6ba9 Merge branch 'master-ATLASRECTS-4156' into 'master'

Former-commit-id: 277bac1a4a57d35b640d1307ca23ffdf3134310a

James Beacham authored 7 years ago and Tamara Vazquez Schroeder committed 7 years ago

21.0 han ref backup

See merge request !6534

(cherry picked from commit 6771cf0e [formerly c90f60fcb739e958cdd28f68510f91e6a1a52250])

52d7bcc2 Added the option to include multiple reference files
4a954a34 Added ability to define multiple reference files
5de06892 Added ability to define backup reference files
7ffb4747 Update HanConfig.cxx
829326ce Added ability to define multiple locations for a reference file
fe6285a2 Update ref to run 337491
43dfd2a2 Resolved merge conflicts

Former-commit-id: af675ddd22eeda26d68ade0b1c41107aee0577ff

James Beacham authored 7 years ago and Tamara Vazquez Schroeder committed 7 years ago

resize one MDT DQ histo

See merge request !6629

(cherry picked from commit a26f5081 [formerly 80fd8df80ee804516b0764f1b3a6006e143e44f5])

be4132dd resize one MDT DQ histo

Former-commit-id: 082ed5eb35d12e0646607771ce130593a85cac20

Change to take |deltaPhi| instead of deltaPhi in the cracks (bug fix).

See merge request atlas/athena!7195

Former-commit-id: e2f46a2e7f2842675d82afbc99fae21144d902fa

Sweeping !7063 from 21.0 to 21.0-mc16d.
Fix search directory of ART build jobs

See merge request atlas/athena!7104

Former-commit-id: 829a3b5efa9a73396009b7e2dcff95b328851e1a

Former-commit-id: b98b564594e63f5365e4c7e8884aecb063801040

James Beacham authored 7 years ago and Atlas Nightlybuild committed 7 years ago

Fix search directory of ART build jobs

See merge request atlas/athena!7063

(cherry picked from commit 10c5e623 [formerly 1c883ece885a9156b3b4f4b9e76bc7fbd797cf87])

4927a930 Fix serach directory of ART build jobs

Former-commit-id: 1e5d6826aec65fa4db7c9828f2f2f041736ad8c7

Sweeping !6933 from 21.0 to 21.0-mc16d.
CI_moved_to_atlas-sit as per ATLINFR-1826

See merge request atlas/athena!7052

Former-commit-id: 47fbf9936656bd876c137a7e33539c137723fc2e

James Beacham authored 7 years ago and Atlas Nightlybuild committed 7 years ago

CI_moved_to_atlas-sit as per ATLINFR-1826

See merge request atlas/athena!6933

(cherry picked from commit 975b785e [formerly 3a4bc8f008ac44be6f13732ff4f9fb6a802ae723])

3f4f376d CI_moved_to_atlas-sit as per ATLINFR-1826

Former-commit-id: f0df8636ad5dfef244ac9c40d6532e74b38be1e8

Former-commit-id: 86988143b4046a63fbffaf557afa47dd7afe1796

Former-commit-id: ead8e3749fcbb675bd64d42d2fdc765afdbdb3fa

Sweeping !6354 from 21.2 to 21.0-mc16d.
Modification in Jet Physics Validation job option to update histogram content

See merge request atlas/athena!6832

Former-commit-id: e6b1a25e3ec54a66e8d34cf865276f45e5b0c1ef

Keep the truth chains for isolated truth electrons from the egammaTruthParticles

See merge request atlas/athena!6727

Former-commit-id: fa37cb07c717fa9c424798ecd6f4265507b1a0b8

Merge branch '21.0-Athena-PhysValTest_q221' into '21.0-mc16d'

See merge request atlas/athena!6895

Former-commit-id: 3066c376ab7e4cc86aa9a94404ce4333d658abbe

Update PhysVal command in q221 test

See merge request atlas/athena!6771

(cherry picked from commit 8be3aef0 [formerly c274cf35bbe75f80e22d552d155433ee6cf2104b])

38cddd81 Update PhysVal command in q221 test

Former-commit-id: 2fc29e9844845de5218d03d1370bbe161397963f

Merge branch '21.0-JVC-fix' into '21.0-mc16d'

See merge request atlas/athena!6893

Former-commit-id: e6b7d017f0a76d6d144d3500f2d243ac4af6fcaa