diff --git a/Rec/Allen/tests/refs/allen_event_loop.ref.detdesc b/Rec/Allen/tests/refs/allen_event_loop.ref.detdesc index f5f005c7f51076029859982ef65e1388231eb5a2..eb38b230ed8056ed27869971038bebddfe71cf64 100644 --- a/Rec/Allen/tests/refs/allen_event_loop.ref.detdesc +++ b/Rec/Allen/tests/refs/allen_event_loop.ref.detdesc @@ -46,26 +46,26 @@ gather_selections INFO Number of counters : 95 | "Hlt1D2KPiAlignmentRate" | 6 | | "Hlt1D2KPiPass" | 21 | | "Hlt1D2KPiRate" | 21 | - | "Hlt1D2KshhPass" | 9 | - | "Hlt1D2KshhRate" | 9 | + | "Hlt1D2KshhPass" | 10 | + | "Hlt1D2KshhRate" | 10 | | "Hlt1D2PiPiPass" | 6 | | "Hlt1D2PiPiRate" | 6 | | "Hlt1DetJpsiToMuMuNegTagLinePass" | 1 | | "Hlt1DetJpsiToMuMuNegTagLineRate" | 1 | - | "Hlt1DiElectronDisplacedPass" | 55 | - | "Hlt1DiElectronDisplacedRate" | 55 | + | "Hlt1DiElectronDisplacedPass" | 53 | + | "Hlt1DiElectronDisplacedRate" | 53 | | "Hlt1DiElectronHighMass_SSPass" | 1 | | "Hlt1DiElectronHighMass_SSRate" | 1 | - | "Hlt1DiElectronLowMass_SS_massSlice1_displacedPass"| 48 | + | "Hlt1DiElectronLowMass_SS_massSlice1_displacedPass"| 50 | | "Hlt1DiElectronLowMass_SS_massSlice1_displacedRate"| 1 | - | "Hlt1DiElectronLowMass_SS_massSlice1_promptPass"| 28 | + | "Hlt1DiElectronLowMass_SS_massSlice1_promptPass"| 27 | | "Hlt1DiElectronLowMass_SS_massSlice1_promptRate"| 2 | | "Hlt1DiElectronLowMass_SS_massSlice2_displacedPass"| 15 | | "Hlt1DiElectronLowMass_SS_massSlice2_promptPass"| 8 | | "Hlt1DiElectronLowMass_SS_massSlice3_displacedPass"| 7 | | "Hlt1DiElectronLowMass_SS_massSlice3_promptPass"| 10 | | "Hlt1DiElectronLowMass_SS_massSlice3_promptRate"| 1 | - | "Hlt1DiElectronLowMass_SS_massSlice4_displacedPass"| 8 | + | "Hlt1DiElectronLowMass_SS_massSlice4_displacedPass"| 7 | | "Hlt1DiElectronLowMass_SS_massSlice4_displacedRate"| 1 | | "Hlt1DiElectronLowMass_SS_massSlice4_promptPass"| 8 | | "Hlt1DiElectronLowMass_massSlice1_displacedPass"| 12 | @@ -78,14 +78,14 @@ gather_selections INFO Number of counters : 95 | "Hlt1DiElectronLowMass_massSlice2_promptRate" | 6 | | "Hlt1DiElectronLowMass_massSlice3_displacedPass"| 6 | | "Hlt1DiElectronLowMass_massSlice3_displacedRate"| 6 | - | "Hlt1DiElectronLowMass_massSlice3_promptPass" | 6 | + | "Hlt1DiElectronLowMass_massSlice3_promptPass" | 5 | | "Hlt1DiElectronLowMass_massSlice3_promptRate" | 1 | | "Hlt1DiElectronLowMass_massSlice4_displacedPass"| 6 | | "Hlt1DiElectronLowMass_massSlice4_displacedRate"| 6 | | "Hlt1DiElectronLowMass_massSlice4_promptPass" | 6 | | "Hlt1DiElectronLowMass_massSlice4_promptRate" | 1 | - | "Hlt1DiMuonDisplacedPass" | 84 | - | "Hlt1DiMuonDisplacedRate" | 84 | + | "Hlt1DiMuonDisplacedPass" | 83 | + | "Hlt1DiMuonDisplacedRate" | 83 | | "Hlt1DiMuonHighMassPass" | 76 | | "Hlt1DiMuonHighMassRate" | 76 | | "Hlt1DiMuonNoIPPass" | 8 | @@ -101,7 +101,7 @@ gather_selections INFO Number of counters : 95 | "Hlt1Dst2D0PiRate" | 5 | | "Hlt1GECPassthroughPass" | 2 | | "Hlt1GECPassthroughRate" | 2 | - | "Hlt1KsToPiPiPass" | 759 | + | "Hlt1KsToPiPiPass" | 764 | | "Hlt1KsToPiPiRate" | 2 | | "Hlt1LambdaLLDetachedTrackPass" | 1 | | "Hlt1LambdaLLDetachedTrackRate" | 1 | @@ -121,23 +121,23 @@ gather_selections INFO Number of counters : 95 | "Hlt1SingleHighPtMuonNoMuIDRate" | 23 | | "Hlt1SingleHighPtMuonPass" | 5 | | "Hlt1SingleHighPtMuonRate" | 5 | - | "Hlt1TrackElectronMVAPass" | 64 | - | "Hlt1TrackElectronMVARate" | 64 | - | "Hlt1TrackMVAPass" | 128 | - | "Hlt1TrackMVARate" | 128 | + | "Hlt1TrackElectronMVAPass" | 63 | + | "Hlt1TrackElectronMVARate" | 63 | + | "Hlt1TrackMVAPass" | 126 | + | "Hlt1TrackMVARate" | 126 | | "Hlt1TrackMuonMVAPass" | 9 | | "Hlt1TrackMuonMVARate" | 9 | | "Hlt1TwoKsPass" | 7 | | "Hlt1TwoKsRate" | 7 | | "Hlt1TwoTrackKsPass" | 32 | | "Hlt1TwoTrackKsRate" | 32 | - | "Hlt1TwoTrackMVAPass" | 303 | - | "Hlt1TwoTrackMVARate" | 303 | + | "Hlt1TwoTrackMVAPass" | 302 | + | "Hlt1TwoTrackMVARate" | 302 | | "Hlt1VeloMicroBiasPass" | 9997 | | "Hlt1VeloMicroBiasRate" | 9 | matching_consolidate_tracks_matc... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "n_long_tracks_matching" | 10000 | 480596 | 48.060 | + | "n_long_tracks_matching" | 10000 | 480662 | 48.066 | pv_beamline_cleanup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "n_PVs" | 10000 | 51728 | 5.1728 | diff --git a/Rec/Allen/tests/refs/allen_event_loop.ref.x86_64_v3-detdesc-opt b/Rec/Allen/tests/refs/allen_event_loop.ref.x86_64_v3-detdesc-opt index 4d8f449b7b0d095e6d7fdeeeb9695d454b09f80a..ef939a8f7f07a061d18e4e63fa8728e11de77642 100644 --- a/Rec/Allen/tests/refs/allen_event_loop.ref.x86_64_v3-detdesc-opt +++ b/Rec/Allen/tests/refs/allen_event_loop.ref.x86_64_v3-detdesc-opt @@ -46,30 +46,30 @@ gather_selections INFO Number of counters : 97 | "Hlt1D2KPiAlignmentRate" | 6 | | "Hlt1D2KPiPass" | 21 | | "Hlt1D2KPiRate" | 21 | - | "Hlt1D2KshhPass" | 7 | - | "Hlt1D2KshhRate" | 7 | + | "Hlt1D2KshhPass" | 8 | + | "Hlt1D2KshhRate" | 8 | | "Hlt1D2PiPiPass" | 6 | | "Hlt1D2PiPiRate" | 6 | | "Hlt1DetJpsiToMuMuNegTagLinePass" | 1 | | "Hlt1DetJpsiToMuMuNegTagLineRate" | 1 | - | "Hlt1DiElectronDisplacedPass" | 54 | - | "Hlt1DiElectronDisplacedRate" | 54 | + | "Hlt1DiElectronDisplacedPass" | 52 | + | "Hlt1DiElectronDisplacedRate" | 52 | | "Hlt1DiElectronHighMass_SSPass" | 1 | | "Hlt1DiElectronHighMass_SSRate" | 1 | - | "Hlt1DiElectronLowMass_SS_massSlice1_displacedPass"| 61 | + | "Hlt1DiElectronLowMass_SS_massSlice1_displacedPass"| 62 | | "Hlt1DiElectronLowMass_SS_massSlice1_displacedRate"| 1 | - | "Hlt1DiElectronLowMass_SS_massSlice1_promptPass"| 57 | + | "Hlt1DiElectronLowMass_SS_massSlice1_promptPass"| 58 | | "Hlt1DiElectronLowMass_SS_massSlice1_promptRate"| 1 | | "Hlt1DiElectronLowMass_SS_massSlice2_displacedPass"| 18 | | "Hlt1DiElectronLowMass_SS_massSlice2_promptPass"| 8 | | "Hlt1DiElectronLowMass_SS_massSlice3_displacedPass"| 7 | | "Hlt1DiElectronLowMass_SS_massSlice3_promptPass"| 10 | | "Hlt1DiElectronLowMass_SS_massSlice3_promptRate"| 1 | - | "Hlt1DiElectronLowMass_SS_massSlice4_displacedPass"| 8 | + | "Hlt1DiElectronLowMass_SS_massSlice4_displacedPass"| 7 | | "Hlt1DiElectronLowMass_SS_massSlice4_displacedRate"| 1 | | "Hlt1DiElectronLowMass_SS_massSlice4_promptPass"| 8 | - | "Hlt1DiElectronLowMass_massSlice1_displacedPass"| 16 | - | "Hlt1DiElectronLowMass_massSlice1_displacedRate"| 16 | + | "Hlt1DiElectronLowMass_massSlice1_displacedPass"| 15 | + | "Hlt1DiElectronLowMass_massSlice1_displacedRate"| 15 | | "Hlt1DiElectronLowMass_massSlice1_promptPass" | 21 | | "Hlt1DiElectronLowMass_massSlice1_promptRate" | 21 | | "Hlt1DiElectronLowMass_massSlice2_displacedPass"| 5 | @@ -78,14 +78,14 @@ gather_selections INFO Number of counters : 97 | "Hlt1DiElectronLowMass_massSlice2_promptRate" | 5 | | "Hlt1DiElectronLowMass_massSlice3_displacedPass"| 6 | | "Hlt1DiElectronLowMass_massSlice3_displacedRate"| 6 | - | "Hlt1DiElectronLowMass_massSlice3_promptPass" | 6 | + | "Hlt1DiElectronLowMass_massSlice3_promptPass" | 5 | | "Hlt1DiElectronLowMass_massSlice3_promptRate" | 1 | | "Hlt1DiElectronLowMass_massSlice4_displacedPass"| 6 | | "Hlt1DiElectronLowMass_massSlice4_displacedRate"| 6 | | "Hlt1DiElectronLowMass_massSlice4_promptPass" | 6 | | "Hlt1DiElectronLowMass_massSlice4_promptRate" | 1 | - | "Hlt1DiMuonDisplacedPass" | 84 | - | "Hlt1DiMuonDisplacedRate" | 84 | + | "Hlt1DiMuonDisplacedPass" | 83 | + | "Hlt1DiMuonDisplacedRate" | 83 | | "Hlt1DiMuonHighMassPass" | 76 | | "Hlt1DiMuonHighMassRate" | 76 | | "Hlt1DiMuonNoIPPass" | 8 | @@ -101,7 +101,7 @@ gather_selections INFO Number of counters : 97 | "Hlt1Dst2D0PiRate" | 6 | | "Hlt1GECPassthroughPass" | 2 | | "Hlt1GECPassthroughRate" | 2 | - | "Hlt1KsToPiPiPass" | 759 | + | "Hlt1KsToPiPiPass" | 764 | | "Hlt1KsToPiPiRate" | 2 | | "Hlt1LambdaLLDetachedTrackPass" | 1 | | "Hlt1LambdaLLDetachedTrackRate" | 1 | @@ -123,23 +123,23 @@ gather_selections INFO Number of counters : 97 | "Hlt1SingleHighPtMuonNoMuIDRate" | 23 | | "Hlt1SingleHighPtMuonPass" | 5 | | "Hlt1SingleHighPtMuonRate" | 5 | - | "Hlt1TrackElectronMVAPass" | 64 | - | "Hlt1TrackElectronMVARate" | 64 | - | "Hlt1TrackMVAPass" | 129 | - | "Hlt1TrackMVARate" | 129 | + | "Hlt1TrackElectronMVAPass" | 63 | + | "Hlt1TrackElectronMVARate" | 63 | + | "Hlt1TrackMVAPass" | 127 | + | "Hlt1TrackMVARate" | 127 | | "Hlt1TrackMuonMVAPass" | 9 | | "Hlt1TrackMuonMVARate" | 9 | | "Hlt1TwoKsPass" | 7 | | "Hlt1TwoKsRate" | 7 | | "Hlt1TwoTrackKsPass" | 32 | | "Hlt1TwoTrackKsRate" | 32 | - | "Hlt1TwoTrackMVAPass" | 304 | - | "Hlt1TwoTrackMVARate" | 304 | + | "Hlt1TwoTrackMVAPass" | 303 | + | "Hlt1TwoTrackMVARate" | 303 | | "Hlt1VeloMicroBiasPass" | 9997 | | "Hlt1VeloMicroBiasRate" | 9 | matching_consolidate_tracks_matc... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "n_long_tracks_matching" | 10000 | 480578 | 48.058 | + | "n_long_tracks_matching" | 10000 | 480650 | 48.065 | pv_beamline_cleanup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "n_PVs" | 10000 | 51728 | 5.1728 | diff --git a/device/UT/UTDecoding/src/UTClusterAndPreDecode.cu b/device/UT/UTDecoding/src/UTClusterAndPreDecode.cu index bd451e9614181e462cc12545b286ff3f5c91a995..71359c230955450c8c29c1a0b6855c6ba42f60b9 100644 --- a/device/UT/UTDecoding/src/UTClusterAndPreDecode.cu +++ b/device/UT/UTDecoding/src/UTClusterAndPreDecode.cu @@ -154,7 +154,7 @@ __device__ void store_predecoded_ut_cluster( UT::PreDecodedHits ut_pre_decoded_hits) { // we need to know whether or not a "stripflip" canges the numbering - const auto numstrips = p0Z < 0 ? UT::Decoding::v5::strips_per_hybrid - mean_strip : mean_strip; + const auto numstrips = p0Z < 0 ? UT::Decoding::v5::strips_per_hybrid - 1 - mean_strip : mean_strip; const uint32_t LHCbID = lhcb_id::set_detector_type_id(lhcb_id::LHCbIDType::UT, (fullSectorID + stripID));