Skip to content

Commit

Permalink
CMSSW Integration of LST
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit c21a481
Author: Slava Krutelyov <[email protected]>
Date:   Tue Nov 12 11:04:49 2024 -0800

    batch9 of updates for LST integration in CMSSW (#121)

    * FP16_Base compilation fixes
    * Delete obsolete comment
    * Remove duplicate enum
    * Remove unused arrays and functions
    * correct return type
    * Removed unnecessary CopyToDevice
    * Small fixes to address review comments
    * Simplify moving to common enum
    ---------

    Co-authored-by: Slava Krutelyov <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Andres Rios Tascon <[email protected]>

commit 1a0ab7e
Merge: 8928adf 036340d
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Nov 12 10:21:39 2024 -0800

    Merge tag 'CMSSW_14_2_X_2024-11-11-2300' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 8928adf
Author: Manos Vourliotis <[email protected]>
Date:   Thu Nov 7 05:30:25 2024 -0800

    Update LST workflows to use Run4 instead of 2026

commit bedeb45
Merge: 12ead85 476d3aa
Author: Manos Vourliotis <[email protected]>
Date:   Wed Nov 6 21:30:25 2024 -0800

    Merge remote-tracking branch 'SegLink/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_142X-11-06-1100

commit 476d3aa
Author: Slava Krutelyov <[email protected]>
Date:   Mon Nov 4 06:02:24 2024 -0800

    batch8 of updates for LST integration in CMSSW (#113)

    * Removed allocBufWrapper and cache toggle
    * Removed references to temporaries
    * Fixed headers
    * Removed devAcc_
    * Simplified view creation
    * File and class renaming
    * Update workflow, enums, compilation flags
    * Move LSTOutputConverter to edm::stream::EDProducer
    * Merge standalone and CMSSW functions to get hits and TCs
    * Updates to remove syncs when creating or destroying the LSTEvent in CMSSW
    * Rename lst_INF and finalize simplification of compilation flags
    * Create lstProducerTask, move to C++20 pi and use C++20 in standalone compilation
    * Include numbers
    * Limit number of make threads

    ---------

    Co-authored-by: Andres Rios Tascon <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>

commit 4d603ca
Merge: 04d02b4 b96fd02
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 29 11:57:22 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre3' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 04d02b4
Merge: 83897c8 cb1557e
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 29 05:49:09 2024 -0700

    Merge pull request #109 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7

    migrate to SoATemplate

commit cb1557e
Merge: 83897c8 f8e7884
Author: Slava Krutelyov <[email protected]>
Date:   Mon Oct 28 15:06:13 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit f8e7884
Merge: ccc4bf4 48d01f3
Author: Slava Krutelyov <[email protected]>
Date:   Mon Oct 28 14:35:23 2024 -0700

    Merge pull request #106 from SegmentLinking/more_soa_migrations

    continuing migration to SoA: update LS, migrate ranges, hits, endcap, modules

commit 48d01f3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Oct 28 11:37:42 2024 -0700

    Review fixes

commit d08032a
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 13:14:50 2024 -0700

    Consistency fixes

commit 891a97d
Merge: 043dfe0 ccc4bf4
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 12:34:18 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into more_soa_migrations

commit 043dfe0
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 11:35:59 2024 -0700

    migrate modules to SoATemplate

commit ccc4bf4
Merge: cb84b9c 00013dd
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 14:29:22 2024 -0400

    Merge pull request #104 from slava77/CMSSW_14_2_0_pre1/LSTb7-SoA-TC-T5

    continuing migration to SoA: upd TC, migrate T3s, T5s, pT3s and pT5s ...

commit 00013dd
Author: Slava Krutelyov <[email protected]>
Date:   Thu Oct 24 12:02:14 2024 -0700

    migrate pT3 and pT5 to SoATemplate

commit 5e2bf7b
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:22:00 2024 -0700

    migrate EndcapGeometry to SoATemplate

commit 018204d
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:18:59 2024 -0700

    migrate hits to SoATemplate

commit 534ac1b
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:00:55 2024 -0700

    migrate ranges to SoATemplate

commit 9b8d26d
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 22 16:11:02 2024 -0700

    migrate quintuplets to SoATemplate

commit fd99b50
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 22 08:35:15 2024 -0700

    Made view sizes clearer

commit 1bbe663
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 22 06:52:37 2024 -0700

    migrate triplets to SoATemplate

commit 6f1ea3f
Author: Slava Krutelyov <[email protected]>
Date:   Thu Oct 10 10:55:17 2024 -0700

    simplify a bit TC SoAs

commit cb84b9c
Merge: fc3fc6a 0e0b5e1
Author: Slava Krutelyov <[email protected]>
Date:   Fri Oct 18 07:26:37 2024 -0700

    Merge pull request #93 from SegmentLinking/segments_soa

    Migrate segments to SoA+PortableCollection

commit 0e0b5e1
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Oct 16 08:22:33 2024 -0700

    Match conventions from previous PRs

commit 6b37c07
Merge: efef777 fc3fc6a
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Oct 16 08:04:42 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into segments_soa

commit fc3fc6a
Merge: 8338254 d3156d1
Author: Slava Krutelyov <[email protected]>
Date:   Wed Oct 16 05:04:48 2024 -0700

    Merge pull request #101 from SegmentLinking/mds_soa

    Migrate MDs to SoA+PortableCollection

commit d3156d1
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 15 20:11:11 2024 -0700

    Fixed formatting

commit 36a8c43
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Oct 14 13:51:19 2024 -0700

    Moved MiniDoubletsDeviceCollection definition

commit 3b4fa9e
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 13:22:05 2024 -0700

    Made view sizes clearer

commit 66612e8
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 12:48:15 2024 -0700

    Moved MD SoA definition to its own header

commit 129a2d4
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 07:02:06 2024 -0700

    Adjusted naming convention

commit 8fba6cb
Merge: f430d1b 8338254
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 06:48:51 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into mds_soa

commit 8338254
Merge: 3858cf3 69804f0
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 8 14:11:10 2024 -0400

    Merge pull request #90 from slava77/CMSSW_14_1_0_pre5/LSTb6-SoA-TCs

    migrate TrackCandidate to use SoATemplate and PortableCollection

commit 69804f0
Author: Slava Krutelyov <[email protected]>
Date:   Fri Oct 4 16:04:19 2024 -0700

    move TrackCandidatesDeviceCollection and related aliases to interface/alpaka

commit f430d1b
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 4 06:37:25 2024 -0700

    Formatted and removed unnecessary CopyToHost

commit efef777
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 4 06:21:52 2024 -0700

    Removed unnecessary CopyToHost

commit a296da7
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 1 15:46:02 2024 -0700

    get rid of TrackCandidates* trackCandidatesD_ and simplify syntax

commit 52377d1
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 1 08:33:37 2024 -0400

    Fixed makefile

commit 20f6f9c
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 30 17:11:03 2024 -0400

    Migrated MDs to SoA+PortableCollection

commit 155fc82
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 09:50:08 2024 -0700

    switch to TrackCandidates = ::lst::TrackCandidatesSoA::View

commit af1f68f
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:46:09 2024 -0700

    code checks

commit 8864fd1
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:42:03 2024 -0700

    sync DALPAKA flags in standalone builds with cmsdist scram-tools.file/tools/alpaka/alpaka.xml

commit a5822d0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:41:06 2024 -0700

    add a check that device and host match for host=device

commit 3e98eb4
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 20:49:20 2024 -0700

    code checks

commit 18a1f6e
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 17:18:14 2024 -0700

    drop -Wshadow in standalone builds: DataFormats/SoATemplate and related generates around 30MB of warnings with only partial TrackCandidate SoA use

commit 94df11b
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 17:16:08 2024 -0700

    migrate TrackCandidate to SoA from DataFormats/SoATemplate: kernels internally are still using the POD TrackCandidates SoA (to be migrated later)

commit 96be4f7
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 25 10:29:07 2024 -0700

    Initialize only required columns

commit 3858cf3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 12:26:35 2024 -0700

    Fixed cxxopts compilation

commit 9e2a402
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 12:01:31 2024 -0700

    Format code

commit 77ff0e5
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 11:59:41 2024 -0700

    Fixed memset

commit 37fe122
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 11:44:35 2024 -0700

    Fixed indexing issues

commit acff43f
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Sep 20 08:30:54 2024 -0700

    Switched to only using views

commit a7e3ec3
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 18 13:43:33 2024 -0700

    Fixed standalone compilation

commit d5da756
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 18 12:44:07 2024 -0700

    Moved segments to SoA+PortableCollection

commit 83897c8
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 07:04:19 2024 -0700

    Updated setup script to CMSSW_14_2_0_pre1

commit 135e18b
Merge: 5f9c2f6 c312b85
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 07:01:32 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre1' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit f68981e
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 06:57:59 2024 -0700

    Updated setup script to CMSSW_14_2_0_pre1

commit d764312
Merge: 5f9c2f6 c312b85
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 06:52:36 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre1' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7

commit 5f9c2f6
Author: Slava Krutelyov <[email protected]>
Date:   Fri Sep 13 10:46:41 2024 -0700

    new style code-checks from cms-bot https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-45117/41778/code-format.patch; the result looks less readable, but we have to comply

commit 2bc333b
Merge: ff27cf3 46f7f22
Author: Slava Krutelyov <[email protected]>
Date:   Fri Sep 13 09:13:42 2024 -0700

    Merge pull request #88 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch6

    Batch 6 for updates to LST integration in cms-sw

commit 46f7f22
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Sep 3 08:30:40 2024 -0700

    Finished cleaning namespaces

commit d2b9e89
Merge: f245be0 f0e560b
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 30 15:18:33 2024 -0700

    Merge pull request #89 from SegmentLinking/more_review_fixes

    More review fixes: smart pointers, cleaner namespaces, naming fixes

commit f0e560b
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 11:35:38 2024 -0700

    Renamed private data members

commit 3eb7a56
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 11:03:29 2024 -0700

    Addressed review comments

commit 0340221
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 10:42:33 2024 -0700

    Cleaned up namespaces

commit 1bff72d
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Aug 27 10:48:36 2024 -0700

    Started moving to smart pointers

commit f245be0
Merge: 9713499 24f587e
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 10:25:07 2024 -0700

    Merge pull request #85 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_smallFixesPostBatch5

    Small fixes post batch 5

commit 24f587e
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 28 08:11:54 2024 -0700

    Invert DeltaPhi arguments in CMSSW to harmonize with standalone

commit b5a1383
Author: Manos Vourliotis <[email protected]>
Date:   Sun Aug 25 11:19:49 2024 -0700

    Harmonize pixelType determination in CMSSW with the standalone

commit bb8402d
Author: Manos Vourliotis <[email protected]>
Date:   Sun Aug 25 10:40:56 2024 -0700

    Addressing review comments on PixelType

commit 1b6a0e1
Author: Manos Vourliotis <[email protected]>
Date:   Thu Aug 22 16:09:54 2024 -0700

    Apply review comments

commit 9713499
Merge: ff27cf3 3864e82
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 18:52:16 2024 +0200

    Merge pull request #87 from slava77/CMSSW_14_1_0_pre5/LSTb6-alpaka-wait-bugfix

    bugfixes to incomplete alpaka::wait cleanup (for batch6)

commit c4d12fc
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 03:04:50 2024 -0700

    Simplify consumes(), esConsumes(), produces() and code checks/format

commit 03da845
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 02:45:29 2024 -0700

    Make a data member private

commit 3864e82
Author: Slava Krutelyov <[email protected]>
Date:   Tue Aug 20 17:34:59 2024 -0700

    bugfixes to incomplete alpaka::wait cleanup: need to wait to get counters; need to write to CPU buffer asyncronously or directly only after a sync

commit fcb5e32
Author: Manos Vourliotis <[email protected]>
Date:   Tue Aug 20 11:45:11 2024 -0700

    Work on pixelType and removal of deprecated functions in standalone

commit 9544a58
Author: Manos Vourliotis <[email protected]>
Date:   Mon Aug 19 11:22:56 2024 -0700

    Revise some includes

commit ff27cf3
Merge: 77854d9 fe0d0ac
Author: Slava Krutelyov <[email protected]>
Date:   Sat Aug 17 10:08:17 2024 -0700

    Merge pull request #79 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch5

    Batch 5 for updates to LST integration in cms-sw

commit fe0d0ac
Merge: fb5c0ea 79ea879
Author: Slava Krutelyov <[email protected]>
Date:   Sat Aug 17 10:02:33 2024 -0700

    Merge pull request #84 from SegmentLinking/use_namespaces_instead_of_templates

    Moved LST and Event classes to ALPAKA_ACCELERATOR_NAMESPACE

commit 79ea879
Author: Andres Rios Tascon <[email protected]>
Date:   Sat Aug 17 07:31:46 2024 -0700

    Moved all alpaka code to ALPAKA_ACCELERATOR_NAMESPACE

commit 1a5e2c4
Merge: 9f6d612 fb5c0ea
Author: Andres Rios Tascon <[email protected]>
Date:   Sat Aug 17 05:27:27 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch5' into use_namespaces_instead_of_templates

commit fb5c0ea
Merge: 4ff4aaf 5cce69a
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 16 15:08:14 2024 -0700

    Merge pull request #83 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_destructorsMovesKernelNames

    Remove user-defined destructors, make vector moves useful, rename kernels

commit 9f6d612
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 16 12:55:26 2024 -0700

    Moved LST and Event classes to ALPAKA_ACCELERATOR_NAMESPACE

commit 5cce69a
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 11:04:46 2024 -0700

    Code format and checks

commit 787dfe1
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 10:38:02 2024 -0700

    Renaming of kernels

commit d5e443a
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 09:33:38 2024 -0700

    Remove user-defined destructors

commit 8d2366b
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 09:15:04 2024 -0700

    Remove pass by const reference when std::move-ing

commit 4ff4aaf
Merge: c1767fa 7889093
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 16 13:13:52 2024 -0400

    Merge pull request #77 from slava77/CMSSW_14_1_0_pre5/LSTb5-alpaka-calls-review

    batch5: alpaka::wait and use views to local host data instead of buffers

commit 7889093
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 15 16:43:14 2024 -0700

    add synchronizations in callers of the event methods where it matters; make synchronization more explicit/flexible in names or function arguments

commit c1767fa
Merge: d3549cb 22192ec
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 14 15:49:57 2024 -0700

    Merge pull request #82 from SegmentLinking/more_review_fixes

    More review fixes

commit 43ce20e
Author: Slava Krutelyov <[email protected]>
Date:   Mon Aug 12 15:26:08 2024 -0700

    explicitly require 1D single block kernels to use Acc1D and have one block with asserts

commit 22192ec
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 12:19:53 2024 -0700

    Add include for fp16 on HIP

commit a0432cc
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 12:09:26 2024 -0700

    Reduce number of moduleConnections_ lookups

commit 80ffdc3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 11:51:40 2024 -0700

    Changed syntax of atomic operations

commit c6a2468
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 15:35:06 2024 -0700

    lst::createWorkDiv now depends on Acc to avoid ODR; allocBufWrapper correct parameter is TDev

commit a7d73c0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 06:37:00 2024 -0700

    replace alpaka::getPtrNative(buf) with buf.data()

commit 4ef678d
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 06:21:53 2024 -0700

    switch to using alpaka::exec

commit 7343156
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 05:31:06 2024 -0700

    cleanup unnecessary alpaka::wait; add comments justifying other alpaka::wait calls; switch to cms::alpakatools::make_host_buffer for a few local buffers

commit e8cc7a8
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 16:20:25 2024 -0700

    cleanup unnecessary alpaka::wait

commit 8557644
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 08:16:42 2024 -0700

    remove spurious semicolons at the end of method implementations

commit d3549cb
Merge: 77854d9 8f720ad
Author: Slava Krutelyov <[email protected]>
Date:   Mon Aug 5 14:33:06 2024 -0700

    Merge pull request #76 from SegmentLinking/LSTESData_fixes

    LSTESData fixes

commit 8f720ad
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 5 07:57:46 2024 -0700

    Fixed memcpy

commit 77854d9
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 16:13:09 2024 -0700

    name=1 -> name=RecoTracker/LSTCore

commit 4cd5974
Merge: 1d9b396 ecd8e3e
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 13:42:50 2024 -0700

    Merge pull request #66 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch4

    Batch 4 for updates to LST integration in cms-sw

commit 14b8bd9
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 2 08:36:24 2024 -0700

    Minor cleanup

commit 0bcb06c
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 31 14:00:24 2024 -0700

    Removed alpaka functions from host ES code

commit ecd8e3e
Merge: d7689bb a076afb
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 31 11:11:06 2024 -0700

    Merge pull request #72 from SegmentLinking/removalOfSDL

    Total removal of sdl/SDL

commit d7689bb
Merge: 24aa3a2 5b1e21c
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 31 07:09:00 2024 -0700

    Merge pull request #73 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_fixWorkflowConflict2

    Resolving latest workflow conflict

commit 5b1e21c
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 31 02:50:16 2024 -0700

    Fix workflow conflict

commit a076afb
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 31 01:30:09 2024 -0700

    Remove forgotten flag

commit c3f41a7
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 11:26:35 2024 -0700

    Code checks and format

commit 67c2376
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 10:57:10 2024 -0700

    Simplification of variable naming

commit d378a59
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 10:33:43 2024 -0700

    Removal of sdl/SDL from all standalone code

commit 24aa3a2
Merge: 3fc9904 944e1b4
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 30 08:34:03 2024 -0700

    Merge pull request #71 from SegmentLinking/renameClassesRemoveCopies

    More work on Constants and removal of vector copies

commit 961d01e
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 07:53:28 2024 -0700

    Remove sdl from variable names

commit 944e1b4
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 07:27:10 2024 -0700

    Code checks and format

commit 5d5bd29
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 05:37:34 2024 -0700

    Split PixelTriplets to PixelQuintuplets

commit ae851e0
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 05:27:15 2024 -0700

    Fourth batch of fixing function arguments

commit 3fc9904
Merge: fac2958 d5e0b69
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 13:46:03 2024 +0300

    Merge pull request #70 from slava77/CMSSW_14_1_0_pre5/LSTb4-buf-lite

    alpaka modernise/improve for batch4

commit 954a22a
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 03:31:08 2024 -0700

    Third batch of fixing function arguments

commit 2af0685
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 29 08:01:16 2024 -0700

    Second batch of fixing function arguments

commit ce79bc1
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 29 06:03:10 2024 -0700

    First batch of fixing function arguments

commit 96aa7c0
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 27 17:11:01 2024 -0700

    Revert constness on arguments passed by value

commit e076050
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 27 14:51:16 2024 -0700

    Revert moving general purpose functions to common CMSSW file

commit 9268f49
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jul 26 06:27:32 2024 -0700

    More constness, removal of vector copies, and movement of general-purpose alpaka functions

commit d5e0b69
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 24 16:12:31 2024 -0700

    remove Vec3D createVec

commit 07e0f40
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 24 15:55:20 2024 -0700

    geometry ::get single search

commit 77e6b9a
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 24 09:44:52 2024 -0700

    Removal of vector copies, as per comments

commit 375a06c
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 24 06:45:27 2024 -0700

    Renaming of constants and removal of custom functions now implemented in alpaka

commit 69debc2
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 23 15:58:55 2024 -0700

    use cms::alpakatools::once_per_block

commit fac2958
Merge: ff12237 7fdcabd
Author: Slava Krutelyov <[email protected]>
Date:   Mon Jul 22 14:27:41 2024 -0700

    Merge pull request #68 from SegmentLinking/renameClassesRemoveCopies

    Renaming of namespaces/classes/macros and removal of vector, etc. copies

commit 7fdcabd
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 22 10:06:11 2024 -0700

    Renaming of classes/structs/macros/constants

commit a22faeb
Author: Manos Vourliotis <[email protected]>
Date:   Sun Jul 21 14:34:26 2024 -0700

    Revert change in TrackListMerger

commit 304929e
Author: Manos Vourliotis <[email protected]>
Date:   Sun Jul 21 14:25:50 2024 -0700

    Fixes after rebase

commit e54c6f1
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 20 08:04:57 2024 -0700

    Apply comments namespace and type renaming

commit 1a6e27b
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 20 07:42:27 2024 -0700

    Fix for wrong loop range in pT3 kernel

commit 5d0ef1e
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jul 19 09:44:07 2024 -0700

    Namespace renaming SDL->lst and inclusion of the T5DNN->t5dnn namespace under it

commit ff12237
Merge: 1250a8c d0e320a
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Jul 19 19:50:11 2024 -0400

    Merge pull request #67 from slava77/CMSSW_14_1_0_pre5/LSTb4-buf-base

    remove inheritance of buffers on underlying SoAs

commit d0e320a
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 19 08:56:04 2024 -0700

    remove inheritance of buffers on underlying SoAs

commit 1fb0489
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 19 08:55:13 2024 -0700

    split ranges from modules

commit 1250a8c
Merge: 1d9b396 fb12af0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jul 18 14:34:11 2024 -0700

    Merge pull request #65 from SegmentLinking/use_common_library

    Move some things out into a common library

commit fb12af0
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Jul 18 07:44:57 2024 -0700

    Format code

commit d33ac32
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Jul 18 07:28:52 2024 -0700

    A bit more cleanup

commit ccd29f4
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 11:17:35 2024 -0700

    Format and cleanup

commit c4ac510
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 11:10:51 2024 -0700

    Fixed standalone compilation

commit 64a7bf1
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 10:41:54 2024 -0700

    Moved more things out of the alpaka directory

commit 9fd3355
Author: Andres Rios-Tascon <[email protected]>
Date:   Mon Jul 15 11:28:07 2024 -0400

    Use pre-defined alpaka types

commit 9c87a88
Author: Andres Rios-Tascon <[email protected]>
Date:   Thu Jul 11 13:04:39 2024 -0400

    Moved some things out into a common library

commit 1d9b396
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jul 16 11:25:54 2024 -0700

    Updated setup scripts to use CMSSW 14_1_0_pre5

commit 23ec786
Merge: 7187927 b20c7aa
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jul 16 11:17:08 2024 -0700

    Merge tag 'CMSSW_14_1_0_pre5' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 7187927
Merge: 4cd8924 34c56c6
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 10 15:55:04 2024 -0700

    Merge pull request #50 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch3

    Batch 3 for updates to LST integration in cms-sw

commit 34c56c6
Merge: ae67290 86503a2
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 9 16:29:56 2024 -0700

    Merge pull request #49 from SegmentLinking/ESProducer_fixes

    ESProducer fixes

commit ae67290
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 06:07:31 2024 -0700

    Simplify LST workflows

commit 7cfe3a5
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 06:06:39 2024 -0700

    Code format and checks

commit a3a8054
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 05:19:42 2024 -0700

    Even further work on naming values and sqrt, loop, etc. simplifications

commit 86503a2
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 07:41:35 2024 -0700

    Fixed include guards for headers in interface directory

commit f47212f
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 07:32:46 2024 -0700

    Renamed new endcap geometry class

commit d3e5999
Merge: f46b6cb c563eb0
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 08:07:27 2024 -0700

    Merge remote-tracking branch 'SegLink/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch3' into ESProducer_fixes

commit c563eb0
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 8 07:39:49 2024 -0700

    Further work on naming values and sqrt, loop, etc. simplifications

commit 4d7e54a
Merge: a97714a dc13ac5
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 5 09:15:23 2024 -0700

    Merge pull request #58 from SegmentLinking/remove_LST_IS_CMSSW_PACKAGE

    combo of: Remove LST_IS_CMSSW_PACKAGE (#47), configurable dup cleaning (#37), typo in T3 code (#44)

commit a97714a
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 3 07:16:19 2024 -0700

    Apply reco comments: Naming values and sqrt, loop, etc. simplifications

commit 236ad8c
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jun 29 02:43:48 2024 -0700

    Simplification of sqrt operations for pT3s

commit 149c628
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 28 21:23:31 2024 +0200

    Resolve conflicts regarding workflows

commit f46b6cb
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 12:52:12 2024 -0700

    Removed -Wshadow flag

commit eb5de05
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 11:30:45 2024 -0700

    Minor cleanup

commit a3f65da
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 11:00:13 2024 -0700

    Separated EndcapGeometry into host-only and buffers struct

commit ef48f74
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 24 02:21:11 2024 -0700

    Removal of gpu modifier from LST workflows

commit e0acfa5
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jun 18 10:40:38 2024 -0700

    Addressed ESProducer comments

commit 4cd8924
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jun 14 18:00:59 2024 -0700

    code-format/checks

commit e64c2cc
Merge: 314e95d 3552ad3
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jun 14 17:45:17 2024 -0700

    Merge pull request #38 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch2

    Batch 2 for updates to LST integration in cms-sw

commit dc13ac5
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Jun 14 16:53:31 2024 -0400

    Removed LST_IS_CMSSW_PACKAGE flag

commit 14af981
Merge: f555485 f4bd702
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jun 13 14:18:35 2024 -0700

    Merge pull request #44 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_TrackLooperPR407

    Fix typo in T3 code

commit 3552ad3
Author: Manos Vourliotis <[email protected]>
Date:   Thu Jun 13 09:42:00 2024 -0700

    Fixing CMS coding rule 1

commit f4bd702
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jun 12 06:28:40 2024 -0700

    Fix typo in T3 code

commit 944652f
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jun 11 01:17:16 2024 +0200

    Keep comment closer to the added task object

    Co-authored-by: Slava Krutelyov <[email protected]>

commit f555485
Merge: 314e95d 0829926
Author: Slava Krutelyov <[email protected]>
Date:   Mon Jun 10 14:41:22 2024 -0700

    Merge pull request #37 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_TrackLooperPR408

    Make compilation flags for duplicate cleaning and triplet pLSs into runtime flags (TrackLooper PR#408 + cmssw PR#31)

commit 85682e8
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 10 09:08:42 2024 -0700

    Resolving PR comments LST folder

commit 0829926
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 7 18:36:46 2024 -0700

    Code checks and format

commit 4747b41
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 7 16:53:38 2024 -0700

    Make compilation flags for duplicate cleaning and triplet pLSs into runtime flags (TrackLooper PR#408 + cmssw PR#31)

commit 314e95d
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jun 6 16:51:30 2024 -0700

    code-format

commit 9f697fd
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jun 5 16:39:31 2024 -0700

    put lstModulesDevESProducer on a dummy visible task to bypass the module creation

commit e9733d4
Author: Manos Vourliotis <[email protected]>
Date:   Thu Jun 6 14:58:08 2024 -0700

    Remove outdated files

commit f1dee27
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jun 5 09:33:05 2024 -0400

    Truncate git logs to 100 commits

commit ee1e94e
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jun 5 09:32:32 2024 -0400

    Fixed standalone build

commit 0edc116
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jun 5 15:00:16 2024 -0700

    Update directory for LST data files

commit 7c6bcfa
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 3 10:16:56 2024 -0700

    Add two-iteration,tracking-only LST workflows, both on CPU and GPU

commit 7bc53be
Author: Andres Rios Tascon <[email protected]>
Date:   Fri May 31 14:21:58 2024 -0400

    Added RecoTracker/LST package

    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Slava Krutelyov <[email protected]>

commit 0cf5c03
Author: Andres Rios Tascon <[email protected]>
Date:   Fri May 31 14:19:46 2024 -0400

    Added RecoTracker/LSTCore package

    Co-authored-by: Tres Reid <[email protected]>
    Co-authored-by: Philip Chang <[email protected]>
    Co-authored-by: Gavin Niendorf <[email protected]>
    Co-authored-by: YonsiG <[email protected]>
    Co-authored-by: Balaji Sathia Narayanan <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Slava Krutelyov <[email protected]>
    Co-authored-by: Jonathan Guiang <[email protected]>
    Co-authored-by: Bei Wang <[email protected]>

Co-authored-by: Tres Reid <[email protected]>
Co-authored-by: Philip Chang <[email protected]>
Co-authored-by: Gavin Niendorf <[email protected]>
Co-authored-by: YonsiG <[email protected]>
Co-authored-by: Balaji Sathia Narayanan <[email protected]>
Co-authored-by: Manos Vourliotis <[email protected]>
Co-authored-by: Slava Krutelyov <[email protected]>
Co-authored-by: Jonathan Guiang <[email protected]>
Co-authored-by: Bei Wang <[email protected]>
  • Loading branch information
@ariostas @tresreid
@sgnoohc @GNiendorf @YonsiG @bsathian @VourMa @slava77 @beiwang2003
10 people committed Nov 13, 2024
1 parent 036340d commit 1c51f23
Show file tree
Hide file tree
Showing 145 changed files with 42,755 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Configuration/ProcessModifiers/python/trackingIters01_cff.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

# This modifier sets the iterative tracking to use a minimal set of iterations, first two
trackingIters01 = cms.Modifier()
5 changes: 5 additions & 0 deletions Configuration/ProcessModifiers/python/trackingLST_cff.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

# This modifier sets the LST (Phase-2 line segment tracking) used for track building
trackingLST = cms.Modifier()

2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ The offsets currently in use are:
* 0.7: trackingMkFit modifier
* 0.701: DisplacedRegionalStep tracking iteration for Run-3
* 0.702: trackingMkFit modifier for Phase-2 (initialStep only)
* 0.703: LST tracking, initialStep+HighPtTripletStep only, on CPU
* 0.704: LST tracking, initialStep+HighPtTripletStep only, on GPU
* 0.75: HLT phase-2 timing menu
* 0.751: HLT phase-2 timing menu Alpaka variant
* 0.752: HLT phase-2 timing menu ticl_v5 variant
Expand Down
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_Run4.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
numWFIB.extend([31234.0]) #Run4D114
numWFIB.extend([32034.0]) #Run4D115

# Temporary placement for LST workflow to workaround PR conflicts - to be formatted and placed in an upcoming PR
numWFIB.extend([24834.703,24834.704]) #2026D98 LST tracking (initialStep+HighPtTripletStep only): CPU, GPU

#Additional sample for short matrix and IB
#Default Phase-2 Det NoPU
numWFIB.extend([prefixDet+34.911]) #DD4hep XML
Expand Down
50 changes: 50 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,56 @@ def condition_(self, fragment, stepList, key, hasHarvest):
'--procModifiers': 'trackingMkFitCommon,trackingMkFitInitialStep'
}

# LST on CPU, initialStep+highPtTripletStep-only tracking-only
class UpgradeWorkflow_lstOnCPUIters01TrackingOnly(UpgradeWorkflowTracking):
def setup__(self, step, stepName, stepDict, k, properties):
if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, stepDict[step][k]])
elif 'ALCA' in step: stepDict[stepName][k] = None
def condition_(self, fragment, stepList, key, hasHarvest):
return ('Run4' in key)
upgradeWFs['lstOnCPUIters01TrackingOnly'] = UpgradeWorkflow_lstOnCPUIters01TrackingOnly(
steps = [
'RecoGlobal',
'HARVESTGlobal',
# Add ALCA steps explicitly, so that they can be properly removed
'ALCA',
'ALCAPhase2'
],
PU = [],
suffix = '_lstOnCPUIters01TrackingOnly',
offset = 0.703,
)
upgradeWFs['lstOnCPUIters01TrackingOnly'].step3 = upgradeWFs['trackingOnly'].step3 | {
'--procModifiers': 'trackingIters01,trackingLST',
'--accelerators' : 'cpu'
}

# LST on GPU, initialStep+highPtTripletStep-only tracking-only
class UpgradeWorkflow_lstOnGPUIters01TrackingOnly(UpgradeWorkflowTracking):
def setup__(self, step, stepName, stepDict, k, properties):
if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, stepDict[step][k]])
elif 'ALCA' in step: stepDict[stepName][k] = None
def condition_(self, fragment, stepList, key, hasHarvest):
return ('Run4' in key)
upgradeWFs['lstOnGPUIters01TrackingOnly'] = UpgradeWorkflow_lstOnGPUIters01TrackingOnly(
steps = [
'RecoGlobal',
'HARVESTGlobal',
# Add ALCA steps explicitly, so that they can be properly removed
'ALCA',
'ALCAPhase2'
],
PU = [],
suffix = '_lstOnGPUIters01TrackingOnly',
offset = 0.704,
)
upgradeWFs['lstOnGPUIters01TrackingOnly'].step3 = upgradeWFs['trackingOnly'].step3 | {
'--procModifiers': 'trackingIters01,trackingLST',
'--accelerators' : 'gpu-*'
}

