Commits · ece1b5edbd2c066694a401655c7d1009672d90c1 · Lars Rickard Strom / athena

May 21, 2018

Merge branch 'test210.TrkEventAthenaPool-20180515' into '21.0' · ece1b5ed

Tamara Vazquez Schroeder authored 6 years ago

TrkEventAthenaPool: Disable tests if required libraries are not available.

See merge request atlas/athena!11350

Former-commit-id: 5f1024bf147b7cfd3140d88d26a0e4b397b126a2

ece1b5ed

Merge branch 'cherry-pick- [formerly 161caf67f7]-21.0' into '21.0' · ede2c5ed

Tamara Vazquez Schroeder authored 6 years ago

Sweeping !11357 from 21.0-TrigMC to 21.0.
add protection to FTK_DataProviderSvc to create VertexCollection even when vertexing not run

See merge request atlas/athena!11407

Former-commit-id: f5eb51ac2bb23b908a6ad739b8c144df41d07785

ede2c5ed

May 20, 2018
- Update test_reco_with_derived_outputs_2.sh · 3e912455
  James Beacham authored 6 years ago
  
  Former-commit-id: e64389ec00996fbc70104d213392d0fe0f89380c
  3e912455
- Update test_reco_with_derived_outputs.sh · 784c2291
  James Beacham authored 6 years ago
  
  Former-commit-id: 2fd0aefff5c7a0a0074350fda359199734c17306
  784c2291
May 19, 2018

Merge branch '21.0-manual-cherrypick-for-licence-cleanup' into '21.0' · c84b5640

James Beacham authored 6 years ago

21.0 manual cherrypick for licence cleanup

See merge request atlas/athena!11055

Former-commit-id: d4fd0020d73e4b4d0da3e7dd9643c148a2214f06

c84b5640

Merge branch 'isf-may19' into '21.0' · 6dd0f798

James Beacham authored 6 years ago

Add test_Sim_FullG4_ZPrime_QuasiStable with --imf option

See merge request atlas/athena!11486

Former-commit-id: bd07bc01e7a6ff0ce4f61287569026927de888bb

6dd0f798

Add test_Sim_FullG4_ZPrime_QuasiStable with --imf option · 76633c8b
Tulay Cuhadar Donszelmann authored 6 years ago
```
Former-commit-id: 272b641e178fd3b30a5bba345c397d3a9ddd1be9
```
76633c8b

May 18, 2018

Merge branch 'ATLASSIM-3691_21.0' into '21.0' · d16b2086

James Beacham authored 6 years ago

Fix DetFlag configuration for Fast Chain jobs (ATLASSIM-3691)

See merge request atlas/athena!11342

Former-commit-id: 0ac0b72b273fc018266be2bc319395905ead1b85

d16b2086

Merge branch '21.0-CaloBaseline-triggerFilterZeroBias' into '21.0' · 70290fc6

James Beacham authored 6 years ago

Adding trigger filter in CaloBaseline (zeroBias monitoring)

See merge request atlas/athena!11336

Former-commit-id: d1bddc87138be91e3c83af3a18733c2f545b6782

70290fc6

Merge branch 'cherry-pick- [formerly c306895aa6]-21.0' into '21.0' · b68a7c5f

James Beacham authored 6 years ago

Sweeping !11229 from 21.1-dev to 21.0.
Rewrite comparitor to allow printing of multiplot panels

See merge request atlas/athena!11315

Former-commit-id: cc61708fa92c6259c681c3169e8d3cc2b31762a6

b68a7c5f

Merge branch 'ubsan210.TrkSurfaces-20180514' into '21.0' · fc2c10d1

James Beacham authored 6 years ago

PyDumper+TrkSurfaces: Avoid more undefined behavior.

See merge request atlas/athena!11278

Former-commit-id: 273ac7b7577617387d4e50a58289718a3b799dba

fc2c10d1

Merge branch 'isValidQuiet.StoreGate-20180514' into '21.0' · 8687902f

James Beacham authored 6 years ago

StoreGate: ReadHandle::isValid shouldn't print a warning if the object is not in SG.

See merge request atlas/athena!11277

Former-commit-id: a18869458df556636f03c5cfd82def5230569ab4

