Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrating VectorHits reconstruction for the Phase2 OT - reprise #31314

Merged
merged 115 commits into from Oct 21, 2020
Merged

Integrating VectorHits reconstruction for the Phase2 OT - reprise #31314

merged 115 commits into from Oct 21, 2020

Commits on Oct 8, 2020

  1. commit VH technical integration changes only - VH switched off by def… 

    …ault
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    1d33be2 View commit details
    Browse the repository at this point in the history

  2. fixes after review by Mia

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    9643a44 View commit details
    Browse the repository at this point in the history

  3. apply code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    3bc0dde View commit details
    Browse the repository at this point in the history

  4. address Iannas comments part 1

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    09136ad View commit details
    Browse the repository at this point in the history

  5. code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    e0a73fd View commit details
    Browse the repository at this point in the history

  6. set usePhase2Stacks to false by default in the fillDescription of Tra… 

    …ckerRecoGeometryESProducer
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    3e0523b View commit details
    Browse the repository at this point in the history

  7. try to fix header issues and fix missing import broken by the last co… 

    …mmit
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    00ad9bb View commit details
    Browse the repository at this point in the history

  8. code checkes

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    e652383 View commit details
    Browse the repository at this point in the history

  9. restructure code in VectorHit.cc to satisfy static analyzer

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    5ad296d View commit details
    Browse the repository at this point in the history

  10. code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    05858c2 View commit details
    Browse the repository at this point in the history

  11. fix most of the issues making the tests fail

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    0ffda00 View commit details
    Browse the repository at this point in the history

  12. code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    7c1b911 View commit details
    Browse the repository at this point in the history

  13. apply comments by andrea

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    872a25c View commit details
    Browse the repository at this point in the history

  14. apply code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ac8f3be View commit details
    Browse the repository at this point in the history

  15. fix things broken in SeedingOTEDProducer.cc by last commit

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    35bc979 View commit details
    Browse the repository at this point in the history

  16. fix the fixes

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    672156a View commit details
    Browse the repository at this point in the history

  17. code formates

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    2dd7bf8 View commit details
    Browse the repository at this point in the history

  18. resolve conflict in TkStackMeasurementDet.h

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    d5c6cb4 View commit details
    Browse the repository at this point in the history

  19. Revert "resolve conflict in TkStackMeasurementDet.h" 

    This reverts commit a411999.
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    428127c View commit details
    Browse the repository at this point in the history

  20. resolve merge conflict in kStackMeasurementDet.h

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    236113f View commit details
    Browse the repository at this point in the history

  21. adapt includes to match changes in PR 28127

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ee3a194 View commit details
    Browse the repository at this point in the history

  22. rebase to latest IB

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    c9eace1 View commit details
    Browse the repository at this point in the history

  23. refactor code to not use EDProducer as product of ESProducer - part I

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    8bdb8a4 View commit details
    Browse the repository at this point in the history

  24. refactor code to not use EDProducer as product of ESProducer - part II

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    9e38c4c View commit details
    Browse the repository at this point in the history

  25. refactor code to not use EDProducer as product of ESProducer - part III

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    4391753 View commit details
    Browse the repository at this point in the history

  26. slight cleanup of diff

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    7b018f7 View commit details
    Browse the repository at this point in the history

  27. apply code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    cb8050b View commit details
    Browse the repository at this point in the history

  28. remove unnecessary dependencies in build files

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    4e69b00 View commit details
    Browse the repository at this point in the history

  29. add VectorHitMomentumHelper to avoid include of MagenticField.h in Da… 

    …taFormats
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    728f0d0 View commit details
    Browse the repository at this point in the history

  30. apply code formats

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    8b43243 View commit details
    Browse the repository at this point in the history

  31. fix missing initializations

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    472b65a View commit details
    Browse the repository at this point in the history

  32. trying to work around memory leaks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    7725ff0 View commit details
    Browse the repository at this point in the history

  33. apply code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ac77617 View commit details
    Browse the repository at this point in the history

  34. register consumes of ES products in SeedingOTEDProducer

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    5f6110a View commit details
    Browse the repository at this point in the history

  35. addressing PR comments part I

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    b775266 View commit details
    Browse the repository at this point in the history

  36. addressing PR comments part II

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    142acec View commit details
    Browse the repository at this point in the history

  37. addressing PR comments part III

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ce1a3ea View commit details
    Browse the repository at this point in the history

  38. restructure constructor of VectorHitBuilderAlgorithm and changed Vect… 

    …orHitBuilderEDProdcuer to use VectorHitBuilderAlgorithm via the EventSetup
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    5903788 View commit details
    Browse the repository at this point in the history

  39. clean file structure of the EDProducers

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    efcebde View commit details
    Browse the repository at this point in the history

  40. add new files from last step

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    727cb46 View commit details
    Browse the repository at this point in the history

  41. use det()

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    17bbbd6 View commit details
    Browse the repository at this point in the history

  42. remove uncessary cfi files

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    d06cd10 View commit details
    Browse the repository at this point in the history

  43. code checks and format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    9e1ca77 View commit details
    Browse the repository at this point in the history

  44. turn VHs off again and fix capitilization of import name

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    6fa2229 View commit details
    Browse the repository at this point in the history

  45. fix overlooked switch from dynamic to static cast

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    2536365 View commit details
    Browse the repository at this point in the history

  46. add vector hits to isFromDet and isFromDataOrFast in trackerHitRTTI

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    1009a20 View commit details
    Browse the repository at this point in the history

  47. code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    b17261d View commit details
    Browse the repository at this point in the history

  48. small improvements requested by Vincenzo

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    01114c0 View commit details
    Browse the repository at this point in the history

  49. protect against invalid TSOSs when propagating between layers

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    2cdd767 View commit details
    Browse the repository at this point in the history

  50. update validation configs to run on current RelVals

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ccf9e94 View commit details
    Browse the repository at this point in the history

  51. made a lot of functions const

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    33bbeff View commit details
    Browse the repository at this point in the history

  52. more improvements to SeedingOTEDProducer

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    758d273 View commit details
    Browse the repository at this point in the history

  53. more improvements to SeedingOTEDProducer and Phase2OTBarrelRodBuilder

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    754d08c View commit details
    Browse the repository at this point in the history

  54. Kevin's comments on a couple of files

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    403ac04 View commit details
    Browse the repository at this point in the history

  55. Kevin's comment to VectorHitBuilderAlgorithmBase

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    7c64d65 View commit details
    Browse the repository at this point in the history

  56. most of Kevin's remaining comments

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    424df27 View commit details
    Browse the repository at this point in the history

  57. fix clang compile error

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    9109e2e View commit details
    Browse the repository at this point in the history

  58. move curvatureOrPhi function from VectorHit to VectorHitBuilderAlgori… 

    …thm and move momentum and transverseMomentum function back to VectorHit
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    0aba3e5 View commit details
    Browse the repository at this point in the history

  59. code checks, mostly

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    90cf48a View commit details
    Browse the repository at this point in the history

  60. minor updates

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    6b9b4f2 View commit details
    Browse the repository at this point in the history

  61. cache position in LocalPositionSort

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    61599bc View commit details
    Browse the repository at this point in the history

  62. turn VHs off again

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    18a03b3 View commit details
    Browse the repository at this point in the history

  63. clarify 'sor' and rebase to latest IB

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    8bf7d15 View commit details
    Browse the repository at this point in the history

  64. code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    45ec1f2 View commit details
    Browse the repository at this point in the history

  65. fix theDimension usage and add constepr nComponents

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    17a2e02 View commit details
    Browse the repository at this point in the history

  66. Vincenzo's commnets on VectorHitBuilderAlgorirthm

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    f149ea2 View commit details
    Browse the repository at this point in the history

  67. code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ccc74b6 View commit details
    Browse the repository at this point in the history

  68. add process modifier to switch on Vector Hits

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    999d80b View commit details
    Browse the repository at this point in the history

  69. remove need to run curvatureORPhi 3 times

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    92f2c7e View commit details
    Browse the repository at this point in the history

  70. put printClusters behind EDM_ML_DEBUG

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    68ea0ce View commit details
    Browse the repository at this point in the history

  71. add forgotten push_heap

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ba5e5d4 View commit details
    Browse the repository at this point in the history

  72. code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    2d15513 View commit details
    Browse the repository at this point in the history

  73. adapt track selection for vector hits

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    66e765d View commit details
    Browse the repository at this point in the history

  74. add pixelLess iteration for vectorHits process modifier

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    c3357eb View commit details
    Browse the repository at this point in the history

  75. add special workflows to test vector hits

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    e9b6828 View commit details
    Browse the repository at this point in the history

  76. some cleanup

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    580200d View commit details
    Browse the repository at this point in the history

  77. add wf 23234.9 to those available for PR validation

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    16e51bb View commit details
    Browse the repository at this point in the history

  78. add removed newline

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    cfd6018 View commit details
    Browse the repository at this point in the history

  79. use seedingOT producer in pixelLess step

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    74cf64c View commit details
    Browse the repository at this point in the history

  80. bug fixes

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    f1ce21b View commit details
    Browse the repository at this point in the history

  81. code checks

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    ec1a12e View commit details
    Browse the repository at this point in the history

  82. cleanup

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    2c87639 View commit details
    Browse the repository at this point in the history

  83. fix bug in incrementing loop counter

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    24d84b9 View commit details
    Browse the repository at this point in the history

  84. use pre-created VectorHits in track building

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    9ac1ebe View commit details
    Browse the repository at this point in the history

  85. code checks and format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    03f9495 View commit details
    Browse the repository at this point in the history

  86. some cleanup

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    5c42b05 View commit details
    Browse the repository at this point in the history

  87. code comments from Kevin + Matti and implementation of cluster masking

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    867caf2 View commit details
    Browse the repository at this point in the history

  88. add second VH collection to TkStackMeasurementDet to recover low pT t… 

    …racks
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    1edd84d View commit details
    Browse the repository at this point in the history

  89. initialize useVectorHits_ in MeasurementTrackerEventProducer

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    d8b3b31 View commit details
    Browse the repository at this point in the history

  90. cleanup

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    35d4bf7 View commit details
    Browse the repository at this point in the history

  91. remove phase2 matcher from MeasurementTrackerEvent as it is no longer… 

    … needed
    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    b4fe5a6 View commit details
    Browse the repository at this point in the history

  92. code format

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    38225d6 View commit details
    Browse the repository at this point in the history

  93. slightly reduce diff

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    4774710 View commit details
    Browse the repository at this point in the history

  94. get rid of AlgebraicSymMatrix as member of VectorHit clas

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    b6b9e9e View commit details
    Browse the repository at this point in the history

  95. restore change overwritten in rebase

    @JanFSchulte
    JanFSchulte committed Oct 8, 2020
    Copy the full SHA
    1e9919f View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Slava's comments on DataFormats

    @JanFSchulte
    JanFSchulte committed Oct 9, 2020
    Copy the full SHA
    1fea02b View commit details
    Browse the repository at this point in the history

  2. intermediate commit of Slava's comments

    @JanFSchulte
    JanFSchulte committed Oct 9, 2020
    Copy the full SHA
    946eb90 View commit details
    Browse the repository at this point in the history

  3. more comments from Slava

    @JanFSchulte
    JanFSchulte committed Oct 9, 2020
    Copy the full SHA
    359a1bc View commit details
    Browse the repository at this point in the history

  4. add renamed files

    @JanFSchulte
    JanFSchulte committed Oct 9, 2020
    Copy the full SHA
    41ed2ad View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2020

  1. a few more comments

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    e58adab View commit details
    Browse the repository at this point in the history

  2. finish first pass at Slava's comments

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    2689ca8 View commit details
    Browse the repository at this point in the history

  3. add reserve statement in loadDetSetVector

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    671803f View commit details
    Browse the repository at this point in the history

  4. speed up cluster masking

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    93a827a View commit details
    Browse the repository at this point in the history

  5. code format

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    3b4b4d2 View commit details
    Browse the repository at this point in the history

  6. put printClusters behind debug statements

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    224b3a9 View commit details
    Browse the repository at this point in the history

  7. re-add mysteriously vanished float

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    41ff72e View commit details
    Browse the repository at this point in the history

  8. code format

    @JanFSchulte
    JanFSchulte committed Oct 10, 2020
    Copy the full SHA
    d952d3a View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2020

  1. fix earlyGeneralTracks config

    @JanFSchulte
    JanFSchulte committed Oct 11, 2020
    Copy the full SHA
    7d164db View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. get rid of the sorting of the VH

    @JanFSchulte
    JanFSchulte committed Oct 12, 2020
    Copy the full SHA
    72ba9db View commit details
    Browse the repository at this point in the history

  2. code format

    @JanFSchulte
    JanFSchulte committed Oct 12, 2020
    Copy the full SHA
    6dcc8c4 View commit details
    Browse the repository at this point in the history

  3. add comments

    @JanFSchulte
    JanFSchulte committed Oct 12, 2020
    Copy the full SHA
    a82f984 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. code format

    @JanFSchulte
    JanFSchulte committed Oct 13, 2020
    Copy the full SHA
    6019571 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. comments from Slava

    @JanFSchulte
    JanFSchulte committed Oct 15, 2020
    Copy the full SHA
    3300a89 View commit details
    Browse the repository at this point in the history

  2. code format and checks

    @JanFSchulte
    JanFSchulte committed Oct 15, 2020
    Copy the full SHA
    988c5a3 View commit details
    Browse the repository at this point in the history

  3. fix vectorHits workflows

    @JanFSchulte
    JanFSchulte committed Oct 15, 2020
    Copy the full SHA
    53aad7e View commit details
    Browse the repository at this point in the history