#DeepCore seeding for JetCore iteration workflow
class UpgradeWorkflow_seedingDeepCore(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
Expand Down
10 changes: 10 additions & 0 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@
oldClusterRemovalInfo = 'detachedQuadStepClusters',
overrideTrkQuals = 'detachedQuadStepSelector:detachedQuadStepTrk'
))
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(convClusters,
trajectories = "highPtTripletStepTracks",
oldClusterRemovalInfo = "highPtTripletStepClusters",
overrideTrkQuals = "highPtTripletStepSelector:highPtTripletStep"
)
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
(trackingIters01 & trackingPhase2PU140 & trackingLST).toModify(convClusters,
overrideTrkQuals = ""
)

_convLayerPairsStripOnlyLayers = ['TIB1+TID1_pos',
'TIB1+TID1_neg',
Expand Down
6 changes: 6 additions & 0 deletions RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
ttrhBuilderName = "WithAngleAndTemplate",
chi2EstimatorName = "duplicateTrackCandidatesChi2Est"
)
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(duplicateTrackCandidates, source = "earlyGeneralTracks")

import RecoTracker.TrackProducer.TrackProducer_cfi
mergedDuplicateTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
Expand Down Expand Up @@ -44,6 +46,10 @@
candidateSource = "duplicateTrackCandidates:candidates",
candidateComponents = "duplicateTrackCandidates:candidateMap"
)
trackingIters01.toModify(generalTracks,
originalSource = "earlyGeneralTracks",
originalMVAVals = "earlyGeneralTracks:MVAValues"
)

