Resolve merging conflicts

Author: axti98

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -2223,9 +2223,7 @@ struct OnTheFlyTracker {
       }
 
       if (reconstructed) {
-        tracksAlice3.push_back(TrackAlice3{trackParCov, mcParticle.globalIndex(), time, timeResolutionUs, isSecondary, false, true, false, 0, nTrkHits, kRecoPrimary});
-        getHist(TH1, histPath + "hPtReconstructedPr")->Fill(trackParCov.getPt());
-        tracksAlice3.push_back(TrackAlice3{trackParCov, mcParticle.globalIndex(), time, timeResolutionUs, isSecondary, false, false, 0, nTrkHits, kRecoPrimary});
+        tracksAlice3.push_back(TrackAlice3{trackParCov, mcParticle.globalIndex(), time, timeResolutionUs, isSecondary, true, false, 0, nTrkHits, kRecoPrimary});
         getHist<TH1>(histPath + "hPtReconstructedPr")->Fill(trackParCov.getPt());
       } else {
         ghostTracksAlice3.push_back(TrackAlice3{trackParCov, mcParticle.globalIndex(), time, timeResolutionUs, isSecondary, false, false, false, 0, nTrkHits, kGhostPrimary});

ALICE3/TableProducer/alice3TrackingTranslator.cxx

@@ -711,8 +711,7 @@ struct Alice3TrackingTranslator {
         tableTracksExtraA3(m_nMeasurements, // nSiliconHits (using m_nMeasurements as proxy)
                            0,               // nTPCHits
                            0,               // trackType
-                           false,           // isPVContributor
-                           0);              // trackType
+                           false);          // isPVContributor
         std::cout << "Filling TracksExtraA3 table" << std::endl;
         // Fill extra track info
         tableStoredTracksExtra(0.f,                                 // TPCInnerParam