Commits · 4391fe22ba254752d7aee0f07630ddc721c42ecb · Lars Rickard Strom / athena

Jul 26, 2018

Merge branch '21.0-drawrpvll-addTriggerAPI' into '21.0' · 4391fe22

James Beacham authored 6 years ago

21.0 drawrpvll add trigger api

See merge request atlas/athena!12661

Former-commit-id: eacbf42b0fc9b5a7709af63d95da2d82b327d14d

4391fe22

Merge branch '21.0-hancool-pixupdate' into '21.0' · 912ede8c

James Beacham authored 6 years ago

Add pixel improvements for hancool

See merge request atlas/athena!12804

Former-commit-id: c6a790d9f033ef82aa580568350c98dbc342d8c8

912ede8c

Add pixel improvements for hancool · 8b63e8d9
Peter Onyisi authored 6 years ago and James Beacham committed 6 years ago
```
Former-commit-id: 656e12a2f69b6755eeb86ce03ca8485461013517
```
8b63e8d9

Merge branch '21.0-modify-htag-script' into '21.0' · 05ed8fd8

James Beacham authored 6 years ago

add hcfg script. Update htag creation script to allow for old method to be used

See merge request atlas/athena!12736

Former-commit-id: 265ac5ad31c1ef3e4bce4bdb0ee44f4298b99076

05ed8fd8

Jul 25, 2018

Merge branch '21-AMUONDQ-74' into '21.0' · 2a538c37

James Beacham authored 6 years ago

Adding a new summary histogram for MDT see AMUONDQ-73

See merge request atlas/athena!12687

Former-commit-id: e1ab7c45bec3cc2f96286232e3b26bd5ec3cee1e

2a538c37

Merge branch 'hltmet-han-jul2018' into '21.0' · a7302041

James Beacham authored 6 years ago

met primary chain update

See merge request atlas/athena!12788

Former-commit-id: 9dc24bbc5d5285e47574c1b3115528908cf730a0

a7302041

Merge branch '21.0_RHadFragmentPatch' into '21.0' · ca1cb259

James Beacham authored 6 years ago

Patch for ATLMCPROD-5979 to RHadron pre-include

See merge request atlas/athena!12957

Former-commit-id: d0523b5dc6f26a1418fa49867c18d5ebc285b0a8

ca1cb259

Merge branch '21.0-fixDRAW_ZMUMUOnceAndForAll' into '21.0' · 788dd8d1

James Beacham authored 6 years ago

Ending writing of transient decorations on Muons in DRAW_ZMUMU building

See merge request atlas/athena!12501

Former-commit-id: 4e961184599a024a43522907294cb5b006c0698a

788dd8d1

Jul 24, 2018

Merge branch 'Branch-230718' into '21.0' · d8ed411d

James Beacham authored 6 years ago

ATR-17462,  frozen-tier0-violating, changes-trigger-counts,  changes in HLT CaloCluster

See merge request atlas/athena!12953

Former-commit-id: 118c394415355668a6efb6614d213f8ce916f404

d8ed411d

Merge branch 'SimATNtoART_21.0' into '21.0' · e3b8a05d

James Beacham authored 6 years ago

Migrate Digitization and SimuJobTransforms ATN jobs to ART

See merge request atlas/athena!12719

Former-commit-id: 4345b1147e1b605d826ddcd47513bd189940810a

e3b8a05d

Merge branch '21.0-ZCounting' into '21.0' · d5ae9fd3

James Beacham authored 6 years ago

Added Zee histogram check

See merge request atlas/athena!12462

Former-commit-id: 81fc26eda5b932c4ac4d6963e9d2083e5b342876

d5ae9fd3

Merge branch 'patch-54' into '21.0' · c5621480

James Beacham authored 6 years ago

Update version.txt

See merge request atlas/athena!12981

Former-commit-id: 072dfa1bb7e2dd9c33d6864dc4e6c366cf2f0431

c5621480

