Commits · 5f90b3284c16807db815cdc687948b5e3e33d931 · Lawrence Davou Christopher / athena

Apr 26, 2018

Merge branch 'myRel21TrigMCAODTruthFix' into '21.0-TrigMC' · 5f90b328

Pedro Teixeira-Dias authored 6 years ago

update for FTK truth decoration

See merge request atlas/athena!10735

Former-commit-id: 3ab4d329f265977d703c3ecbfee0817db183d863

5f90b328

Merge branch 'cherry-pick- [formerly ca128d8975]-21.0-TrigMC' into '21.0-TrigMC' · 6369c4c4

Pedro Teixeira-Dias authored 6 years ago

Sweeping !10519 from 21.0 to 21.0-TrigMC.
ATR-17863 FTK vertex index fix for jets

See merge request atlas/athena!10762

Former-commit-id: 70518084775e6a231714b52689a7906bd74782fc

6369c4c4

Merge branch 'ftk-vertex-index-fix-for-jets' into '21.0' · 6f8b1cea

Tamara Vazquez Schroeder authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

ATR-17863 FTK vertex index fix for jets

See merge request atlas/athena!10519

(cherry picked from commit 4d0b8f71 [formerly ca128d8975065f3dc1fb512ff301e0e57d1b714f])

7939899d index fix to circumvent ftk vertex indexing issue: ensure sum track pt moment…
583233bb modifying findHS to avoid retrieving vertices with ->at.

Former-commit-id: a153fc54ca8f2c1c828f0587348d39831aec32b0

6f8b1cea

Apr 24, 2018
- update for FTK truth · f18dab75
  Jahred Adelman authored 6 years ago
  
  Former-commit-id: 2975a4e83531771d164e7d61bd1050a3f14c9234
  f18dab75
Apr 21, 2018

Merge branch 'cherry-pick- [formerly 9a7c17cefc]-21.0-TrigMC' into '21.0-TrigMC' · d6b86b1b

Pedro Teixeira-Dias authored 6 years ago

Sweeping !10531 from 21.0 to 21.0-TrigMC.
New dataflow script

See merge request atlas/athena!10650

Former-commit-id: 2f67324c33ff35e4a251020337e422b0ea2783a5

d6b86b1b

Merge branch 'cherry-pick- [formerly f7234b0849]-21.0-TrigMC' into '21.0-TrigMC' · 6c8840f4

Pedro Teixeira-Dias authored 6 years ago

