Commits · 4405faf73a87fdcff47bf79653d5dcdf958d5b11 · Lawrence Davou Christopher / athena

Oct 17, 2017
- Reverted changes · 4405faf7
  Petr Jacka authored 7 years ago
  
  Former-commit-id: 3e28165e09f76ce06df54510067311b3fa43907d
  4405faf7
- Reverted changes · ca4ea620
  Petr Jacka authored 7 years ago
  
  Former-commit-id: c498c6b42f77cbdb9ce0544c80394395f4db0de7
  ca4ea620
- Reverted change · c822bae5
  Petr Jacka authored 7 years ago
  
  Former-commit-id: 8ad1f6ec3ed0c9b1838b51ecb2ef2b6757790f82
  c822bae5
- Removed commented code · ec71935f
  Petr Jacka authored 7 years ago
  
  Former-commit-id: 0ce2b85b049bc00457cf35ab9b0b97c11e6a2333
  ec71935f
- Reverted changes · 8448edb4
  Petr Jacka authored 7 years ago
  
  Former-commit-id: bc1dfed04d9bdc39d659c99ef1a280894bf5e855
  8448edb4
- Cleaned mess in CaloGeometry classes · a20fc023
  Petr Jacka authored 7 years ago
  
  Former-commit-id: 4e05e76e080dc510451d7aa22fed9d8c0e386d4a
  a20fc023
Oct 16, 2017

Merge branch 'trigAnalysisTestART-v1' into '21.0' · 09b689b8

Tamara Vazquez Schroeder authored 7 years ago

add initial TrigAnalysisTest ART tests ATR-17172

See merge request !5323

Former-commit-id: db6a8e8298eba5f29dcb3293cad84b091edbcadb

09b689b8

Merge branch 'triggerTestARTInitialTest-v6' into '21.0' · 63a8cfae

Tamara Vazquez Schroeder authored 7 years ago

Updates to TriggerTest ART. ATR-17046

See merge request !5324

Former-commit-id: 00244fa92d86c8066b03d1dd9b734572019bd41a

63a8cfae

Merge branch 'revert_revert_of_MR_12_of_12' into '21.0' · cbb5a841

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'""

See merge request !5449

Former-commit-id: 995887638d4b84610435b724d70fe5950c7b474e

cbb5a841

Revert "Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'"" · 526c946b

James Beacham authored 7 years ago

This reverts commit dde34b40 [formerly 93b85443b3f8a2f9f75b905d88e1e4295a3b7ba1].


Former-commit-id: 122364ce34d916748e14d22fa542ff470921d23c

526c946b

Merge branch 'revert_revert_of_MR_11_of_12' into '21.0' · 2ee46bd4

James Beacham authored 7 years ago

Revert "Revert "Merge branch 'dropTrkTrackLinkFromAthSimulation_21.0' into '21.0'""

See merge request !5448

Former-commit-id: 3573f857a6d7311f6421818924efd95b3d5c59e1

2ee46bd4

Revert "Revert "Merge branch 'dropTrkTrackLinkFromAthSimulation_21.0' into '21.0'"" · f782a3d5

James Beacham authored 7 years ago

This reverts commit 5bced581 [formerly 1df083b5ea53d7b4cb69891cd39d2ccc08caf3d8].


Former-commit-id: 380b0630515f455fa89b7509043a07fa0bbf1b79

f782a3d5

Merge branch 'revert_revert_of_MR_10_of_12' into '21.0' · 6c68b140

James Beacham authored 7 years ago

Revert "Revert "Merge branch 'calo-containers' into '21.0'""

See merge request !5447

Former-commit-id: f568a70c6ba903ed5ac3ae1733231d8c08822020

6c68b140

Revert "Revert "Merge branch 'calo-containers' into '21.0'"" · 22897234

James Beacham authored 7 years ago

This reverts commit b5f19334 [formerly 6ee0d7197f80dc9b9691ce28d3acad2fa3a5777d].


Former-commit-id: e6be9705094243c49fd5ae1e18db5e85df0c1293

22897234

Merge branch 'revert_revert_of_MR_9_of_12' into '21.0' · ae869a68

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0-gene-trf' into '21.0'""