generalTracksTask = cms.Task(
duplicateTrackCandidates,
Expand Down
20 changes: 20 additions & 0 deletions RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ def _extend_displacedGeneral(x):
makeReKeyedSeeds = cms.untracked.bool(False)
)
)
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(earlyGeneralTracks,
TrackProducers = ['initialStepTracks', 'highPtTripletStepTracks'],
hasSelector = [1,1],
indivShareFrac = [1,0.16],
selectedTrackQuals = ['initialStepSelector:initialStep',
'highPtTripletStepSelector:highPtTripletStep'
],
setsToMerge = {0: dict(tLists = [0,1])}
)
from Configuration.ProcessModifiers.vectorHits_cff import vectorHits
def _extend_pixelLess(x):
x.TrackProducers += ['pixelLessStepTracks']
Expand All @@ -118,3 +128,13 @@ def _extend_pixelLess(x):
x.setsToMerge[0].tLists += [6]
(trackingPhase2PU140 & vectorHits).toModify(earlyGeneralTracks, _extend_pixelLess)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
(trackingPhase2PU140 & trackingLST).toModify(earlyGeneralTracks,
TrackProducers = ['highPtTripletStepLSTpTracks', 'highPtTripletStepLSTT5Tracks'],
hasSelector = [1,0],
indivShareFrac = [0.1,0.1],
selectedTrackQuals = ['highPtTripletStepSelector:highPtTripletStep',
'highPtTripletStepSelectorLSTT5:highPtTripletStepLSTT5'
],
setsToMerge = {0: dict(tLists = [0,1])}
)
56 changes: 56 additions & 0 deletions RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@
phase2clustersToSkip = 'highPtTripletStepClusters'
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from RecoTracker.LST.lstOutputConverter_cfi import lstOutputConverter as _lstOutputConverter
(trackingPhase2PU140 & trackingLST).toReplaceWith(highPtTripletStepTrackCandidates, _lstOutputConverter.clone())

