resolving conflicts

Archita-Dash · Nov 8, 2023 · c6ad8c1 · c6ad8c1
1 parent 67eef60
commit c6ad8c1
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/PWGJE/Tasks/jetvalidationqa.cxx b/PWGJE/Tasks/jetvalidationqa.cxx
@@ -206,13 +206,26 @@ struct jetTrackCollisionQa {
     double leadingTrackEta = -1;
     // qa histograms for selected tracks in collision
     for (const auto& t : tracks) {
+<<<<<<< HEAD
       if (t.collisionId() == collision.globalIndex() && JetDerivedDataUtilities::selectTrack(t, trackSelection)) {
         auto track = t.track_as<Tracks>();
         fillTrackQA(track);
         if (track.pt() > leadingTrackPt) {
           leadingTrackPt = track.pt();
           leadingTrackPhi = track.phi();
           leadingTrackEta = track.eta();
+=======
+      if ((t.collisionId() == collision.globalIndex()) && (selectTrack(t, trackSelection) == true)) {
+        fillTrackQA(t);
+
+        std::cout << "Track pT = " << t.pt() << "Track Eta = " << t.eta() << "Track Phi = " << t.phi() << '\n';
+
+
+        if (t.pt() > leadingTrackPt) {
+          leadingTrackPt = t.pt();
+          leadingTrackPhi = t.phi();
+          leadingTrackEta = t.eta();
+>>>>>>> debugging tracks
         }
       }
     } // end of tracks loop