See merge request !5446

Former-commit-id: d575c1ceefbe9d5b69bfbcea5cf13a45989d9036

ae869a68

Revert "Revert "Merge branch '21.0-gene-trf' into '21.0'"" · 24660ebb

James Beacham authored 7 years ago

This reverts commit eb54b88e [formerly 278a8b658a3bce45328ae987d317d2e2bb804cab].


Former-commit-id: af7af939d5301ce3369d838ed16c03c5019d4194

24660ebb

Merge branch 'revert_revert_of_MR_8_of_12' into '21.0' · 3f9c268c

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0' into '21.0'""

See merge request !5445

Former-commit-id: 9b86388331ff67a5e115bacf3d6e0f3940edd717

3f9c268c

Revert "Revert "Merge branch '21.0' into '21.0'"" · ae827416

James Beacham authored 7 years ago

This reverts commit 5e6c8558 [formerly 070e790747facb2eeb402b344170cff1cee30203].


Former-commit-id: b694d8d9dea479f2f4b258eef6177384eba55535

ae827416

Merge branch 'revert_revert_of_MR_7_of_12' into '21.0' · 6ad8cbe7

James Beacham authored 7 years ago

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

See merge request !5444

Former-commit-id: 6a1d65a9f9f795b857a376356720057810acb9f2

6ad8cbe7

Revert "Revert "Merge branch '21.0-OverlayRTT' into '21.0'"" · 70999cc1

James Beacham authored 7 years ago

This reverts commit fc965bbd [formerly 212e989e573c8f7d4eac9cdd27e4f6d952b3c2a0].


Former-commit-id: 15359531b16b91ce418a8838bf8798d6b9635bbe

70999cc1

Merge branch 'revert_revert_of_MR_6_of_12' into '21.0' · d3fff922

James Beacham authored 7 years ago

Revert "Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'""

See merge request !5443

Former-commit-id: e776bafbc8ce4cb288631af1d5e3ed0ec92beb5b

d3fff922

Revert "Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'"" · bdb5b348

James Beacham authored 7 years ago

This reverts commit 89cbd614 [formerly 1acee8606e12a4a94717e5a701df3c1875435769].


Former-commit-id: 1454cd5a3b99afb7c17dbbc57444ce63ab459dcc

bdb5b348

Merge branch 'revert_revert_of_MR_5_of_12' into '21.0' · f79cd549

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'""

See merge request !5442

Former-commit-id: 8845d1e922872b536f3e30683de979b8427c942c

f79cd549

Revert "Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'"" · 2205e8ec

James Beacham authored 7 years ago

This reverts commit f1b71cb3 [formerly 42f7d3ded1f5aa33fb79736e93db4717994cc7da].


Former-commit-id: 9608e85b39d313c378830fc5434b1c075dd353c5

2205e8ec

Merge branch 'revert_revert_of_MR_4_of_12' into '21.0' · 49188074

James Beacham authored 7 years ago

Revert "Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'""

See merge request !5441

Former-commit-id: 2ca54fae8f67d6d3ce6fabb5fd768e30ff40031d

49188074

Revert "Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'"" · 7525b692
James Beacham authored 7 years ago
```
This reverts commit 1c4cd8fa [formerly c0c84f17].


Former-commit-id: 14384b1b
```
7525b692

Merge branch 'revert_revert_of_MR_3_of_12' into '21.0' · d499a303

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'""

See merge request !5440

Former-commit-id: 5736def6751ba3d2841fdb9d1960b6d0ef8e4c18

d499a303

Revert "Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'"" · 59845681

James Beacham authored 7 years ago

This reverts commit bcdd5bc2 [formerly 3fac6ee1cd006f057b50bc198ae2a19c49e92ee4].


Former-commit-id: 411ed01062a013f299bfdc3e6e56b1a2aae64e22

59845681

Merge branch 'revert_revert_of_MR_2_of_12' into '21.0' · 57d639d6

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370' into '21.0'""

See merge request !5439

Former-commit-id: e6dd019a4ecc854726f4ce962e8725c60b6af236

57d639d6

Revert "Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370' into '21.0'"" · 4728c06b

James Beacham authored 7 years ago