#For FastSim phase1 tracking
import FastSimulation.Tracking.TrackCandidateProducer_cfi
_fastSim_highPtTripletStepTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone(
Expand All @@ -280,6 +284,25 @@
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
phase2_timing_layer.toModify(highPtTripletStepTracks, TrajectoryInEvent = True)

highPtTripletStepLSTpTracks = highPtTripletStepTracks.clone(
src = 'highPtTripletStepTrackCandidates:pTCsLST'
)
highPtTripletStepLSTT5Tracks = highPtTripletStepTracks.clone(
src = 'highPtTripletStepTrackCandidates:t5TCsLST'
)
_highPtTripletStepTracks_LST = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
TrackProducers = ['highPtTripletStepLSTpTracks',
'highPtTripletStepLSTT5Tracks'],
hasSelector = [1,0],
indivShareFrac = [0.1,0.1],
selectedTrackQuals = ['highPtTripletStepSelector:highPtTripletStep',
'highPtTripletStepSelectorLSTT5:highPtTripletStepLSTT5'],
copyExtras = True,
copyMVA = False,
setsToMerge = [cms.PSet( tLists=cms.vint32(0,1), pQual=cms.bool(True) )]
)
(trackingPhase2PU140 & trackingLST).toReplaceWith(highPtTripletStepTracks, _highPtTripletStepTracks_LST)