Sweeping !10530 from 21.0 to 21.0-TrigMC.
Separate Chi2DofCut into Chi2DofCutAux (for 1st stage) and Chi2DofCutSSB (for…

See merge request atlas/athena!10648

Former-commit-id: 78172ca50004b1f3c71ae9ed9f3028fcef79e200

6c8840f4

Merge branch 'dataflow_new' into '21.0' · 4a4980a0

James Beacham authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

New dataflow script

See merge request atlas/athena!10531

(cherry picked from commit 4e859929 [formerly 9a7c17cefcf7e1b131ea115fcba23bc7e8de6592])

903dd26e Updated dataflow script to fix all bugs, remove old useless quantities, and add…
c5cecdce Updated FTKSIM code to store the right dataflow quantity that dataflow script shows
c8ada380 Updated dataflow script to include a switch to turn on/off stat uncertainties
8262ee74 Updated dataflow script so that if the dataflow quantity exceeds hardware limit, it will get bold
7ee3ad07 Fixed the way standard error is calculated, and made only the average quantities bold

Former-commit-id: bff8849cc850b5561c9d5516058ba81b5d7dc878

4a4980a0

Merge branch 'SeparateChi2Cut' into '21.0' · 9c696f70

James Beacham authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Separate Chi2DofCut into Chi2DofCutAux (for 1st stage) and Chi2DofCutSSB (for…

See merge request atlas/athena!10530

(cherry picked from commit 43301b8f [formerly f7234b08493058ab1eb16e46ef3dffba60d770f1])

b654fb9d Separate Chi2DofCut into Chi2DofCutAux (for 1st stage) and Chi2DofCutSSB (for…

Former-commit-id: b034b206a7e5d5aa4a968306cf819ea6875e1df7

9c696f70

Apr 18, 2018

Merge branch 'TrigMC-ftkVertexFix-mar2018' into '21.0-TrigMC' · 9e206dfb

Pedro Teixeira-Dias authored 6 years ago

Add option to run VertexCollectionSorterTool in FTK_DataProviderSvc

See merge request atlas/athena!10535

Former-commit-id: 46772562049b81d7d2a456244ac86b657fca1e43

9e206dfb

Apr 17, 2018
- add option to use VertexCollectionSortingTool · c8216376
  John Baines authored 6 years ago
  
  Former-commit-id: 8cd4bb8de419e98d8a4b288872d00244b4ae614b
  c8216376
- add option to use VertexCollectionSortingTool · 140593ec
  John Baines authored 6 years ago
  
  Former-commit-id: da12c3f3aeac8d06725a2ecfddd66f790460c7ef
  140593ec
- Merge branch 'cherry-pick-190451e0' into '21.0-TrigMC' · 8b78a83e
  Pedro Teixeira-Dias authored 6 years ago
  
  Merge branch 'sct-dcs-hack-overlay' into '21.1-dev' -- push to 21.0-TrigMC See merge request atlas/athena!10489 Former-commit-id: c09d3b770b236e4b6e7c60ace4e80451a97af7ba
  8b78a83e
Apr 16, 2018

Merge branch 'sct-dcs-hack-overlay' into '21.1-dev' · d7b55498

Marija Vranjes Milosavljevic authored 6 years ago and

Jiri Masik committed 6 years ago

Sct dcs hack overlay

See merge request atlas/athena!10435

(cherry picked from commit 52c7c2ef [formerly 190451e0196235c4f213e9764d5c80fdba9f3a4a])

de12de42 workaround to prevent using the online SCT DCS folders in overlay jobs ATLHI-188
1d73e7bc Merge branch '21.1-dev' of ssh://gitlab.cern.ch:7999/atlas/athena into sct-dcs-hack-overlay

Former-commit-id: e3954941273d36f13910ec3151ff74317d45b657

d7b55498

Apr 11, 2018

Merge branch 'cherry-pick- [formerly d3623db7d2]-21.0-TrigMC' into '21.0-TrigMC' · a141f302

Pedro Teixeira-Dias authored 6 years ago

Sweeping !10250 from 21.0 to 21.0-TrigMC.
Copied updated ant tests from master to 21.0 (ATLASSIM-3607)

See merge request atlas/athena!10339

Former-commit-id: 6342425bd57f7993f02aaf08ab58549084411311

a141f302

Merge branch '21.0-digitizationtests-ant' into '21.0' · 1c26760a

Tamara Vazquez Schroeder authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

Copied updated ant tests from master to 21.0 (ATLASSIM-3607)

See merge request atlas/athena!10250

(cherry picked from commit 1e7da433 [formerly d3623db7d21ab324fc9280a1eba7272fdbf64632])

4704689e Copied updated ant tests from master to 21.0 (ATLASSIM-3607)

Former-commit-id: a248af3e8b5aa634ade0f9dcdb4860ab9aabe0d9

1c26760a

Apr 09, 2018

Merge branch 'cherry-pick- [formerly 42bea22248]-21.0-TrigMC' into '21.0-TrigMC' · be2172a9

Pedro Teixeira-Dias authored 6 years ago

Sweeping !10141 from 21.0 to 21.0-TrigMC.
ART version 0.9.5

See merge request atlas/athena!10277

Former-commit-id: 7298d3311bdc3f13e5c6820ee179c6573724e588

be2172a9

Merge branch 'ART-v0.9.5' into '21.0' · 87e0a87c

James Beacham authored 6 years ago and

Atlas Nightlybuild committed 6 years ago

ART version 0.9.5

See merge request atlas/athena!10141

(cherry picked from commit e038ee5d [formerly 42bea222486d80905c9eb3c5646be0d4868a1dc4])

80c5e796 ART version 0.9.5

Former-commit-id: f6660c0c9f356e66a5236e17c12c4cb200243fb9

87e0a87c

Apr 05, 2018

Merge branch 'olya/athena-OI-r2018-03-27-manytracks' into '21.0-TrigMC' · a1b67472

Tim Martin authored 6 years ago

memory allocation fix for ATR-17891

See merge request atlas/athena!10195

Former-commit-id: e68c2c25563121c9707f27cebcd89a34ea09f748

a1b67472

Apr 04, 2018
- one more vector reserve · 41143fd9
  olya authored 7 years ago and Tim Martin committed 6 years ago
  
  Former-commit-id: b4f4be88687fb69b85ad5516ce2c54b7ffda095b
  41143fd9
- adding CPU improvements, fixing messages · cf10d4ce
  olya authored 7 years ago and Tim Martin committed 6 years ago
  
  Former-commit-id: 77e6179c419f09d872b048ebf85561836afe9c0a
  cf10d4ce
- Reserve unordered_set · 993ae9f3
  Stewart Martin-Haugh authored 7 years ago and Tim Martin committed 6 years ago
  
  Former-commit-id: 533d26d82f499dc12da60f2d02cfa586f2225f85
  993ae9f3
- Reserve vectors, don't do anything with ostringstream unless we print it · 2c8db0e7
  Stewart Martin-Haugh authored 7 years ago and Tim Martin committed 6 years ago
  
  Former-commit-id: 9c2f56bcd29cf7c2b4ce915e7d12ca84a1c4ea76
  2c8db0e7
- fix for ATR-17891 · b2cff6af
  olya authored 7 years ago and Tim Martin committed 6 years ago
  
  Former-commit-id: bcc9f0c0a33099b258bbd3893b947f9284c8b491
  b2cff6af
Mar 28, 2018

Merge branch 'cherry-pick- [formerly 4c5b93cf02]-21.0-TrigMC' into '21.0-TrigMC' · 23940449

Pedro Teixeira-Dias authored 7 years ago

Sweeping !9971 from 21.0 to 21.0-TrigMC.
correct dataset paths and prepare new inputs if missing for ART build tests

See merge request atlas/athena!10063

Former-commit-id: 40a9dc934d1fc9367b3c8bf655ee43ba9584bb7c

23940449

Merge branch 'cherry-pick- [formerly d0b4785e6a]-21.0-TrigMC' into '21.0-TrigMC' · 7adb79b7

Pedro Teixeira-Dias authored 7 years ago

Sweeping !9947 from 21.0 to 21.0-TrigMC.
add AOD to transform option

See merge request atlas/athena!10058

Former-commit-id: 5ae37497e385c584808ded92b5a651678b89ccaf

7adb79b7

Merge branch 'my-uprecoart' into '21.0' · 13786e15

Tamara Vazquez Schroeder authored 7 years ago and

Atlas Nightlybuild committed 7 years ago

correct dataset paths and prepare new inputs if missing for ART build tests

See merge request atlas/athena!9971

(cherry picked from commit fbb8901a [formerly 4c5b93cf0286b1636eb70b3da708ce92fcf218e8])

6e8a8ad6 correct dataset paths and prepare new inputs if missing for ART build tests

Former-commit-id: f207a305ae0be9113cc40f2516dcf0002e89149a

13786e15

Merge branch 'myftkaodbranchfix' into '21.0' · 4f76ec7a

Tamara Vazquez Schroeder authored 7 years ago and

Atlas Nightlybuild committed 7 years ago

add AOD to transform option

See merge request atlas/athena!9947

(cherry picked from commit 4ae25fc8 [formerly d0b4785e6ae37b965e702f8c346d535d58f2c762])

60a4f6fe add AOD to transform option

Former-commit-id: 62066dc37056b4348efcaf2792d808a7c893f42d

4f76ec7a

Mar 21, 2018

Merge branch 'cherry-pick- [formerly 2abc2d36f8]-21.0-TrigMC' into '21.0-TrigMC' · c12db99d

Pedro Teixeira-Dias authored 7 years ago

Sweeping !9795 from 21.1 to 21.0-TrigMC.
Remove obsolete L2Star muon chains

See merge request atlas/athena!9851

Former-commit-id: 4f14ed1295372009fc9b38c86fc59e71b8f3f421

c12db99d

Merge branch 'cherry-pick- [formerly a7e4c922d1]-21.0-TrigMC' into '21.0-TrigMC' · 8ce65ab1

Pedro Teixeira-Dias authored 7 years ago

Sweeping !9784 from 21.0 to 21.0-TrigMC.
Correct input paths and add input files in RecJobTransformTests

See merge request atlas/athena!9847

Former-commit-id: eba6fff246be95e87f98f798eef04fb2b30c0978

8ce65ab1

Merge branch 'no_L2Star' into '21.1' · d6e654df

Fabian A.J. Thiele authored 7 years ago and

Atlas Nightlybuild committed 7 years ago

Remove obsolete L2Star muon chains

See merge request atlas/athena!9795

(cherry picked from commit e012c527 [formerly 2abc2d36f8a95bfa7277c40b9c15bb283f5b5931])

ee43fecb Remove obsolete L2Star muon chains

Former-commit-id: a9af276d1385d4de54cc7ad3470dd0287a2089d5

d6e654df

Merge branch 'my-uprecoart' into '21.0' · ac70dae9

Tamara Vazquez Schroeder authored 7 years ago and

Atlas Nightlybuild committed 7 years ago

Correct input paths and add input files in RecJobTransformTests

See merge request atlas/athena!9784

(cherry picked from commit 45eb344b [formerly a7e4c922d187880eb7e3846a7a0e45c400bac270])

cafbf6e3 correct input paths and add input files

Former-commit-id: 99a6773921f0dc51f27fc6474e58c53ca0837c62

ac70dae9

Mar 17, 2018

Merge branch 'patch-sweep-rules' into '21.0-TrigMC' · 09c2d065

Tim Martin authored 7 years ago

Update SweepRules in 21.0-TrigMC

See merge request atlas/athena!9779

Former-commit-id: 1ad9e50f39d4a29ba1a8de100df0ed00dcb77044

09c2d065

Update SweepRules · 2e087a4d
Tim Martin authored 7 years ago
```
Former-commit-id: 19ae4c297f660d3ebf44fe7436afcdd72faff3d4
```
2e087a4d

Mar 16, 2018

Merge branch 'ftkxaodfic-Mar-2018' into '21.0-TrigMC' · dd4cb18d

Pedro Teixeira-Dias authored 7 years ago

fix missing links from Vertex to TrackParticle

See merge request atlas/athena!9742

Former-commit-id: 0c705b324b7f8e38b16b028c7721a02ea436bd3a

dd4cb18d

Merge branch 'patch-version-number-TrigMC' into '21.0-TrigMC' · 923242b3

Tim Martin authored 7 years ago

Update version.txt to 21.5.5

See merge request atlas/athena!9743

Former-commit-id: 5c90ddd705d0f9ba3a4d00c98d289e3237ff5740

923242b3

Update version.txt to 21.5.5 · d9e6efc6
Tim Martin authored 7 years ago
```
Former-commit-id: fb7a7020fd1cf5f8483a807e8eedd6c24ee6c892
```
d9e6efc6

Mar 15, 2018
- fix missing links from Vertex to TrackParticle · 88f4f8d5
  John Baines authored 7 years ago
  
  Former-commit-id: ef948e17c1d0bcc5e09b4e0b4bb91874aff26475
  88f4f8d5
Mar 14, 2018

Merge branch '21.1' into '21.0-TrigMC' · 019f1d6c

Tim Martin authored 7 years ago

Merge 21.1 into 21.0-TrigMC: nightly from 14th March 2018

See merge request atlas/athena!9691

Former-commit-id: 2f681dbbe29b2ab9080601fe780692152f73100c

019f1d6c

Merge branch 'muonhistos' into '21.1' · 5e079e69

Marija Vranjes Milosavljevic authored 7 years ago

Muon HLT FTK monitoring fix (ATR-17777)

See merge request atlas/athena!9638

Former-commit-id: 6c372bd0c183fdeb9ef9e327991c6960275b971b

5e079e69

Muon HLT FTK monitoring fix (ATR-17777) · 7de47b95
Savanna Shaw authored 7 years ago and Marija Vranjes Milosavljevic committed 7 years ago
```
Former-commit-id: ba46f6c45c6e69b5eaaa70809eee159a95526ae9
```
7de47b95