This reverts commit e2e310cf [formerly ec540e4f5d111d010ca27b26069ff7a2c8168e9d].


Former-commit-id: 8bfe511a86519c2db64c9d2179782fbc1359784e

4728c06b

Merge branch 'revert_revert_of_MR_1_of_12' into '21.0' · 2760bf94

James Beacham authored 7 years ago

Revert "Revert "Merge branch '21.0' into '21.0'""

See merge request !5438

Former-commit-id: 89a550ec08514b21f279357f25a1bb533608bb92

2760bf94

Revert "Revert "Merge branch '21.0' into '21.0'"" · cfe87f92

James Beacham authored 7 years ago

This reverts commit c2b4d97b [formerly e0b3f47d990609321bdb3c13c90cf30e6b2903c8].


Former-commit-id: 56a7354bd6c1b06219bf673b635ea816d9e6e504

cfe87f92

Oct 14, 2017

Merge branch 'revert_to_good_nightly' into '21.0' · a71c17e6

James Beacham authored 7 years ago

Revert 21.0 to r2017-10-05T2151

See merge request !5430

Former-commit-id: 75e594cdaf6391c483f744f1563884d54c7826ad

a71c17e6

Revert "Merge branch '21.0' into '21.0'" · c2b4d97b

James Beacham authored 7 years ago

This reverts commit 446c33ac [formerly 22969e11386ce422c4f8503c02b318b4add52c96], reversing
changes made to 82151eb4 [formerly f71c4f2bbe26f6aa1bc2167eb3b428344650c43b].

Former-commit-id: e0b3f47d990609321bdb3c13c90cf30e6b2903c8

c2b4d97b

Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370' into '21.0'" · e2e310cf

James Beacham authored 7 years ago

This reverts commit ff0b4f24 [formerly 6b05cc7355ee685c06b2d3cbd7f6850ec12b99c6], reversing
changes made to 446c33ac [formerly 22969e11386ce422c4f8503c02b318b4add52c96].

Former-commit-id: ec540e4f5d111d010ca27b26069ff7a2c8168e9d

e2e310cf

Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'" · bcdd5bc2

James Beacham authored 7 years ago

This reverts commit 404a0077 [formerly f1906efbefff9b96d7be87549d24f6aee8f4dd59], reversing
changes made to ff0b4f24 [formerly 6b05cc7355ee685c06b2d3cbd7f6850ec12b99c6].

Former-commit-id: 3fac6ee1cd006f057b50bc198ae2a19c49e92ee4

bcdd5bc2

Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'" · 1c4cd8fa

James Beacham authored 7 years ago

This reverts commit 05fc5906 [formerly 0389d6a7d1a1e7f666bb50109cdaccc4b54cffcc], reversing
changes made to 404a0077 [formerly f1906efbefff9b96d7be87549d24f6aee8f4dd59].

Former-commit-id: c0c84f17263bec571fbceb0911d89ac6cceaaff2

1c4cd8fa

Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'" · f1b71cb3

James Beacham authored 7 years ago

This reverts commit 1000a1cf [formerly d57d58cd9ec70419f96e1a5459267738957d1b30], reversing
changes made to 05fc5906 [formerly 0389d6a7d1a1e7f666bb50109cdaccc4b54cffcc].

Former-commit-id: 42f7d3ded1f5aa33fb79736e93db4717994cc7da

f1b71cb3

Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'" · 89cbd614

James Beacham authored 7 years ago

This reverts commit ae10fb16 [formerly c946c5c2d7fa22229e1fc820834b5009ddf819f3], reversing
changes made to 1000a1cf [formerly d57d58cd9ec70419f96e1a5459267738957d1b30].

Former-commit-id: 1acee8606e12a4a94717e5a701df3c1875435769

89cbd614

Revert "Merge branch '21.0-OverlayRTT' into '21.0'" · fc965bbd

James Beacham authored 7 years ago

This reverts commit 76c0a098 [formerly f1968b3e62b80c640f074f11d21a2477437caf2b], reversing
changes made to ae10fb16 [formerly c946c5c2d7fa22229e1fc820834b5009ddf819f3].

Former-commit-id: 212e989e573c8f7d4eac9cdd27e4f6d952b3c2a0

fc965bbd