Update version.txt · be487334
Rohin Thampilali Narayan authored 6 years ago
```
Former-commit-id: a3e6dbc8d1c8a5492ca3e694a1a58bf42b16b3b0
```
be487334

Jul 23, 2018

Merge branch 'anff-digi' into '21.0' · b016ad57

James Beacham authored 6 years ago

Fix coverity issues

See merge request atlas/athena!12895

Former-commit-id: 4d2657fddbbf72a96fd0684440a9e3eda7fc9e0e

b016ad57

Merge branch 'anff-calib' into '21.0' · faa39b3c

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12894

Former-commit-id: d7f470b394ba4e5c46bed82b40cff9aaa1c8386f

faa39b3c

Merge branch '21.0-Archive_tf-new-features' into '21.0' · faa7ee68

James Beacham authored 6 years ago

New features for Archive_tf (ATLASJT-383)

See merge request atlas/athena!12870

Former-commit-id: ed6c838a44f58d428120745eba52f6e0d53ceae8

faa7ee68

Merge branch '21.0-run355861-v2' into '21.0' · 1144e456

James Beacham authored 6 years ago

Handle SCT ROD simulated data flag correctly (event-by-event and ROD-by-ROD)

See merge request atlas/athena!12849

Former-commit-id: 869e33410ec1933a49976483aa72eede4ce4359a

1144e456

Handle SCT ROD simulated data flag correctly (event-by-event and ROD-by-ROD) · 7072b428
Susumu Oda authored 6 years ago and James Beacham committed 6 years ago
```
Former-commit-id: 2600b1a5d35657fa66c27190064098d7d9921a08
```
7072b428

Merge branch 'DebugCalibHits_ATLASSIM-3718_21.0' into '21.0' · 1d465fee

James Beacham authored 6 years ago

Update of Escaped Energy Processing code to fix ATLASSIM-3718

See merge request atlas/athena!12713

Former-commit-id: 9c833e157e450327157811fadcab99fb18a15fa4

1d465fee

Patch for ATLMCPROD-5979 to RHadron pre-include · 42d8748c

Zach Marshall authored 6 years ago

Looks like we were missing a 'xxx' in the file string.  Thanks Sascha
for the catch!


Former-commit-id: 405a13f7de4233d39e55a10add7c99b71e41d9a7

42d8748c

ATR-17462 · 0cce3761
Sophio Pataraia authored 6 years ago
```
Former-commit-id: f527995d0011c9259b9911b34286ca26c70949e5
```
0cce3761

Jul 21, 2018

Merge branch 'test.CaloUtils-20180720' into '21.0' · 1f1eafa6

James Beacham authored 6 years ago

CaloUtils: Update test reference file.

See merge request atlas/athena!12897

Former-commit-id: e431ed9515d84ad8132463db64446cf2f7b2c59b

1f1eafa6

Merge branch 'cherry-pick- [formerly 214835633d]-21.0' into '21.0' · 5c984685

James Beacham authored 6 years ago

Sweeping !12858 from 21.1 to 21.0.
L1Topo monitoring fix CRC in global error plot

See merge request atlas/athena!12896

Former-commit-id: 51c676e3bc941d1569432aa5473184e88960286f

5c984685

Merge branch '21.0-Efficiency-plots-fix' into '21.0' · 5ac565d7

James Beacham authored 6 years ago

Task for ATR-18462

See merge request atlas/athena!12843

Former-commit-id: 2e1e48aa56cf2bab7e8784b16415dc235186b625

5ac565d7

Jul 20, 2018

Merge branch 'anff-recTool' into '21.0' · f4137b7a

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12881

Former-commit-id: ebbbfa1cfa08a9860d156c91e72b3daef81bc676

f4137b7a

Merge branch '21.0-LArG4EC' into '21.0' · f679a99f

James Beacham authored 6 years ago

Support for cold back wall of EC cryostat in Calibration Hit Calculator

See merge request atlas/athena!12866

Former-commit-id: d34fff328a5cd8081a03dd49050559178c8dd3e3

