Merge branch 'cherry-pick-b59d2729' into 'main'

Muon Phase-II pattern: update bucket formation and fix validation bug

See merge request atlas/athena!76675

MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonSpacePointFormation/src/SpacePointMakerAlg.cxx

@@ -355,7 +355,7 @@ void SpacePointMakerAlg::distributePointsAndStore(const EventContext& ctx,
            continue;
         }
         /// The current measurement is too far away from the first one. Make a new bucket
-        if (currPoint - lastPoint > m_spacePointWindow) {
+        if (currPoint - lastPoint > m_maxBucketLength || (!splittedHits.empty() && !splittedHits.back().empty()  && currPoint - pointPos(*splittedHits.back().back()) > m_spacePointWindow )) {
             newBucket(currPoint);            
         }
         std::shared_ptr<SpacePoint> spacePoint = std::make_shared<SpacePoint>(std::move(toSort));

MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonSpacePointFormation/src/SpacePointMakerAlg.h

@@ -161,7 +161,10 @@ namespace MuonR4{
             
             SG::WriteHandleKey<SpacePointContainer> m_writeKey{this, "WriteKey", "MuonSpacePoints"};
 
-            Gaudi::Property<double> m_spacePointWindow{this, "spacePointWindowSize", 2.*Gaudi::Units::m,
+            Gaudi::Property<double> m_spacePointWindow{this, "spacePointWindowSize", 0.8*Gaudi::Units::m,
+                                                       "Maximal distance between consecutive hits in a bucket"};
+
+            Gaudi::Property<double> m_maxBucketLength{this, "maxBucketLength", 2.*Gaudi::Units::m,
                                                        "Maximal size of a space point bucket"};
             
             Gaudi::Property<double> m_spacePointOverlap{this, "spacePointOverlap", 25.*Gaudi::Units::cm,

MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/src/MuonPatternRecognitionTestTree.cxx

@@ -105,6 +105,10 @@ namespace MuonValR4{
                 m_out_seed_x0.push_back(seed->interceptX());
                 m_out_seed_tanphi.push_back(seed->tanPhi());
             }
+            else{
+                m_out_seed_x0.push_back(-999);
+                m_out_seed_tanphi.push_back(-999);
+            }
         
             m_out_seed_nHits.push_back(seed->getHitsInMax().size()); 
             m_out_seed_nEtaHits.push_back(std::accumulate(seed->getHitsInMax().begin(), seed->getHitsInMax().end(),0,