# Final selection
from RecoTracker.FinalTrackSelectors.TrackMVAClassifierPrompt_cfi import *
highPtTripletStep = TrackMVAClassifierPrompt.clone(
Expand Down Expand Up @@ -357,6 +380,28 @@
from Configuration.ProcessModifiers.vectorHits_cff import vectorHits
vectorHits.toModify(highPtTripletStepSelector.trackSelectors[2], minNumberLayers = 3, minNumber3DLayers = 3, d0_par1 = ( 0.5, 4.0 ), dz_par1 = ( 0.6, 4.0 ))

(trackingPhase2PU140 & trackingLST).toModify(highPtTripletStepSelector, src = 'highPtTripletStepLSTpTracks')
# Passthrough selector to satisfy the TrackListMerger requirement for selector values
highPtTripletStepSelectorLSTT5 = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone(
src = 'highPtTripletStepLSTT5Tracks',
trackSelectors = [
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'highPtTripletStepLSTT5Loose',
minHitsToBypassChecks = 0
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'highPtTripletStepLSTT5Tight',
preFilterName = 'highPtTripletStepLSTT5Loose',
minHitsToBypassChecks = 0
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'highPtTripletStepLSTT5',
preFilterName = 'highPtTripletStepLSTT5Tight',
minHitsToBypassChecks = 0
),
] #end of vpset
) #end of clone

