[Common] Further changes to QA task

Author: ddobrigk

Common/Tasks/flowTest.cxx

@@ -54,10 +54,13 @@ struct flowTest {
 
   void init(InitContext&)
   {
-    // pT histograms
+    // QA and detailed studies
     histos.add<TH1>("hImpactParameter", "hImpactParameter", HistType::kTH1D, {axisB});
     histos.add<TH2>("hNchVsImpactParameter", "hNchVsImpactParameter", HistType::kTH2D, {axisB, axisNch});
     histos.add<TH1>("hEventPlaneAngle", "hEventPlaneAngle", HistType::kTH1D, {axisPhi});
+    histos.add<TH2>("hTrackPhiVsEventPlaneAngle", "hTrackPhiVsEventPlaneAngle", HistType::kTH2D, {axisPhi, axisPhi});
+
+    // analysis 
     histos.add<TH2>("hPtVsPhiGenerated", "hPtVsPhiGenerated", HistType::kTH2D, {axisPhi, axisPt});
     histos.add<TH2>("hPtVsPhiGlobal", "hPtVsPhiGlobal", HistType::kTH2D, {axisPhi, axisPt});
     histos.add<TH3>("hBVsPtVsPhiGenerated", "hBVsPtVsPhiGenerated", HistType::kTH3D, {axisB, axisPhi, axisPt});
@@ -83,9 +86,10 @@ struct flowTest {
     histos.add<TH3>("hBVsPtVsPhiGlobalOmega", "hBVsPtVsPhiGlobalOmega", HistType::kTH3D, {axisB, axisPhi, axisPt});
   }
 
-  using recoTracks = soa::Join<aod::TracksIU, aod::TracksExtra, aod::McTrackLabels>;
+  using recoTracks = soa::Join<aod::TracksIU, aod::TracksExtra>;
+  using recoTracksWithLabels = soa::Join<aod::TracksIU, aod::TracksExtra, aod::McTrackLabels>;
 
-  void process(aod::McCollision const& mcCollision, soa::Join<aod::McParticles, aod::ParticlesToTracks> const& mcParticles, recoTracks const&)
+  void process(aod::McCollision const& mcCollision, soa::Join<aod::McParticles, aod::ParticlesToTracks> const& mcParticles, recoTracksWithLabels const&)
   {
 
     float imp = mcCollision.impactParameter();
@@ -118,6 +122,8 @@ struct flowTest {
           deltaPhi += 2. * TMath::Pi();
         if (deltaPhi > 2. * TMath::Pi())
           deltaPhi -= 2. * TMath::Pi();
+
+        histos.fill(HIST("hTrackPhiVsEventPlaneAngle"), evPhi, mcParticle.phi());
         histos.fill(HIST("hPtVsPhiGenerated"), deltaPhi, mcParticle.pt());
         histos.fill(HIST("hBVsPtVsPhiGenerated"), imp, deltaPhi, mcParticle.pt());
 
@@ -131,28 +137,28 @@ struct flowTest {
         bool validITSTrackFake = false;
         bool validITSABTrack = false;
         bool validITSABTrackFake = false;
-        bool validAnalysisTrack = false;
+        bool validAnalysisTrack = false; 
         bool validAnalysisTrackFake = false;
         if (mcParticle.has_tracks()) {
-          auto const& tracks = mcParticle.tracks_as<recoTracks>();
+          auto const& tracks = mcParticle.tracks_as<recoTracksWithLabels>();
           for (auto const& track : tracks) {
             bool isITSFake = false;
 
-            for (int bit = 0; bit < 7; bit++) {
-              if (bitcheck(track.mcMask(), bit)) {
+            for(int bit = 0; bit < 7; bit++){ 
+              if(bitcheck(track.mcMask(), bit)){ 
                 isITSFake = true;
               }
             }
 
-            if (track.tpcNClsFound() >= analysisMinimumTPCClusters && track.itsNCls() >= analysisMinimumITSClusters) {
+            if (track.tpcNClsFound() > analysisMinimumTPCClusters && track.itsNCls() > analysisMinimumITSClusters){
               validAnalysisTrack = true;
-              if (isITSFake) {
+              if(isITSFake){ 
                 validAnalysisTrackFake = true;
               }
             }
             if (track.hasTPC() && track.hasITS()) {
               validGlobal = true;
-              if (isITSFake) {
+              if(isITSFake){ 
                 validGlobalFake = true;
               }
             }
@@ -164,13 +170,13 @@ struct flowTest {
             }
             if (track.hasITS() && track.itsChi2NCl() > -1e-6) {
               validITSTrack = true;
-              if (isITSFake) {
+              if(isITSFake){ 
                 validITSTrackFake = true;
               }
             }
             if (track.hasITS() && track.itsChi2NCl() < -1e-6) {
               validITSABTrack = true;
-              if (isITSFake) {
+              if(isITSFake){ 
                 validITSABTrackFake = true;
               }
             }
@@ -182,13 +188,13 @@ struct flowTest {
           histos.fill(HIST("hPtVsPhiGlobal"), deltaPhi, mcParticle.pt());
           histos.fill(HIST("hBVsPtVsPhiGlobal"), imp, deltaPhi, mcParticle.pt());
         }
-        if (validGlobalFake) {
+        if (validGlobalFake){
           histos.fill(HIST("hBVsPtVsPhiGlobalFake"), imp, deltaPhi, mcParticle.pt());
         }
         if (validAnalysisTrack) {
           histos.fill(HIST("hBVsPtVsPhiAnalysis"), imp, deltaPhi, mcParticle.pt());
         }
-        if (validAnalysisTrackFake) {
+        if (validAnalysisTrackFake){
           histos.fill(HIST("hBVsPtVsPhiAnalysisFake"), imp, deltaPhi, mcParticle.pt());
         }
         // if any track present, fill