Commits · 2e6959329a086c361391d841085ce5da819bb0b8 · Lars Rickard Strom / athena

Jul 31, 2018
- Add status code support to FastCaloSim parametrization simulation · 2e695932
  Tadej Novak authored 6 years ago
  
  Former-commit-id: 8b945d141c59f5e5d8d1d09bc07cec4e6d1086ee
  2e695932
Jul 30, 2018

Merge branch '21.0-testdisplays-from-htag' into '21.0' · 21a38336

Tamara Vazquez Schroeder authored 6 years ago

21.0 testdisplays from htag

See merge request atlas/athena!12885

Former-commit-id: 6217c0d1d47562626328b0bb46669f76ff06b452

21a38336

Merge branch 'cherry-pick- [formerly 9f90213647]-21.0' into '21.0' · 472d70de

Tamara Vazquez Schroeder authored 6 years ago

Sweeping !13000 from 21.1 to 21.0.
TriggerAPI updates

See merge request atlas/athena!13044

Former-commit-id: e4410fa6b138db0a3966c949153bd53125af5960

472d70de

Merge branch 'cherry-pick-0587175f' into '21.0' · 7271595b

Tamara Vazquez Schroeder authored 6 years ago

Merge branch '21.1-dev-HybridTuning' into '21.1-dev' --> push to 21.0

See merge request atlas/athena!12954

Former-commit-id: cb691848de3daaddac803d9b7870289065176d0b

7271595b

Jul 28, 2018

Merge branch 'revert-4097fe2f' into '21.0' · 74dcbfc1

Tamara Vazquez Schroeder authored 6 years ago

Revert "Merge branch '21.0-removeLArCollisionTimeIDTRKVALID' into '21.0'"

See merge request atlas/athena!13095

Former-commit-id: e7fc08cb9db2f07b5336a6c3fd156ec649ad4419

74dcbfc1

Revert "Merge branch '21.0-removeLArCollisionTimeIDTRKVALID' into '21.0'" · 6fe06d20
Tamara Vazquez Schroeder authored 6 years ago
```
This reverts merge request !12978

Former-commit-id: d365db1624160c6f5f5f9e9c457b1477f5795268
```
6fe06d20

Jul 27, 2018

Merge branch 'cherry-pick- [formerly 3ce23fb5cc]-21.0' into '21.0' · 49877632

James Beacham authored 6 years ago

Sweeping !12506 from master to 21.0.
RPC_Digitization: Fix clang warning.

See merge request atlas/athena!12558

Former-commit-id: 140da232094750a93e5bf9225713dc1087b4a107

49877632

Merge branch 'ssbconstants_fix' into '21.0' · 34c0dafb

James Beacham authored 6 years ago

small tweak to SSB hardware constants generation

See merge request atlas/athena!13027

Former-commit-id: a9dc7691d3668fdea279a61d222b45a80180bce1

34c0dafb

Merge branch '21.0-removeLArCollisionTimeIDTRKVALID' into '21.0' · 512f1fbe

James Beacham authored 6 years ago

Change default value of DumpLArCollisionTime to 'False', to avoid rate problems

See merge request atlas/athena!12978

Former-commit-id: 4097fe2f86af860dfee69068b3bd7bb61f14d4cf

512f1fbe

Merge branch 'TriggerEDM-JetContainerRemovalAODSlim' into '21.0' · 7c5a82c1

James Beacham authored 6 years ago

ATR-18048: Removing Jet collections from AODSLIM and AODVERYSLIM in TriggerEDM.py for MC16e

See merge request atlas/athena!13066

Former-commit-id: 2eb8b247c2df17a8d140470cf47c7605eaeaf21d

7c5a82c1

remove duplicate import · 33a233bd
Aaron Webb authored 6 years ago
```
Former-commit-id: 9d5eecd2792e49482e28f91532e4c7de18d3a9e6
```
33a233bd
ATR-18048: Removing Jet collections from AODSLIM and AODVERYSLIM in TriggerEDM.py for MC16e · f7aaae3d
Catrin Bernius authored 6 years ago
```
Former-commit-id: f7a8bf32152ad0e0265985b5eefc0a20545fbcca
```
f7aaae3d

