Merge branch 'master' into moduletypes

src/modules/Tracking4D/Tracking4D.cpp

@@ -228,6 +228,14 @@ StatusCode Tracking4D::run(Clipboard* clipboard) {
             if(trackCluster->rowWidth() == 3)
                 residualsYwidth3[detectorID]->Fill(intercept.Y() - trackCluster->globalY());
         }
+
+        // Improve the track timestamp by taking the average of all planes
+        double avg_track_time = 0;
+        for(auto& trackCluster : trackClusters) {
+            avg_track_time += (Units::convert(trackCluster->timestamp(), "ns"));
+            avg_track_time -= (Units::convert(trackCluster->globalZ(), "mm") / (299.792458));
+        }
+        track->setTimestamp(avg_track_time / track->nClusters());
     }
 
     // Save the tracks on the clipboard