# Final sequence
HighPtTripletStepTask = cms.Task(highPtTripletStepClusters,
highPtTripletStepSeedLayers,
Expand All @@ -378,6 +423,17 @@
_HighPtTripletStep_Phase2PU140 = cms.Sequence(_HighPtTripletStepTask_Phase2PU140)
trackingPhase2PU140.toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_Phase2PU140)

_HighPtTripletStepTask_LST = HighPtTripletStepTask.copy()
from RecoLocalTracker.Phase2TrackerRecHits.Phase2TrackerRecHits_cfi import siPhase2RecHits
from RecoTracker.LST.lstSeedTracks_cff import lstInitialStepSeedTracks,lstHighPtTripletStepSeedTracks
from RecoTracker.LST.lstPixelSeedInputProducer_cfi import lstPixelSeedInputProducer
from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import lstPhase2OTHitsInputProducer
from RecoTracker.LST.lstProducerTask_cff import *

_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer,
lstProducerTask, highPtTripletStepLSTpTracks, highPtTripletStepLSTT5Tracks, highPtTripletStepSelectorLSTT5)
(trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST)

# fast tracking mask producer
from FastSimulation.Tracking.FastTrackerRecHitMaskProducer_cfi import maskProducerFromClusterRemover
highPtTripletStepMasks = maskProducerFromClusterRemover(highPtTripletStepClusters)
Expand Down
3 changes: 3 additions & 0 deletions RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
for _eraName, _postfix, _era in _cfg.nonDefaultEras():
_era.toReplaceWith(lowPtQuadStepClusters, _cfg.clusterRemoverForIter('LowPtQuadStep', _eraName, _postfix))

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
# with LST, this is the first iteration with proper cluster masking
trackingLST.toModify(lowPtQuadStepClusters, oldClusterRemovalInfo = "")

