Merge branch 'fix-track-selection' into 'master'

further fix to not reject tracks with nMeasaurements<=12

See merge request !425

Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx

@@ -225,9 +225,9 @@ StatusCode CKF2::execute() {
     else return false;
   });
 
-  allTracks.remove_if([&](const TrackInfo &p) {
-    return (p.nMeasurements <= 12);
-  });
+  //allTracks.remove_if([&](const TrackInfo &p) {
+  // return (p.nMeasurements <= 12);
+  //});
 
   while (not allTracks.empty()) {
     TrackInfo selected = allTracks.front();
@@ -238,7 +238,7 @@ StatusCode CKF2::execute() {
     
     if(not allTracks.empty()){ 
       allTracks.remove_if([&](const TrackInfo &p) {
-        return ((p.clusterSet & selected.clusterSet).count() > 6);
+        return ((p.nMeasurements <= 12) || ((p.clusterSet & selected.clusterSet).count() > 6));
       });
     }
   }
@@ -268,7 +268,7 @@ StatusCode CKF2::execute() {
       outputTracks->push_back(std::move(trk2));
     } else {
       outputTracks->push_back(std::move(trk));
-      ATH_MSG_WARNING("Re-Fit failed.");
+      ATH_MSG_WARNING("Re-Fit either not performed or failed.");
     }
   }
 

Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx

@@ -356,7 +356,7 @@ KalmanFitterTool::fit(const EventContext &ctx, const Acts::GeometryContext &gctx
   }
 
 
-  // set the start position 5 mm in front of the first track measurement
+  // set the start position 10 mm in front of the first track measurement
   double origin = inputTrack->trackParameters()->front()->position().z() - 10;
 
   auto pSurface = Acts::Surface::makeShared<Acts::PlaneSurface>(