Merge branch '21.1_triggerAPIupdate' into '21.1' · da71358a

Catrin Bernius authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

TriggerAPI updates

See merge request atlas/athena!13000

(cherry picked from commit d06dc2b9 [formerly 9f902136470785d32c4bc6a9076efd3c37ce3125])

c6931304 Avoid nod0 comparison in 2015, where SFs are not provided
2b603aa8 Updates to TriggerAPI
95a1b379 Fix pyflakes error

Former-commit-id: 2cd18967a1da95ab876a9e4d1d1ee85d9bff963d

da71358a

Jul 26, 2018

Merge branch '21.0-enable-check' into '21.0' · 5b53ee4b

James Beacham authored 6 years ago

Enabled ROD simulated data check again by default

See merge request atlas/athena!13020

Former-commit-id: 08daaecf655d80d41aa7b71cbb93de3e1e89a96e

5b53ee4b

Merge branch '21.0-SCT_ByteStreamErrorsSvc-v2' into '21.0' · be16f5d9

James Beacham authored 6 years ago

Define BadErrors in ISCT_ByteStreamErrorsSvc.h and use it in SCT_ByteStreamErrorsSvc.cxx

See merge request atlas/athena!12638

Former-commit-id: e272ba6992782b66bf73a33c18b4abfc2f15f37c

be16f5d9

Merge branch 'FullSimTrf_Fix' into '21.0' · e65b42aa

James Beacham authored 6 years ago

New FastChain EVGENtoRDO transform

See merge request atlas/athena!13008

Former-commit-id: 9c4a31e7da9ba07785abecb63faa871b2c1617d9

e65b42aa

New FastChain EVGENtoRDO transform · f0a532ab
Matthew Thomas Anthony authored 6 years ago and James Beacham committed 6 years ago
```
Former-commit-id: 2c77d48b2ee99fb167fbf4ea27e9fd7029a31f4b
```
f0a532ab

Merge branch 'cherry-pick- [formerly 1321ca9d6c]-21.0' into '21.0' · 2a6119a7

James Beacham authored 6 years ago

Sweeping !12900 from 21.1 to 21.0.
Adding authentication details to access TRIGGER ART DB (ATR-16799)

See merge request atlas/athena!12929

Former-commit-id: 244f40f3cf1f0af5ba5665d6dca39c2bfa76031d

2a6119a7

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

add missing logic · 87437c3b
Aaron Webb authored 6 years ago
```
Former-commit-id: aa4991ab6cfdd9f191c5bcefc1adab7e2e55bf0f
```
87437c3b

fix typos · 7908d6a1

Aaron Webb authored 6 years ago

Former-commit-id: e87dd339c0da95117f4a66e76e21917538cde196

7908d6a1

fix merge conflicts · abd582df
Aaron Webb authored 6 years ago
```
Former-commit-id: 3574426c1b966064fa7433443dcdab12bb599097
```
abd582df
Use environmental variable to store htag · 1ba39e59
Aaron Webb authored 6 years ago
```
Former-commit-id: ccb332fadeee966a4b890a4dd250123b35f0c3e9
```
1ba39e59
small tweak to SSB hardware constants generation · 918ed78f
Maximilian Swiatlowski authored 6 years ago
```
Former-commit-id: 9948360aa1cb583cd8b72d76922c68046aaa5f25
```
918ed78f
Enabled ROD simulated data check again by default · 3b0e597f
Susumu Oda authored 6 years ago
```
Former-commit-id: e8d80b8f236dcfa719b8d44096e94dadc7cdeb19
```
3b0e597f

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
Change default value of DumpLArCollisionTime to 'False', to avoid rate problems · 0de59134
Nick Styles authored 6 years ago
```
Former-commit-id: 530c9aa94da902b52a570ea655395cfb087dff9f
```
0de59134

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