f679a99f

Merge branch 'RadiationMaps-rel21' into '21.0' · 0438f1d8

James Beacham authored 6 years ago

RadiationMapsMaker: Store density and norm in E_ion, TID maps for Geantinos

See merge request atlas/athena!12865

Former-commit-id: 73f021b540e1212374aee894cbdff43f7c3ff02c

0438f1d8

Merge branch 'anff-condition' into '21.0' · c3c79d06

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12863

Former-commit-id: 402804c19a145ad2bd668e277877f3146af1c2c5

c3c79d06

Merge branch 'anff-ConditionsServices' into '21.0' · 79a40ff4

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12862

Former-commit-id: b2c24f86d53a04526564114e7028193862cda030

79a40ff4

Merge branch 'anff-evtcnv' into '21.0' · 11a580c6

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12857

Former-commit-id: 3ed5217b68de90edcda9a9d511b1300dce8ce7fe

11a580c6

Merge branch 'anff-cable' into '21.0' · 1f99ba9b

James Beacham authored 6 years ago

fix one coverity issue

See merge request atlas/athena!12844

Former-commit-id: a275053e9687f30fb96a138d7dc04c09db97c6b8

1f99ba9b

Merge branch 'anff-rtt' into '21.0' · f7156bc6

James Beacham authored 6 years ago

fix coverity issues

See merge request atlas/athena!12842

Former-commit-id: a941be37475f22fe858c3ca12b3f1618aa987b9d

f7156bc6

Merge branch 'anff-PixelGeo' into '21.0' · 0dbb3fe4

James Beacham authored 6 years ago

Fix coverity issues

See merge request atlas/athena!12766

Former-commit-id: 3a035d23085e1030ac238712ae42ccb849ed895e

0dbb3fe4

Merge branch 'cherry-pick-072b8e21' into '21.0' · bc090277

James Beacham authored 6 years ago

Merge branch 'fixTrigCostCombinatorics' into '21.1' -- push to 21.0

See merge request atlas/athena!12754

Former-commit-id: 8cf004db02a433e6fe0e996516c31c991ca359dc

bc090277

Merge branch 'overlayART-fix' into '21.0' · 5ca83907

James Beacham authored 6 years ago

Fix for  OverlayMonitoring ART tests

See merge request atlas/athena!12662

Former-commit-id: 04143c9af6d48788b13d2d50f3723987f31e6fe0

5ca83907

Merge branch '21.0-L1Calo-MC-MC-Overlay' into '21.0' · d48f9571

James Beacham authored 6 years ago

L1Calo implementation for MC+MC overlay

See merge request atlas/athena!12567

Former-commit-id: dc436eecf3da4ea817c9d16bdc595d1d618f3d45

d48f9571

Merge branch 'ATLASSIM-3262' into '21.0' · 0598eeb9

James Beacham authored 6 years ago

Fix for ATLASSIM-3262

See merge request atlas/athena!12566

Former-commit-id: 3862bc7655a891662662bd5e1d36033a751cea0b

0598eeb9

Merge branch '21.0-BMuMuX-pairMu-fix' into '21.0' · 69864402

James Beacham authored 6 years ago

Fix for ATR-18252

See merge request atlas/athena!12540

Former-commit-id: 28d2fbe6cfada6648af4c2cc675b8fb067cd3e44

69864402

Merge branch 'tm-17061' into '21.0' · 838d4bbc

James Beacham authored 6 years ago

ATR-17061, adding TriggerValidation prescale (tightperf), changing CPSampleProd to tight.

See merge request atlas/athena!12798

Former-commit-id: 63459270

838d4bbc

Merge branch 'ART_Rel21_bugCorrection' into '21.0' · da4c8274

James Beacham authored 6 years ago

Bug correction ART Monitoring For Egamma : bins number mismatch

See merge request atlas/athena!12768

Former-commit-id: 9d9751d1767b9a20346a2f9098839fd9e5fe65a7

da4c8274