# SEEDING LAYERS
import RecoTracker.TkSeedingLayers.PixelLayerQuadruplets_cfi
Expand Down
17 changes: 12 additions & 5 deletions RecoTracker/IterativeTracking/python/iterativeTkConfig.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,20 @@

_iterations_trackingPhase1.append('JetCoreRegionalStep')

_iterations_trackingPhase2PU140 = [
_iterations_trackingPhase2PU140_VS = cms.PSet(names = cms.vstring(
"InitialStep",
"HighPtTripletStep",
"LowPtQuadStep",
"LowPtTripletStep",
"DetachedQuadStep",
"PixelPairStep",
]
))
from Configuration.ProcessModifiers.vectorHits_cff import vectorHits
vectorHits.toModify(_iterations_trackingPhase2PU140, func=lambda x: x.append('PixelLessStep'))
vectorHits.toModify(_iterations_trackingPhase2PU140_VS.names, func=lambda x: x.append('PixelLessStep'))
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(_iterations_trackingPhase2PU140_VS, names = ["InitialStep", "HighPtTripletStep"])
# apply all procModifiers before this
_iterations_trackingPhase2PU140 = _iterations_trackingPhase2PU140_VS.names.value()

from Configuration.ProcessModifiers.jetCoreInPhase2_cff import jetCoreInPhase2
jetCoreInPhase2.toModify(_iterations_trackingPhase2PU140, func=lambda x: x.append('JetCoreRegionalStep'))
Expand All @@ -76,10 +80,13 @@
"MuonSeededStepOutIn",
]
#Phase2
_iterations_muonSeeded_trackingPhase2PU140 = [
_iterations_muonSeeded_trackingPhase2PU140_VS = cms.PSet(names = cms.vstring(
"MuonSeededStepInOut",
"MuonSeededStepOutIn",
]
))
trackingIters01.toModify(_iterations_muonSeeded_trackingPhase2PU140_VS, names = [])
_iterations_muonSeeded_trackingPhase2PU140 = _iterations_muonSeeded_trackingPhase2PU140_VS.names.value()