8687902f

Merge branch 'ubsan210.TrkEventTPCnv-20180514' into '21.0' · dc2bbf1a

James Beacham authored 6 years ago

TrkEventTPCnv: Suppress ubsan warning.

See merge request atlas/athena!11276

Former-commit-id: e180965239c04bd370e0f2ff41403e9ef2e60903

dc2bbf1a

Merge branch 'ubsan210.JetEventTPCnv-20180514' into '21.0' · cf166804

James Beacham authored 6 years ago

JetEventTPCnv: Avoid calling method through null pointer.

See merge request atlas/athena!11275

Former-commit-id: c5704d424b711c771da213e900f6eb9c58cc0dd1

cf166804

Merge branch 'ubsan210.MuonReadoutGeometry-20180514' into '21.0' · 8bd4b456

James Beacham authored 6 years ago

MuonReadoutGeometry: Fix undefined behavior sanitizer warning.

See merge request atlas/athena!11274

Former-commit-id: 00d019c40de86ca548a1fd0753b722b5ee741acb

8bd4b456

Merge branch 'ubsan210.MuonGeoModel-20180514' into '21.0' · 32f7ce04

James Beacham authored 6 years ago

MuonGeoModel: Fix undefined behavior sanitizer warnings.

See merge request atlas/athena!11271

Former-commit-id: f172270a7d2d24aaba9b11744c61c3381fb60b76

32f7ce04

Merge branch 'ubsan210.TPTools-20180514' into '21.0' · ba1483bf

James Beacham authored 6 years ago

TPTools: Suppress some undefined behavior sanitizer warnings.

See merge request atlas/athena!11270

Former-commit-id: 2ec927847a8f8c2349253990f6a9ab49d9e355ce

ba1483bf

Merge branch 'ubsan210.InDetEventAthenaPool-20180514' into '21.0' · b43c12ba

James Beacham authored 6 years ago

InDetEventAthenaPool: Suppress undefined behavior sanitizer warnings.

See merge request atlas/athena!11268

Former-commit-id: c9aad7f581ff81f12f34ef5fdb10c5fc673faac2

b43c12ba

Merge branch 'ubsan210.CaloIdentifier-20180514' into '21.0' · 0e925dd0

James Beacham authored 6 years ago

CaloIdentifier: Fix ubsan warnings in tests.

See merge request atlas/athena!11267

Former-commit-id: 30417218bae793dfb62b72f567d433f596a52bd5

0e925dd0

Merge branch '21.0-tightening-of-DRAW_ZMUMU' into '21.0' · 26a6bd14

James Beacham authored 6 years ago

21.0 tightening of DRAW_ZMUMU

See merge request atlas/athena!11266

Former-commit-id: b719f0af6159ce31e2430bddf0662e71469c7fa1

26a6bd14

Merge branch 'Beamspot-ScanAverage' into '21.0' · 1bf9d0b1

James Beacham authored 6 years ago

Beamspot:  Average for emittance scans

See merge request atlas/athena!11228

Former-commit-id: 1f010c602b0b9df8fd8dd2d8b50f648eff159ba4

1bf9d0b1

Merge branch 'ubsan210.AthAllocators-20180512' into '21.0' · 7c3f7376

James Beacham authored 6 years ago

AthAllocators: Fix undefined behavior sanitizer warnings.

See merge request atlas/athena!11226

Former-commit-id: 98af5d5ea8598f7382b4d2e9b0f5a45ea58b15f7

7c3f7376

Merge branch '21.0-LArCoverage-MNBFEB' into '21.0' · df429923

James Beacham authored 6 years ago

LAr MiniNoiseBurst monitoring dev

See merge request atlas/athena!11198

Former-commit-id: 0ccd4e2617b3c6a78040acdffd5a502939cccc60

df429923

Merge branch 'xAODForwardFixes-21.0-20180509' into '21.0' · 31c49742

James Beacham authored 6 years ago

xAOD::AFPProton Fixes, 21.0 branch (2018.05.09.)

See merge request atlas/athena!11141

Former-commit-id: 758763a6d638dd518955beec4586555e1f9b7ba9

31c49742

Merge branch '21.0-teff-downstream' into '21.0' · eee4f740

