Merge branch 'master' into master

Author: alcaliva

Common/Tasks/qaMuon.cxx

@@ -223,6 +223,7 @@ struct muonQa {
     Configurable<double> fChamberResolutionX{"cfgChamberResolutionX", 0.4, "Chamber resolution along X configuration for refit"}; // 0.4cm pp, 0.2cm PbPb
     Configurable<double> fChamberResolutionY{"cfgChamberResolutionY", 0.4, "Chamber resolution along Y configuration for refit"}; // 0.4cm pp, 0.2cm PbPb
     Configurable<double> fSigmaCutImprove{"cfgSigmaCutImprove", 6., "Sigma cut for track improvement"};
+    Configurable<double> fDipoleZcorr{"cfgDipoleZcorr", 0.0f, "Correction to the dipole z position"};
   } configRealign;
 
   ///    Variables to event mixing criteria
@@ -1651,6 +1652,11 @@ struct muonQa {
       fgValues.errorClusters.emplace_back(eCls);
       fgValues.DEIDs.emplace_back(cluster.deId());
 
+      // subtract the dipole shift correction from the cluster z position
+      if (configRealign.fDipoleZcorr != 0) {
+        clusterMCH->z -= configRealign.fDipoleZcorr;
+      }
+
       // Add transformed cluster into temporary variable
       convertedTrack.createParamAtCluster(*clusterMCH);
     }
@@ -1663,6 +1669,12 @@ struct muonQa {
         LOGF(fatal, "Muon track %d has no associated clusters.", muon.globalIndex());
       }
 
+      // add back the dipole shift correction to the track z
+      if (configRealign.fDipoleZcorr != 0) {
+        auto& trackParam = *(convertedTrack.begin());
+        trackParam.setZ(trackParam.getZ() + configRealign.fDipoleZcorr);
+      }
+
       for (auto it = convertedTrack.begin(); it != convertedTrack.end(); it++) {
         std::vector<float> pos = {static_cast<float>(it->getNonBendingCoor()), static_cast<float>(it->getBendingCoor()), static_cast<float>(it->getZ())};
         fgValues.posClusters.emplace_back(pos);

PWGCF/Flow/Tasks/flowDirectedFlowTask.cxx

@@ -163,8 +163,8 @@ struct flowDirectedFlowTask {
     histos.add("hQxCvscent", "Qx C vs centrality", kTH2F, {{centAxis}, {qAxis}});
     histos.add("hQyCvscent", "Qy C vs centrality", kTH2F, {{centAxis}, {qAxis}});
 
-    histos.add("hpResCosAC", "cos(#Psi_{A}-#Psi_{C}) vs centrality", kTH2F, {{centAxis}, {resAxis}});
-    histos.add("hpResDotAC", "Q_{A}#upoint Q_{C} vs centrality", kTH2F, {{centAxis}, {resAxis}});
+    histos.add("hpResCosAC", "cos(#Psi_{A}-#Psi_{C}) vs centrality", kTH3F, {{centAxis}, {resAxis}, {q1Axis}});
+    histos.add("hpResDotAC", "Q_{A}#upoint Q_{C} vs centrality", kTH3F, {{centAxis}, {resAxis}, {q1Axis}});
     histos.add("hpQxAQxC", "QxA QxC", kTH2F, {{centAxis}, {resAxis}});
     histos.add("hpQyAQyC", "QyA QyC", kTH2F, {{centAxis}, {resAxis}});
     histos.add("hpQxAQyC", "QxA QyC", kTH2F, {{centAxis}, {resAxis}});
@@ -524,8 +524,8 @@ struct flowDirectedFlowTask {
     float dotAC = qxA * qxC + qyA * qyC;
     float resDot = dotAC / (magA * magC);
 
-    histos.fill(HIST("hpResCosAC"), centrality, std::cos(psiA - psiC));
-    histos.fill(HIST("hpResDotAC"), centrality, resDot);
+    histos.fill(HIST("hpResCosAC"), centrality, std::cos(psiA - psiC), q1);
+    histos.fill(HIST("hpResDotAC"), centrality, resDot, q1);
     histos.fill(HIST("hpQxAQxC"), centrality, qxA * qxC);
     histos.fill(HIST("hpQyAQyC"), centrality, qyA * qyC);
     histos.fill(HIST("hpQxAQyC"), centrality, qxA * qyC);