From 0384b1640d3d615e61ebd5dc5587fa55ff52d21e Mon Sep 17 00:00:00 2001 From: cvarni <carlo.varni@cern.ch> Date: Mon, 17 Mar 2025 20:14:57 +0100 Subject: [PATCH] do not propagate on HGTD unless we need it --- .../python/ActsTrackFindingConfig.py | 7 + .../share/ActsCheckObjectCounts.ref | 128 ++++++++--------- .../share/ActsCheckObjectCountsCached.ref | 134 +++++++++--------- .../src/TrackFindingAlg.cxx | 1 + .../src/TrackFindingAlg.h | 2 + 5 files changed, 141 insertions(+), 131 deletions(-) diff --git a/Tracking/Acts/ActsConfig/python/ActsTrackFindingConfig.py b/Tracking/Acts/ActsConfig/python/ActsTrackFindingConfig.py index 0cb929bbbbb8..35ccddc2ed0e 100644 --- a/Tracking/Acts/ActsConfig/python/ActsTrackFindingConfig.py +++ b/Tracking/Acts/ActsConfig/python/ActsTrackFindingConfig.py @@ -62,6 +62,13 @@ def ActsMainTrackFindingAlgCfg(flags, acc.merge( ActsDetectorElementToActsGeometryIdMappingAlgCfg(flags) ) kwargs.setdefault('DetectorElementToActsGeometryIdMapKey', 'DetectorElementToActsGeometryIdMap') + # Remove HGTD Volumes from the propagation unless we need it + if not flags.Acts.useHGTDClusterInTrackFinding: + # HGTD has volume id: + # 2 for negative endcap + # 25 for positive endcap + kwargs.setdefault('EndOfTheWorldVolumeIds', [2, 25]) + # Seed labels and collections. # These 3 lists must match element for element, reversed if flags.Acts.useStripSeedsFirst is True. # Maybe it is best to start with strips where the occupancy is lower. diff --git a/Tracking/Acts/ActsConfig/share/ActsCheckObjectCounts.ref b/Tracking/Acts/ActsConfig/share/ActsCheckObjectCounts.ref index 6066bdb7726e..6865abfd6e7f 100644 --- a/Tracking/Acts/ActsConfig/share/ActsCheckObjectCounts.ref +++ b/Tracking/Acts/ActsConfig/share/ActsCheckObjectCounts.ref @@ -35,63 +35,63 @@ ActsTrackFindingAlg INFO statistic |-----------------------------------|------------|------------|------------| | Input seeds | 123542 | 25844 | 149386 | | No track parameters | 0 | 0 | 0 | -| Used seeds | 77712 | 16369 | 94081 | -| Cannot find track | 63038 | 12483 | 75521 | -| Duplicate seeds | 45830 | 9475 | 55305 | +| Used seeds | 77178 | 16369 | 93547 | +| Cannot find track | 61182 | 12456 | 73638 | +| Duplicate seeds | 46364 | 9475 | 55839 | | Initial param estimation failed | 0 | 0 | 0 | -| CKF tracks | 14674 | 3886 | 18560 | +| CKF tracks | 15996 | 3913 | 19909 | | Rejected refined parameters | 0 | 0 | 0 | -| selected tracks | 13260 | 818 | 14078 | -| Stopped tracks reaching max holes | 60651 | 11966 | 72617 | +| selected tracks | 13461 | 818 | 14279 | +| Stopped tracks reaching max holes | 58814 | 11945 | 70759 | | Seeds with more than one branch | 0 | 0 | 0 | | Tracks failing second CKF | 8 | 195 | 203 | -| Stopped tracks below pT cut | 2387 | 517 | 2904 | +| Stopped tracks below pT cut | 2368 | 511 | 2879 | | Stopped tracks above max eta | 0 | 0 | 0 | -| Total shared hits | 91821 | 18315 | 110136 | +| Total shared hits | 93680 | 18315 | 111995 | |-----------------------------------|------------|------------|------------| ActsTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------|------------| | | PPP | SSS | ALL | |------------------------------------------|------------|------------|------------| -| failed / seeds | 0.510256 | 0.483013 | 0.505543 | -| duplication / seeds | 0.370967 | 0.366623 | 0.370215 | +| failed / seeds | 0.495232 | 0.481969 | 0.492938 | +| duplication / seeds | 0.375289 | 0.366623 | 0.37379 | | Rejected refined params / seeds | 0 | 0 | 0 | -| selected / CKF tracks | 0.903639 | 0.210499 | 0.758513 | -| selected tracks / used seeds | 0.17063 | 0.0499725 | 0.149637 | +| selected / CKF tracks | 0.841523 | 0.209047 | 0.717213 | +| selected tracks / used seeds | 0.174415 | 0.0499725 | 0.15264 | | branched tracks / used seeds | 0 | 0 | 0 | -| no 2nd CKF / CKF tracks | 0.000545182 | 0.0501801 | 0.0109375 | -| shared hits / CKF tracks | 6.25739 | 4.71307 | 5.93405 | +| no 2nd CKF / CKF tracks | 0.000500125 | 0.0498339 | 0.0101964 | +| shared hits / CKF tracks | 5.85646 | 4.68055 | 5.62535 | |------------------------------------------|------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.88985 | 0.115681 | 0.708434 | | 0.5- 1.0 | 0.910973 | 0.242424 | 0.732423 | | 1.0- 1.5 | 0.884882 | 0.222798 | 0.6952 | -| 1.5- 2.0 | 0.791143 | 0.216752 | 0.546081 | -| 2.0- 2.5 | 0.943948 | 0.214772 | 0.697537 | -| 2.5- 3.0 | 0.8824 | 0 | 0.8824 | -| 3.0- 3.5 | 0.943727 | 0 | 0.943727 | -| 3.5-+inf | 0.963062 | 0 | 0.963062 | +| 1.5- 2.0 | 0.787269 | 0.216117 | 0.543865 | +| 2.0- 2.5 | 0.939931 | 0.210276 | 0.69111 | +| 2.5- 3.0 | 0.672506 | 0 | 0.672306 | +| 3.0- 3.5 | 0.837873 | 0 | 0.837873 | +| 3.5-+inf | 0.950452 | 0 | 0.950452 | |------------------------------------------|------------|------------|------------| ActsPrdAssociationAlg INFO Prd Map statistics |-----------------------|------------| -| N. Tracks | 9563 | -| N. Pixel Measurements | 102670 | -| N. Strip Measurements | 40107 | +| N. Tracks | 9672 | +| N. Pixel Measurements | 104000 | +| N. Strip Measurements | 40117 | | N. Hgtd Measurements | 0 | |-----------------------|------------| ActsLargeRadiusPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 1062974 | +| Outputs | 1061649 | |---------|------------| ActsLargeRadiusStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1081478 | -| Outputs | 1041405 | +| Outputs | 1041395 | |---------|------------| ActsLargeRadiusStripSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 325456 | -| Outputs | 303559 | +| Outputs | 303557 | |---------|------------| ActsLargeRadiusStripOv...pSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| @@ -100,7 +100,7 @@ ActsLargeRadiusStripOv...pSpacePointPreparationAlg INFO Data Prep |---------|------------| ActsLargeRadiusStripSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 398123 | +| Spacepoints | 398121 | | Seeds | 10146 | |-------------|------------| ActsLargeRadiusTrackFindingAlg INFO statistics @@ -110,13 +110,13 @@ ActsLargeRadiusTrackFindingAlg INFO statistic | Input seeds | 10146 | 10146 | | No track parameters | 0 | 0 | | Used seeds | 9922 | 9922 | -| Cannot find track | 8965 | 8965 | +| Cannot find track | 8947 | 8947 | | Duplicate seeds | 224 | 224 | | Initial param estimation failed | 0 | 0 | -| CKF tracks | 957 | 957 | +| CKF tracks | 975 | 975 | | Rejected refined parameters | 0 | 0 | | selected tracks | 132 | 132 | -| Stopped tracks reaching max holes | 6993 | 6993 | +| Stopped tracks reaching max holes | 6975 | 6975 | | Seeds with more than one branch | 0 | 0 | | Tracks failing second CKF | 30 | 30 | | Stopped tracks below pT cut | 1972 | 1972 | @@ -127,20 +127,20 @@ ActsLargeRadiusTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------| | | SSS | ALL | |------------------------------------------|------------|------------| -| failed / seeds | 0.883599 | 0.883599 | +| failed / seeds | 0.881825 | 0.881825 | | duplication / seeds | 0.0220777 | 0.0220777 | | Rejected refined params / seeds | 0 | 0 | -| selected / CKF tracks | 0.137931 | 0.137931 | +| selected / CKF tracks | 0.135385 | 0.135385 | | selected tracks / used seeds | 0.0133038 | 0.0133038 | | branched tracks / used seeds | 0 | 0 | -| no 2nd CKF / CKF tracks | 0.031348 | 0.031348 | -| shared hits / CKF tracks | 0.810867 | 0.810867 | +| no 2nd CKF / CKF tracks | 0.0307692 | 0.0307692 | +| shared hits / CKF tracks | 0.795897 | 0.795897 | |------------------------------------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.169014 | 0.169014 | | 0.5- 1.0 | 0.228916 | 0.228916 | | 1.0- 1.5 | 0.204301 | 0.204301 | | 1.5- 2.0 | 0.13948 | 0.13948 | -| 2.0- 2.5 | 0.0801394 | 0.0801394 | +| 2.0- 2.5 | 0.0754098 | 0.0754098 | | 2.5- 3.0 | 0 | 0 | | 3.0- 3.5 | 0 | 0 | | 3.5-+inf | 0 | 0 | @@ -155,7 +155,7 @@ ActsLargeRadiusPrdAssociationAlg INFO Prd Map s ActsConversionPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 27119 | +| Outputs | 27109 | |---------|------------| ActsConversionStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| @@ -224,22 +224,22 @@ ActsConversionPrdAssociationAlg INFO Prd Map s ActsLowPtPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 1062494 | +| Outputs | 1061169 | |---------|------------| ActsLowPtStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1081478 | -| Outputs | 1040471 | +| Outputs | 1040461 | |---------|------------| ActsLowPtPixelSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 1062494 | +| Outputs | 1061169 | |---------|------------| ActsLowPtStripSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 325456 | -| Outputs | 303062 | +| Outputs | 303060 | |---------|------------| ActsLowPtStripOverlapSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| @@ -248,60 +248,60 @@ ActsLowPtStripOverlapSpacePointPreparationAlg INFO Data Prep |---------|------------| ActsLowPtPixelSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 1062494 | -| Seeds | 46736 | +| Spacepoints | 1061169 | +| Seeds | 46431 | |-------------|------------| ActsLowPtStripSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 397452 | +| Spacepoints | 397450 | | Seeds | 9562 | |-------------|------------| ActsLowPtTrackFindingAlg INFO statistics |-----------------------------------|------------|------------|------------| | All eta | PPP | SSS | ALL | |-----------------------------------|------------|------------|------------| -| Input seeds | 46736 | 9562 | 56298 | +| Input seeds | 46431 | 9562 | 55993 | | No track parameters | 0 | 0 | 0 | -| Used seeds | 45928 | 9195 | 55123 | -| Cannot find track | 44810 | 7450 | 52260 | -| Duplicate seeds | 808 | 367 | 1175 | +| Used seeds | 45619 | 9195 | 54814 | +| Cannot find track | 43527 | 7429 | 50956 | +| Duplicate seeds | 812 | 367 | 1179 | | Initial param estimation failed | 0 | 0 | 0 | -| CKF tracks | 1118 | 1745 | 2863 | +| CKF tracks | 2092 | 1766 | 3858 | | Rejected refined parameters | 0 | 0 | 0 | -| selected tracks | 619 | 44 | 663 | -| Stopped tracks reaching max holes | 44348 | 7408 | 51756 | +| selected tracks | 621 | 44 | 665 | +| Stopped tracks reaching max holes | 43073 | 7390 | 50463 | | Seeds with more than one branch | 0 | 0 | 0 | | Tracks failing second CKF | 0 | 69 | 69 | -| Stopped tracks below pT cut | 462 | 42 | 504 | +| Stopped tracks below pT cut | 454 | 39 | 493 | | Stopped tracks above max eta | 0 | 0 | 0 | -| Total shared hits | 3822 | 462 | 4284 | +| Total shared hits | 3844 | 462 | 4306 | |-----------------------------------|------------|------------|------------| ActsLowPtTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------|------------| | | PPP | SSS | ALL | |------------------------------------------|------------|------------|------------| -| failed / seeds | 0.95879 | 0.779126 | 0.928275 | -| duplication / seeds | 0.0172886 | 0.0383811 | 0.0208711 | +| failed / seeds | 0.937456 | 0.776929 | 0.910042 | +| duplication / seeds | 0.0174883 | 0.0383811 | 0.0210562 | | Rejected refined params / seeds | 0 | 0 | 0 | -| selected / CKF tracks | 0.553667 | 0.0252149 | 0.231575 | -| selected tracks / used seeds | 0.0134776 | 0.00478521 | 0.0120276 | +| selected / CKF tracks | 0.296845 | 0.0249151 | 0.172369 | +| selected tracks / used seeds | 0.0136127 | 0.00478521 | 0.0121319 | | branched tracks / used seeds | 0 | 0 | 0 | -| no 2nd CKF / CKF tracks | 0 | 0.0395415 | 0.0241006 | -| shared hits / CKF tracks | 3.4186 | 0.264756 | 1.49633 | +| no 2nd CKF / CKF tracks | 0 | 0.0390713 | 0.0178849 | +| shared hits / CKF tracks | 1.83748 | 0.261608 | 1.11612 | |------------------------------------------|------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.82243 | 0 | 0.353414 | | 0.5- 1.0 | 0.955556 | 0.0217391 | 0.390351 | | 1.0- 1.5 | 0.957143 | 0.0769231 | 0.459627 | -| 1.5- 2.0 | 0.919255 | 0.0376812 | 0.318182 | -| 2.0- 2.5 | 0.0675676 | 0.00168634 | 0.0089955 | -| 2.5- 3.0 | 0.0177778 | 0 | 0.0177778 | -| 3.0- 3.5 | 0.0107527 | 0 | 0.0107527 | -| 3.5-+inf | 0.0746269 | 0 | 0.0746269 | +| 1.5- 2.0 | 0.919255 | 0.0376266 | 0.317868 | +| 2.0- 2.5 | 0.0617284 | 0.00163399 | 0.00865801 | +| 2.5- 3.0 | 0.00525762 | 0 | 0.0052521 | +| 3.0- 3.5 | 0.00952381 | 0 | 0.00952381 | +| 3.5-+inf | 0.0465116 | 0 | 0.0465116 | |------------------------------------------|------------|------------|------------| ActsLowPtPrdAssociationAlg INFO Prd Map statistics |-----------------------|------------| -| N. Tracks | 507 | -| N. Pixel Measurements | 3801 | +| N. Tracks | 508 | +| N. Pixel Measurements | 3807 | | N. Strip Measurements | 4219 | | N. Hgtd Measurements | 0 | |-----------------------|------------| diff --git a/Tracking/Acts/ActsConfig/share/ActsCheckObjectCountsCached.ref b/Tracking/Acts/ActsConfig/share/ActsCheckObjectCountsCached.ref index 88ec530d3f00..84b64003e5d1 100644 --- a/Tracking/Acts/ActsConfig/share/ActsCheckObjectCountsCached.ref +++ b/Tracking/Acts/ActsConfig/share/ActsCheckObjectCountsCached.ref @@ -60,47 +60,47 @@ ActsTrackFindingAlg INFO statistic |-----------------------------------|------------|------------|------------| | Input seeds | 123542 | 25844 | 149386 | | No track parameters | 0 | 0 | 0 | -| Used seeds | 77712 | 16370 | 94082 | -| Cannot find track | 63038 | 12483 | 75521 | -| Duplicate seeds | 45830 | 9474 | 55304 | +| Used seeds | 77178 | 16370 | 93548 | +| Cannot find track | 61182 | 12456 | 73638 | +| Duplicate seeds | 46364 | 9474 | 55838 | | Initial param estimation failed | 0 | 0 | 0 | -| CKF tracks | 14674 | 3887 | 18561 | +| CKF tracks | 15996 | 3914 | 19910 | | Rejected refined parameters | 0 | 0 | 0 | -| selected tracks | 13260 | 819 | 14079 | -| Stopped tracks reaching max holes | 60651 | 11966 | 72617 | +| selected tracks | 13461 | 819 | 14280 | +| Stopped tracks reaching max holes | 58814 | 11945 | 70759 | | Seeds with more than one branch | 0 | 0 | 0 | | Tracks failing second CKF | 8 | 195 | 203 | -| Stopped tracks below pT cut | 2387 | 517 | 2904 | +| Stopped tracks below pT cut | 2368 | 511 | 2879 | | Stopped tracks above max eta | 0 | 0 | 0 | -| Total shared hits | 91821 | 18335 | 110156 | +| Total shared hits | 93680 | 18335 | 112015 | |-----------------------------------|------------|------------|------------| ActsTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------|------------| | | PPP | SSS | ALL | |------------------------------------------|------------|------------|------------| -| failed / seeds | 0.510256 | 0.483013 | 0.505543 | -| duplication / seeds | 0.370967 | 0.366584 | 0.370209 | +| failed / seeds | 0.495232 | 0.481969 | 0.492938 | +| duplication / seeds | 0.375289 | 0.366584 | 0.373783 | | Rejected refined params / seeds | 0 | 0 | 0 | -| selected / CKF tracks | 0.903639 | 0.210702 | 0.758526 | -| selected tracks / used seeds | 0.17063 | 0.0500305 | 0.149646 | +| selected / CKF tracks | 0.841523 | 0.209249 | 0.717228 | +| selected tracks / used seeds | 0.174415 | 0.0500305 | 0.152649 | | branched tracks / used seeds | 0 | 0 | 0 | -| no 2nd CKF / CKF tracks | 0.000545182 | 0.0501672 | 0.0109369 | -| shared hits / CKF tracks | 6.25739 | 4.71701 | 5.93481 | +| no 2nd CKF / CKF tracks | 0.000500125 | 0.0498212 | 0.0101959 | +| shared hits / CKF tracks | 5.85646 | 4.68447 | 5.62607 | |------------------------------------------|------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.88985 | 0.115681 | 0.708434 | | 0.5- 1.0 | 0.910973 | 0.242424 | 0.732423 | | 1.0- 1.5 | 0.884882 | 0.222798 | 0.6952 | -| 1.5- 2.0 | 0.791143 | 0.216752 | 0.546081 | -| 2.0- 2.5 | 0.943948 | 0.215534 | 0.697636 | -| 2.5- 3.0 | 0.8824 | 0 | 0.8824 | -| 3.0- 3.5 | 0.943727 | 0 | 0.943727 | -| 3.5-+inf | 0.963062 | 0 | 0.963062 | +| 1.5- 2.0 | 0.787269 | 0.216117 | 0.543865 | +| 2.0- 2.5 | 0.939931 | 0.211027 | 0.69121 | +| 2.5- 3.0 | 0.672506 | 0 | 0.672306 | +| 3.0- 3.5 | 0.837873 | 0 | 0.837873 | +| 3.5-+inf | 0.950452 | 0 | 0.950452 | |------------------------------------------|------------|------------|------------| ActsPrdAssociationAlg INFO Prd Map statistics |-----------------------|------------| -| N. Tracks | 9563 | -| N. Pixel Measurements | 102670 | -| N. Strip Measurements | 40107 | +| N. Tracks | 9672 | +| N. Pixel Measurements | 104000 | +| N. Strip Measurements | 40117 | | N. Hgtd Measurements | 0 | |-----------------------|------------| ActsLargeRadiusPixelClusterizationAlg INFO Clusterization statistics @@ -116,23 +116,23 @@ ActsLargeRadiusStripClusterizationAlg INFO Clusteriz ActsLargeRadiusPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 1062974 | +| Outputs | 1061649 | |---------|------------| ActsLargeRadiusStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1081478 | -| Outputs | 1041405 | +| Outputs | 1041395 | |---------|------------| ActsLargeRadiusStripSpacePointFormationAlg INFO Space Point Formation statistics |----------------------|------------| -| Clusters | 1041405 | +| Clusters | 1041395 | | Space Points | 0 | | Overlap Space Points | 0 | |----------------------|------------| ActsLargeRadiusStripSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 324427 | -| Outputs | 303559 | +| Outputs | 303557 | |---------|------------| ActsLargeRadiusStripOv...pSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| @@ -141,7 +141,7 @@ ActsLargeRadiusStripOv...pSpacePointPreparationAlg INFO Data Prep |---------|------------| ActsLargeRadiusStripSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 398123 | +| Spacepoints | 398121 | | Seeds | 10146 | |-------------|------------| ActsLargeRadiusTrackFindingAlg INFO statistics @@ -151,13 +151,13 @@ ActsLargeRadiusTrackFindingAlg INFO statistic | Input seeds | 10146 | 10146 | | No track parameters | 0 | 0 | | Used seeds | 9922 | 9922 | -| Cannot find track | 8965 | 8965 | +| Cannot find track | 8947 | 8947 | | Duplicate seeds | 224 | 224 | | Initial param estimation failed | 0 | 0 | -| CKF tracks | 957 | 957 | +| CKF tracks | 975 | 975 | | Rejected refined parameters | 0 | 0 | | selected tracks | 132 | 132 | -| Stopped tracks reaching max holes | 6993 | 6993 | +| Stopped tracks reaching max holes | 6975 | 6975 | | Seeds with more than one branch | 0 | 0 | | Tracks failing second CKF | 30 | 30 | | Stopped tracks below pT cut | 1972 | 1972 | @@ -168,20 +168,20 @@ ActsLargeRadiusTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------| | | SSS | ALL | |------------------------------------------|------------|------------| -| failed / seeds | 0.883599 | 0.883599 | +| failed / seeds | 0.881825 | 0.881825 | | duplication / seeds | 0.0220777 | 0.0220777 | | Rejected refined params / seeds | 0 | 0 | -| selected / CKF tracks | 0.137931 | 0.137931 | +| selected / CKF tracks | 0.135385 | 0.135385 | | selected tracks / used seeds | 0.0133038 | 0.0133038 | | branched tracks / used seeds | 0 | 0 | -| no 2nd CKF / CKF tracks | 0.031348 | 0.031348 | -| shared hits / CKF tracks | 0.810867 | 0.810867 | +| no 2nd CKF / CKF tracks | 0.0307692 | 0.0307692 | +| shared hits / CKF tracks | 0.795897 | 0.795897 | |------------------------------------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.169014 | 0.169014 | | 0.5- 1.0 | 0.228916 | 0.228916 | | 1.0- 1.5 | 0.204301 | 0.204301 | | 1.5- 2.0 | 0.13948 | 0.13948 | -| 2.0- 2.5 | 0.0801394 | 0.0801394 | +| 2.0- 2.5 | 0.0754098 | 0.0754098 | | 2.5- 3.0 | 0 | 0 | | 3.0- 3.5 | 0 | 0 | | 3.5-+inf | 0 | 0 | @@ -206,7 +206,7 @@ ActsConversionStripClusterizationAlg INFO Clusteriz ActsConversionPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 30471 | -| Outputs | 27119 | +| Outputs | 27109 | |---------|------------| ActsConversionStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| @@ -291,33 +291,33 @@ ActsLowPtStripClusterizationAlg INFO Clusteriz ActsLowPtPixelClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165578 | -| Outputs | 1062494 | +| Outputs | 1061169 | |---------|------------| ActsLowPtStripClusterPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1081478 | -| Outputs | 1040471 | +| Outputs | 1040461 | |---------|------------| ActsLowPtPixelSpacePointFormationAlg INFO Space Point Formation statistics |--------------|------------| -| Clusters | 1062494 | +| Clusters | 1061169 | | Space Points | 0 | |--------------|------------| ActsLowPtStripSpacePointFormationAlg INFO Space Point Formation statistics |----------------------|------------| -| Clusters | 1040471 | +| Clusters | 1040461 | | Space Points | 0 | | Overlap Space Points | 0 | |----------------------|------------| ActsLowPtPixelSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 1165561 | -| Outputs | 1062494 | +| Outputs | 1061169 | |---------|------------| ActsLowPtStripSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| | Inputs | 324403 | -| Outputs | 303062 | +| Outputs | 303060 | |---------|------------| ActsLowPtStripOverlapSpacePointPreparationAlg INFO Data Prep statistics |---------|------------| @@ -326,60 +326,60 @@ ActsLowPtStripOverlapSpacePointPreparationAlg INFO Data Prep |---------|------------| ActsLowPtPixelSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 1062494 | -| Seeds | 46736 | +| Spacepoints | 1061169 | +| Seeds | 46431 | |-------------|------------| ActsLowPtStripSeedingAlg INFO Seed statistics |-------------|------------| -| Spacepoints | 397452 | +| Spacepoints | 397450 | | Seeds | 9562 | |-------------|------------| ActsLowPtTrackFindingAlg INFO statistics |-----------------------------------|------------|------------|------------| | All eta | PPP | SSS | ALL | |-----------------------------------|------------|------------|------------| -| Input seeds | 46736 | 9562 | 56298 | +| Input seeds | 46431 | 9562 | 55993 | | No track parameters | 0 | 0 | 0 | -| Used seeds | 45928 | 9195 | 55123 | -| Cannot find track | 44810 | 7450 | 52260 | -| Duplicate seeds | 808 | 367 | 1175 | +| Used seeds | 45619 | 9195 | 54814 | +| Cannot find track | 43527 | 7429 | 50956 | +| Duplicate seeds | 812 | 367 | 1179 | | Initial param estimation failed | 0 | 0 | 0 | -| CKF tracks | 1118 | 1745 | 2863 | +| CKF tracks | 2092 | 1766 | 3858 | | Rejected refined parameters | 0 | 0 | 0 | -| selected tracks | 619 | 44 | 663 | -| Stopped tracks reaching max holes | 44348 | 7408 | 51756 | +| selected tracks | 621 | 44 | 665 | +| Stopped tracks reaching max holes | 43073 | 7390 | 50463 | | Seeds with more than one branch | 0 | 0 | 0 | | Tracks failing second CKF | 0 | 69 | 69 | -| Stopped tracks below pT cut | 462 | 42 | 504 | +| Stopped tracks below pT cut | 454 | 39 | 493 | | Stopped tracks above max eta | 0 | 0 | 0 | -| Total shared hits | 3822 | 462 | 4284 | +| Total shared hits | 3844 | 462 | 4306 | |-----------------------------------|------------|------------|------------| ActsLowPtTrackFindingAlg INFO Ratios |------------------------------------------|------------|------------|------------| | | PPP | SSS | ALL | |------------------------------------------|------------|------------|------------| -| failed / seeds | 0.95879 | 0.779126 | 0.928275 | -| duplication / seeds | 0.0172886 | 0.0383811 | 0.0208711 | +| failed / seeds | 0.937456 | 0.776929 | 0.910042 | +| duplication / seeds | 0.0174883 | 0.0383811 | 0.0210562 | | Rejected refined params / seeds | 0 | 0 | 0 | -| selected / CKF tracks | 0.553667 | 0.0252149 | 0.231575 | -| selected tracks / used seeds | 0.0134776 | 0.00478521 | 0.0120276 | +| selected / CKF tracks | 0.296845 | 0.0249151 | 0.172369 | +| selected tracks / used seeds | 0.0136127 | 0.00478521 | 0.0121319 | | branched tracks / used seeds | 0 | 0 | 0 | -| no 2nd CKF / CKF tracks | 0 | 0.0395415 | 0.0241006 | -| shared hits / CKF tracks | 3.4186 | 0.264756 | 1.49633 | +| no 2nd CKF / CKF tracks | 0 | 0.0390713 | 0.0178849 | +| shared hits / CKF tracks | 1.83748 | 0.261608 | 1.11612 | |------------------------------------------|------------|------------|------------| | selected / CKF tracks 0.0- 0.5 | 0.82243 | 0 | 0.353414 | | 0.5- 1.0 | 0.955556 | 0.0217391 | 0.390351 | | 1.0- 1.5 | 0.957143 | 0.0769231 | 0.459627 | -| 1.5- 2.0 | 0.919255 | 0.0376812 | 0.318182 | -| 2.0- 2.5 | 0.0675676 | 0.00168634 | 0.0089955 | -| 2.5- 3.0 | 0.0177778 | 0 | 0.0177778 | -| 3.0- 3.5 | 0.0107527 | 0 | 0.0107527 | -| 3.5-+inf | 0.0746269 | 0 | 0.0746269 | +| 1.5- 2.0 | 0.919255 | 0.0376266 | 0.317868 | +| 2.0- 2.5 | 0.0617284 | 0.00163399 | 0.00865801 | +| 2.5- 3.0 | 0.00525762 | 0 | 0.0052521 | +| 3.0- 3.5 | 0.00952381 | 0 | 0.00952381 | +| 3.5-+inf | 0.0465116 | 0 | 0.0465116 | |------------------------------------------|------------|------------|------------| ActsLowPtPrdAssociationAlg INFO Prd Map statistics |-----------------------|------------| -| N. Tracks | 507 | -| N. Pixel Measurements | 3801 | +| N. Tracks | 508 | +| N. Pixel Measurements | 3807 | | N. Strip Measurements | 4219 | | N. Hgtd Measurements | 0 | |-----------------------|------------| diff --git a/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx b/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx index 63e7c515b9d2..e102b6b728b3 100644 --- a/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx +++ b/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx @@ -439,6 +439,7 @@ namespace ActsTrk Acts::CalibrationContext calContext = Acts::CalibrationContext(); Acts::PropagatorPlainOptions plainOptions{tgContext, mfContext}; + plainOptions.endOfWorldVolumeIds = m_endOfWorldVolumeIds; Acts::PropagatorPlainOptions plainSecondOptions{tgContext, mfContext}; plainOptions.maxSteps = m_maxPropagationStep; diff --git a/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h b/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h index 16205ed2c7c9..15f4c095ba06 100644 --- a/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h +++ b/Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h @@ -176,6 +176,8 @@ namespace ActsTrk Gaudi::Property<bool> m_useDefaultMeasurementSelector{this, "UseDefaultActsMeasurementSelector", true, ""}; + Gaudi::Property<std::vector<std::uint32_t>> m_endOfWorldVolumeIds {this, "EndOfTheWorldVolumeIds", {}, ""}; + struct MeasurementSelectorConfig { std::vector<std::pair<float, float> > m_chi2CutOffOutlier; std::vector<float> m_etaBins; -- GitLab