James Beacham authored 6 years ago

21.0 teff downstream

See merge request atlas/athena!10588

Former-commit-id: ed5afbd0e7128925300023370f94df14b410a1aa

eee4f740

Merge branch 'mr-2018-03' into '21.0' · ac13920e

James Beacham authored 6 years ago

New histograms for Pixel monitoring, mr-2018-03

See merge request atlas/athena!11094

Former-commit-id: 88eaa5176eacc1c5818bab5314ec09c18c8e18cf

ac13920e

Merge branch '21.0-AFPBSC_withMultiBCX' into '21.0' · 7327716e

James Beacham authored 6 years ago

AFP Bytestream converter prepared for multiple bunch crossings

See merge request atlas/athena!11073

Former-commit-id: 75e54039cfae1631d4063e1619a6b5e4bcda927a

7327716e

Merge branch '21.0-May-trig-ref-update' into '21.0' · a6692e8b

James Beacham authored 6 years ago

Trigger reference updated to run 349944

See merge request atlas/athena!11470

Former-commit-id: 873056349ab4e52018d3d48372aa423d4007459c

a6692e8b

Merge branch '21.0-fix-lutOffsetType' into '21.0' · ab13c40c

James Beacham authored 6 years ago

Fixed wrong variable type, int -> real

See merge request atlas/athena!11291

Former-commit-id: 94b5ff6972e0dcd00246d382e65532a31420015d

ab13c40c

Merge branch '21.0-ThinningUtils' into '21.0' · d0ce88a0

James Beacham authored 6 years ago

ThinningUtils: ThinGeantTruthAlg is made SUSY R-Hadron aware.

See merge request atlas/athena!11351

Former-commit-id: f6a1386ec0e7331193a09ef0305909b7d1534067

d0ce88a0

Merge branch '21.0-FastCaloSim-dev' into '21.0' · 110a8df6

James Beacham authored 6 years ago

21.0-FastCaloSim update

See merge request atlas/athena!11377

Former-commit-id: 2d7f2eddc54e25ea104605c77904b4a42117eb9c

110a8df6

Trigger reference updated to run 349944 · ea9a87df
Elin Bergeaas Kuutmann authored 6 years ago
```
Former-commit-id: 7fcece4c17727c9a5076ce6e58e591806bca1562
```
ea9a87df

Merge branch 'patch-39' into '21.0' · 3254cb26

Tamara Vazquez Schroeder authored 6 years ago

Update version.txt

See merge request atlas/athena!11462

Former-commit-id: bbfe2896396ec9762981506656a73634c61d7754

3254cb26

Update version.txt · 48a9d8e6
Rohin Thampilali Narayan authored 6 years ago
```
Former-commit-id: 4841b736f8038b4ee956db1996b1678c8f844ad1
```
48a9d8e6

Merge branch '21.0-update-ref-run' into '21.0' · 4fc301e4

James Beacham authored 6 years ago

update reference run to 349944

See merge request atlas/athena!11447

Former-commit-id: 9bad54a953f88b955d6a946fc590beb3f8aa749a

4fc301e4

May 17, 2018
- update reference run to 349944 · 495752ba
  Aaron Webb authored 6 years ago
  
  Former-commit-id: c4ad948b138b96d30e21b42663cbe7582522506f
  495752ba
- Merge branch 'SimARTFixes_21.0' into '21.0' · 195f9b02
  James Beacham authored 6 years ago
  
  Fix SimCoreTests and ISF_Validation ART jobs See merge request atlas/athena!11385 Former-commit-id: 2c7b5314901fcae2eca4a26bba5d00ccecdef383
  195f9b02
- Update version.txt · f61a1ab4
  James Beacham authored 6 years ago
  
  Former-commit-id: 0cbda38f2223c9fdfdd0d4911f94559c912dffb6
  f61a1ab4
- Update version.txt · 1be2f742
  James Beacham authored 6 years ago
  
  Former-commit-id: 14807cfb50eea8e3a2f19d6acb8597b88a0f48e6
  1be2f742
- Update version.txt · 7007031e
  James Beacham authored 6 years ago
  
  Former-commit-id: af81c22dd45cb3406ba5275af090ec57f5ba636c
  7007031e