_multipleSeedProducers = {
"MixedTripletStep": ["A", "B"],
"TobTecStep": ["Pair", "Tripl"],
Expand Down
9 changes: 9 additions & 0 deletions RecoTracker/LST/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<use name="DataFormats/Common"/>
<use name="alpaka"/>
<use name="DataFormats/TrackerRecHit2D"/>
<use name="HeterogeneousCore/AlpakaInterface"/>
<use name="RecoTracker/LSTCore"/>
<flags ALPAKA_BACKENDS="1"/>
<export>
<lib name="1"/>
</export>
40 changes: 40 additions & 0 deletions RecoTracker/LST/interface/LSTOutput.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#ifndef RecoTracker_LST_interface_LSTOutput_h
#define RecoTracker_LST_interface_LSTOutput_h

#include <memory>
#include <vector>

#include "RecoTracker/LSTCore/interface/Common.h"

class LSTOutput {
public:
LSTOutput() = default;
LSTOutput(std::vector<std::vector<unsigned int>> const hitIdx,
std::vector<unsigned int> const len,
std::vector<int> const seedIdx,
std::vector<short> const trackCandidateType)
: hitIdx_(std::move(hitIdx)),
len_(std::move(len)),
seedIdx_(std::move(seedIdx)),
trackCandidateType_(std::move(trackCandidateType)) {}

using LSTTCType = lst::LSTObjType;

// Hit indices of each of the LST track candidates.
std::vector<std::vector<unsigned int>> const& hitIdx() const { return hitIdx_; }
// Number of hits of each of the LST track candidates.
std::vector<unsigned int> const& len() const { return len_; }
// Index of the pixel track associated to each of the LST track candidates.
// If not associated to a pixel track, which is the case for T5s, it defaults to -1.
std::vector<int> const& seedIdx() const { return seedIdx_; }
// LSTTCType from RecoTracker/LSTCore/interface/Common.h
std::vector<short> const& trackCandidateType() const { return trackCandidateType_; }

private:
std::vector<std::vector<unsigned int>> hitIdx_;
std::vector<unsigned int> len_;
std::vector<int> seedIdx_;
std::vector<short> trackCandidateType_;
};

#endif
33 changes: 33 additions & 0 deletions RecoTracker/LST/interface/LSTPhase2OTHitsInput.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#ifndef RecoTracker_LST_interface_LSTPhase2OTHitsInput_h
#define RecoTracker_LST_interface_LSTPhase2OTHitsInput_h

#include <memory>
#include <vector>

#include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h"

class LSTPhase2OTHitsInput {
public:
LSTPhase2OTHitsInput() = default;
LSTPhase2OTHitsInput(std::vector<unsigned int> const detId,
std::vector<float> const x,
std::vector<float> const y,
std::vector<float> const z,
std::vector<TrackingRecHit const*> const hits)
: detId_(std::move(detId)), x_(std::move(x)), y_(std::move(y)), z_(std::move(z)), hits_(std::move(hits)) {}

std::vector<unsigned int> const& detId() const { return detId_; }
std::vector<float> const& x() const { return x_; }
std::vector<float> const& y() const { return y_; }
std::vector<float> const& z() const { return z_; }
std::vector<TrackingRecHit const*> const& hits() const { return hits_; }

private:
std::vector<unsigned int> detId_;
std::vector<float> x_;
std::vector<float> y_;
std::vector<float> z_;
std::vector<TrackingRecHit const*> hits_;
};

#endif
Loading

0 comments on commit 1c51f23

Please sign in to comment.