diff --git a/PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx b/PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx
index 4f9e026fce9..2c83a29fdc9 100644
--- a/PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx
+++ b/PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx
@@ -166,8 +166,8 @@ struct EventMeanPtId {
   Filter trackFilter = (nabs(aod::track::eta) < cEtacut) && (aod::track::pt > ptMin) && (aod::track::pt < ptMax) && (requireGlobalTrackInFilter());
 
 <<<<<<< HEAD
-using MyMCRecoCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::McCollisionLabels, aod::CentFT0Ms, aod::CentFT0As, aod::CentFV0As>>;
-using MyMCRecoCollision = MyMCRecoCollisions::iterator;
+  using MyMCRecoCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::McCollisionLabels, aod::CentFT0Ms, aod::CentFT0As, aod::CentFV0As>>;
+  using MyMCRecoCollision = MyMCRecoCollisions::iterator;
 =======
   using MyCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0Ms, aod::CentFT0As, aod::CentFV0As>>;
   using MyCollision = MyCollisions::iterator;
@@ -557,9 +557,10 @@ using MyMCRecoCollision = MyMCRecoCollisions::iterator;
   }
 
 <<<<<<< HEAD
-     }
+}
 
-bool eventSelected(const float& globalNch, const float& pvTrack, const float& centrality)
+bool
+  eventSelected(const float& globalNch, const float& pvTrack, const float& centrality)
 =======
   // Configurables
   Configurable<float> cVtxZcut{"cVtxZcut", 10.0f, "Vertex Z"};
@@ -623,23 +624,29 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
 
   bool eventSelected(const float& globalNch, const float& pvTrack, const float& centrality)
 >>>>>>> Mean pT Fluctuations
-  {
-    if (cfgFunCoeff.cfgMultPVFT0CCutEnabled){
-      if (pvTrack < cfgFunCoeff.fMultPVFT0CCutLow->Eval(centrality))       return false;
-      if (pvTrack > cfgFunCoeff.fMultPVFT0CCutHigh->Eval(centrality))      return false;
-    }
+{
+  if (cfgFunCoeff.cfgMultPVFT0CCutEnabled) {
+    if (pvTrack < cfgFunCoeff.fMultPVFT0CCutLow->Eval(centrality))
+      return false;
+    if (pvTrack > cfgFunCoeff.fMultPVFT0CCutHigh->Eval(centrality))
+      return false;
+  }
 
-    if (cfgFunCoeff.cfgMultGlobalFT0CCutEnabled){
-      if (globalNch < cfgFunCoeff.fMultGlobalFT0CCutLow->Eval(centrality))  return false;
-      if (globalNch > cfgFunCoeff.fMultGlobalFT0CCutHigh->Eval(centrality)) return false;
-    }
+  if (cfgFunCoeff.cfgMultGlobalFT0CCutEnabled) {
+    if (globalNch < cfgFunCoeff.fMultGlobalFT0CCutLow->Eval(centrality))
+      return false;
+    if (globalNch > cfgFunCoeff.fMultGlobalFT0CCutHigh->Eval(centrality))
+      return false;
+  }
 
-    if (cfgFunCoeff.cfgMultGlobalPVCutEnabled){
-      if (globalNch < cfgFunCoeff.fMultGlobalPVCutLow->Eval(pvTrack))       return false;
-      if (globalNch > cfgFunCoeff.fMultGlobalPVCutHigh->Eval(pvTrack))      return false;
-    }
-    return true;
+  if (cfgFunCoeff.cfgMultGlobalPVCutEnabled) {
+    if (globalNch < cfgFunCoeff.fMultGlobalPVCutLow->Eval(pvTrack))
+      return false;
+    if (globalNch > cfgFunCoeff.fMultGlobalPVCutHigh->Eval(pvTrack))
+      return false;
   }
+  return true;
+}
 
   template <typename C>
   bool selCollision(C const& coll, float& cent)
@@ -683,7 +690,7 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     }
     histos.fill(HIST("trackSelRec"), 7);
 <<<<<<< HEAD
-   
+
     // if (cpileupItslayerall && !coll.selection_bit(aod::evsel::kIsGoodITSLayersAll))         {return false;}
 =======
 
@@ -708,10 +715,14 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     histos.fill(HIST("tracksel"), 2);
 
 <<<<<<< HEAD
-    if (csyDCAxy && std::fabs(track.dcaXY()) > cDcaXYcut)             {return false;}
+    if (csyDCAxy && std::fabs(track.dcaXY()) > cDcaXYcut) {
+      return false;
+    }
     histos.fill(HIST("tracksel"), 3);
 
-    if (csyDCAz && std::fabs(track.dcaZ()) > cDcaZcut)                {return false;}
+    if (csyDCAz && std::fabs(track.dcaZ()) > cDcaZcut) {
+      return false;
+    }
 =======
     if (cDCAxy && std::fabs(track.dcaXY()) > cDcaXYcut) {
       return false;
@@ -729,14 +740,20 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     }
     histos.fill(HIST("tracksel"), 5);
 <<<<<<< HEAD
- 
-    if (csyTPCcr && track.tpcNClsCrossedRows() < csyTPCcrosscut)         {return false;}
+
+    if (csyTPCcr && track.tpcNClsCrossedRows() < csyTPCcrosscut) {
+      return false;
+    }
     histos.fill(HIST("tracksel"), 6);
 
-    if (csyITSchi && track.itsChi2NCl() >= csysItsChiCut)                  {return false;}
+    if (csyITSchi && track.itsChi2NCl() >= csysItsChiCut) {
+      return false;
+    }
     histos.fill(HIST("tracksel"), 7);
 
-    if (csyTPCchi && track.tpcChi2NCl() >= csysTpcChiCut)                  {return false;}
+    if (csyTPCchi && track.tpcChi2NCl() >= csysTpcChiCut) {
+      return false;
+    }
 =======
 
     if (cTPCcr && track.tpcNClsCrossedRows() < cTPCcrosscut) {
@@ -768,13 +785,17 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
 
     if (citsNCluster) {
 <<<<<<< HEAD
-    if (track.itsNCls() < csysnITSClustersCut) 		  { return false; }
-    histos.fill(HIST("tracksel"), 10);
+      if (track.itsNCls() < csysnITSClustersCut) {
+        return false;
+      }
+      histos.fill(HIST("tracksel"), 10);
     }
 
-    if(ctpcNClusterFound) {
-    if (track.tpcNClsFound() < csystpcNClsCut)                {return false;}
-    histos.fill(HIST("tracksel"), 11);
+    if (ctpcNClusterFound) {
+      if (track.tpcNClsFound() < csystpcNClsCut) {
+        return false;
+      }
+      histos.fill(HIST("tracksel"), 11);
 =======
       if (track.itsNCls() < cnITSClustersCut) {
         return false;
@@ -985,13 +1006,14 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       histos.fill(HIST("Data/hPEta"), track.p(), track.eta());
 
 <<<<<<< HEAD
-      if(effSwitch) {
-      double eff = getEfficiency(track.pt(), track.eta(), ptHistogramAllchargeRec);  
-      if (eff < threshold) continue; 
-      double weight = 1./eff;
-      sumPtWeight += track.pt() / eff;
-      sumPtPtWeight += (track.pt() * track.pt()) / (eff * eff);
-      sumWeight += weight;       
+      if (effSwitch) {
+        double eff = getEfficiency(track.pt(), track.eta(), ptHistogramAllchargeRec);
+        if (eff < threshold)
+          continue;
+        double weight = 1. / eff;
+        sumPtWeight += track.pt() / eff;
+        sumPtPtWeight += (track.pt() * track.pt()) / (eff * eff);
+        sumWeight += weight;
       }
 =======
       double eff = getEfficiency(track.pt(), track.eta(), ptHistogramAllchargeRec);
@@ -1003,89 +1025,91 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       sumWeight += weight;
 >>>>>>> Mean pT Fluctuations
 
-      if(pidSwitch) {
-      // only TPC tracks: Pion, Kaon, Proton
-      if (track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTPCpion"), track.pt(), track.tpcNSigmaPi());
-      if (track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTPCkaon"), track.pt(), track.tpcNSigmaKa());
-      if (track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTPCproton"), track.pt(), track.tpcNSigmaPr());
-
-      // only TOF tracks: Pion, Kaon, Proton
-      if (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTOFpion"), track.pt(), track.tofNSigmaPi());
-      if (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTOFkaon"), track.pt(), track.tofNSigmaKa());
-      if (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)
-        histos.fill(HIST("Data/NSigamaTOFproton"), track.pt(), track.tofNSigmaPr());
-
-      if (track.hasTPC())  histos.fill(HIST("Data/hdEdx"), track.p(), track.tpcSignal());
-      if (track.hasTOF())  histos.fill(HIST("Data/hTOFbeta"), track.p(), track.beta());
-
-      //===================================pion===========================================================
-      // only TPC+TOF tracks: Pion, Kaon, Proton
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)) {
-        histos.fill(HIST("Data/NSigamaTPCTOFpion"), track.tpcNSigmaPi(), track.tofNSigmaPi());
-        histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
-      if (selPion(track)) {
-        histos.fill(HIST("Data/hPtPion"), track.pt());
-        histos.fill(HIST("Data/hEtaPion"), track.eta());
-        histos.fill(HIST("Data/hyPion"), track.rapidity(massPi));
-        histos.fill(HIST("Data/hPtyPion"), track.pt(), track.rapidity(massPi));
-        nchPi += 1.;
-        q1Pi += track.pt();
-        q2Pi += (track.pt() * track.pt());
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
-      }
+      if (pidSwitch) {
+        // only TPC tracks: Pion, Kaon, Proton
+        if (track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTPCpion"), track.pt(), track.tpcNSigmaPi());
+        if (track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTPCkaon"), track.pt(), track.tpcNSigmaKa());
+        if (track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTPCproton"), track.pt(), track.tpcNSigmaPr());
+
+        // only TOF tracks: Pion, Kaon, Proton
+        if (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTOFpion"), track.pt(), track.tofNSigmaPi());
+        if (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTOFkaon"), track.pt(), track.tofNSigmaKa());
+        if (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)
+          histos.fill(HIST("Data/NSigamaTOFproton"), track.pt(), track.tofNSigmaPr());
+
+        if (track.hasTPC())
+          histos.fill(HIST("Data/hdEdx"), track.p(), track.tpcSignal());
+        if (track.hasTOF())
+          histos.fill(HIST("Data/hTOFbeta"), track.p(), track.beta());
+
+        //===================================pion===========================================================
+        // only TPC+TOF tracks: Pion, Kaon, Proton
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)) {
+          histos.fill(HIST("Data/NSigamaTPCTOFpion"), track.tpcNSigmaPi(), track.tofNSigmaPi());
+          histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
+        }
+        if (selPion(track)) {
+          histos.fill(HIST("Data/hPtPion"), track.pt());
+          histos.fill(HIST("Data/hEtaPion"), track.eta());
+          histos.fill(HIST("Data/hyPion"), track.rapidity(massPi));
+          histos.fill(HIST("Data/hPtyPion"), track.pt(), track.rapidity(massPi));
+          nchPi += 1.;
+          q1Pi += track.pt();
+          q2Pi += (track.pt() * track.pt());
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
+        }
 
-      //===========================kaon===============================================================
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)) {
-        histos.fill(HIST("Data/NSigamaTPCTOFkaon"), track.tpcNSigmaKa(), track.tofNSigmaKa());
-        histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
-      if (selKaon(track)) {
-        histos.fill(HIST("Data/hPtKaon"), track.pt());
-        histos.fill(HIST("Data/hEtaKaon"), track.eta());
-        histos.fill(HIST("Data/hyKaon"), track.rapidity(massKa));
-        histos.fill(HIST("Data/hPtyKaon"), track.pt(), track.rapidity(massKa));
-        nchKa += 1.;
-        q1Ka += track.pt();
-        q2Ka += (track.pt() * track.pt());
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
-      }
+        //===========================kaon===============================================================
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)) {
+          histos.fill(HIST("Data/NSigamaTPCTOFkaon"), track.tpcNSigmaKa(), track.tofNSigmaKa());
+          histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
+        }
+        if (selKaon(track)) {
+          histos.fill(HIST("Data/hPtKaon"), track.pt());
+          histos.fill(HIST("Data/hEtaKaon"), track.eta());
+          histos.fill(HIST("Data/hyKaon"), track.rapidity(massKa));
+          histos.fill(HIST("Data/hPtyKaon"), track.pt(), track.rapidity(massKa));
+          nchKa += 1.;
+          q1Ka += track.pt();
+          q2Ka += (track.pt() * track.pt());
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
+        }
 
-      //============================proton===========================================================
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)) {
-        histos.fill(HIST("Data/NSigamaTPCTOFproton"), track.tpcNSigmaPr(), track.tofNSigmaPr());
-        histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
-      if (selProton(track)) {
-        histos.fill(HIST("Data/hPtProton"), track.pt());
-        histos.fill(HIST("Data/hEtaProton"), track.eta());
-        histos.fill(HIST("Data/hyProton"), track.rapidity(massPr));
-        histos.fill(HIST("Data/hPtyProton"), track.pt(), track.rapidity(massPr));
-        nchPr += 1.;
-        q1Pr += track.pt();
-        q2Pr += (track.pt() * track.pt());
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
-      }
+        //============================proton===========================================================
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)) {
+          histos.fill(HIST("Data/NSigamaTPCTOFproton"), track.tpcNSigmaPr(), track.tofNSigmaPr());
+          histos.fill(HIST("Data/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection"), track.p(), track.beta());
+        }
+        if (selProton(track)) {
+          histos.fill(HIST("Data/hPtProton"), track.pt());
+          histos.fill(HIST("Data/hEtaProton"), track.eta());
+          histos.fill(HIST("Data/hyProton"), track.rapidity(massPr));
+          histos.fill(HIST("Data/hPtyProton"), track.pt(), track.rapidity(massPr));
+          nchPr += 1.;
+          q1Pr += track.pt();
+          q2Pr += (track.pt() * track.pt());
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("Data/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Data/hTOFbeta_afterselection1"), track.p(), track.beta());
+        }
 
 <<<<<<< HEAD
-        }
+      }
 
 =======
 >>>>>>> Mean pT Fluctuations
@@ -1140,50 +1164,50 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     histos.fill(HIST("Data/hdiffVarx"), sample, nch);
 
 <<<<<<< HEAD
-    if(effSwitchHistoFill){
-    //------------------ Efficiency corrected histograms ---------------
-    var1Eff = (sumPtWeight * sumPtWeight - sumPtPtWeight) / (sumWeight * (sumWeight - 1));
-    var2Eff = (sumPtWeight / sumWeight);
+    if (effSwitchHistoFill) {
+      //------------------ Efficiency corrected histograms ---------------
+      var1Eff = (sumPtWeight * sumPtWeight - sumPtPtWeight) / (sumWeight * (sumWeight - 1));
+      var2Eff = (sumPtWeight / sumWeight);
 
 =======
 >>>>>>> Mean pT Fluctuations
-    histos.fill(HIST("hEffVar1x_data"), sample, nchAll, var1Eff);
-    histos.fill(HIST("hEffVar2x_data"), sample, nchAll, var2Eff);
-    histos.fill(HIST("hEffVarx_data"), sample, nchAll);
-    histos.fill(HIST("hEffVar2Meanptx_data"), nchAll, var2Eff);
-    histos.fill(HIST("hEffVar1x_Naccorr_data"), sample, sumWeight, var1Eff);
-    histos.fill(HIST("hEffVar2x_Naccorr_data"), sample, sumWeight, var2Eff);
-    histos.fill(HIST("hEffVarx_Naccorr_data"), sample, sumWeight);
-    histos.fill(HIST("hEffVar1x_Naccorr_data"), sample, nchAll, var1Eff);
-    histos.fill(HIST("hEffVar2x_Naccorr_data"), sample, nchAll, var2Eff);
-    histos.fill(HIST("hEffVarx_Naccorr_data"), sample, nchAll, sumWeight);
-    histos.fill(HIST("hEffVar1x_Naccorr_xaxis_data"), sample, sumWeight, var1);
-    histos.fill(HIST("hEffVar2x_Naccorr_xaxis_data"), sample, sumWeight, var2);
-    histos.fill(HIST("hEffVarx_Naccorr_xaxis_data"), sample, sumWeight);
+      histos.fill(HIST("hEffVar1x_data"), sample, nchAll, var1Eff);
+      histos.fill(HIST("hEffVar2x_data"), sample, nchAll, var2Eff);
+      histos.fill(HIST("hEffVarx_data"), sample, nchAll);
+      histos.fill(HIST("hEffVar2Meanptx_data"), nchAll, var2Eff);
+      histos.fill(HIST("hEffVar1x_Naccorr_data"), sample, sumWeight, var1Eff);
+      histos.fill(HIST("hEffVar2x_Naccorr_data"), sample, sumWeight, var2Eff);
+      histos.fill(HIST("hEffVarx_Naccorr_data"), sample, sumWeight);
+      histos.fill(HIST("hEffVar1x_Naccorr_data"), sample, nchAll, var1Eff);
+      histos.fill(HIST("hEffVar2x_Naccorr_data"), sample, nchAll, var2Eff);
+      histos.fill(HIST("hEffVarx_Naccorr_data"), sample, nchAll, sumWeight);
+      histos.fill(HIST("hEffVar1x_Naccorr_xaxis_data"), sample, sumWeight, var1);
+      histos.fill(HIST("hEffVar2x_Naccorr_xaxis_data"), sample, sumWeight, var2);
+      histos.fill(HIST("hEffVarx_Naccorr_xaxis_data"), sample, sumWeight);
     }
 
-    if(pidSwitchHistoFill){
-    histos.fill(HIST("Data/hVar1pi"), sample, cent, var1Pi);
-    histos.fill(HIST("Data/hVar2pi"), sample, cent, var2Pi);
-    histos.fill(HIST("Data/hVar2meanptpi"), cent, var2Pi);
-    histos.fill(HIST("Data/hVar1k"), sample, cent, var1Ka);
-    histos.fill(HIST("Data/hVar2k"), sample, cent, var2Ka);
-    histos.fill(HIST("Data/hVar2meanptk"), cent, var2Ka);
-    histos.fill(HIST("Data/hVar1p"), sample, cent, var1Pr);
-    histos.fill(HIST("Data/hVar2p"), sample, cent, var2Pr);
-    histos.fill(HIST("Data/hVar2meanptp"), cent, var2Pr);
-    histos.fill(HIST("Data/hVar1pix"), sample, nchAll, var1Pi);
-    histos.fill(HIST("Data/hVar2pix"), sample, nchAll, var2Pi);
-    histos.fill(HIST("Data/hVarpix"), sample, nchPi);
-    histos.fill(HIST("Data/hVar2meanptpix"), nchAll, var2Pi);
-    histos.fill(HIST("Data/hVar1kx"), sample, nchAll, var1Ka);
-    histos.fill(HIST("Data/hVar2kx"), sample, nchAll, var2Ka);
-    histos.fill(HIST("Data/hVarkx"), sample, nchKa);
-    histos.fill(HIST("Data/hVar2meanptkx"), nchAll, var2Ka);
-    histos.fill(HIST("Data/hVar1px"), sample, nchAll, var1Pr);
-    histos.fill(HIST("Data/hVar2px"), sample, nchAll, var2Pr);
-    histos.fill(HIST("Data/hVarpx"), sample, nchPr);
-    histos.fill(HIST("Data/hVar2meanptpx"), nchAll, var2Pr);
+    if (pidSwitchHistoFill) {
+      histos.fill(HIST("Data/hVar1pi"), sample, cent, var1Pi);
+      histos.fill(HIST("Data/hVar2pi"), sample, cent, var2Pi);
+      histos.fill(HIST("Data/hVar2meanptpi"), cent, var2Pi);
+      histos.fill(HIST("Data/hVar1k"), sample, cent, var1Ka);
+      histos.fill(HIST("Data/hVar2k"), sample, cent, var2Ka);
+      histos.fill(HIST("Data/hVar2meanptk"), cent, var2Ka);
+      histos.fill(HIST("Data/hVar1p"), sample, cent, var1Pr);
+      histos.fill(HIST("Data/hVar2p"), sample, cent, var2Pr);
+      histos.fill(HIST("Data/hVar2meanptp"), cent, var2Pr);
+      histos.fill(HIST("Data/hVar1pix"), sample, nchAll, var1Pi);
+      histos.fill(HIST("Data/hVar2pix"), sample, nchAll, var2Pi);
+      histos.fill(HIST("Data/hVarpix"), sample, nchPi);
+      histos.fill(HIST("Data/hVar2meanptpix"), nchAll, var2Pi);
+      histos.fill(HIST("Data/hVar1kx"), sample, nchAll, var1Ka);
+      histos.fill(HIST("Data/hVar2kx"), sample, nchAll, var2Ka);
+      histos.fill(HIST("Data/hVarkx"), sample, nchKa);
+      histos.fill(HIST("Data/hVar2meanptkx"), nchAll, var2Ka);
+      histos.fill(HIST("Data/hVar1px"), sample, nchAll, var1Pr);
+      histos.fill(HIST("Data/hVar2px"), sample, nchAll, var2Pr);
+      histos.fill(HIST("Data/hVarpx"), sample, nchPr);
+      histos.fill(HIST("Data/hVar2meanptpx"), nchAll, var2Pr);
     }
 
   } // event loop ends!
@@ -1267,23 +1291,23 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       histos.fill(HIST("hPt_rec"), track.pt());
       histos.fill(HIST("hEta_rec"), track.eta());
 
-      if(effSwitch) {
-      double eff = getEfficiency(track.pt(), track.eta(), ptHistogramAllchargeRec);
-      if (eff < threshold)
-        continue;
-      double weight = 1.0 / eff;
-      sumPtWeight += track.pt() * weight;
-      sumPtPtWeight += (track.pt() * track.pt() * weight * weight);
-      sumWeight += weight;
+      if (effSwitch) {
+        double eff = getEfficiency(track.pt(), track.eta(), ptHistogramAllchargeRec);
+        if (eff < threshold)
+          continue;
+        double weight = 1.0 / eff;
+        sumPtWeight += track.pt() * weight;
+        sumPtPtWeight += (track.pt() * track.pt() * weight * weight);
+        sumWeight += weight;
 <<<<<<< HEAD
-      
-      histos.fill(HIST("hPt_rec_corr"), track.pt() , weight);
-      histos.fill(HIST("hEta_rec_corr"), track.eta() , weight);
+
+        histos.fill(HIST("hPt_rec_corr"), track.pt(), weight);
+        histos.fill(HIST("hEta_rec_corr"), track.eta(), weight);
       }
 =======
 
-      histos.fill(HIST("hPt_rec_corr"), track.pt(), weight);
-      histos.fill(HIST("hEta_rec_corr"), track.eta(), weight);
+        histos.fill(HIST("hPt_rec_corr"), track.pt(), weight);
+        histos.fill(HIST("hEta_rec_corr"), track.eta(), weight);
 >>>>>>> Mean pT Fluctuations
 
       auto mcParticle = track.mcParticle();
@@ -1307,160 +1331,161 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       histos.fill(HIST("Rec/hPEta"), track.p(), track.eta());
       histos.fill(HIST("hPtEta_rec"), track.pt(), track.eta());
 <<<<<<< HEAD
-    
-      if(pidSwitch) {
+
+      if (pidSwitch) {
 =======
 
 >>>>>>> Mean pT Fluctuations
-      if (std::abs(mcParticle.pdgCode()) == PDG_t::kPiPlus)
-        histos.fill(HIST("ptHistogramPionrec_pdg"), track.pt());
-      if (std::abs(mcParticle.pdgCode()) == PDG_t::kKPlus)
-        histos.fill(HIST("ptHistogramKaonrec_pdg"), track.pt());
-      if (std::abs(mcParticle.pdgCode()) == PDG_t::kProton)
-        histos.fill(HIST("ptHistogramProtonrec_pdg"), track.pt());
-
-      // only TPC tracks: Pion, Kaon, Proton
-      if (track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTPCpion"), track.pt(), track.tpcNSigmaPi());
-      if (track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTPCkaon"), track.pt(), track.tpcNSigmaKa());
-      if (track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTPCproton"), track.pt(), track.tpcNSigmaPr());
-
-      // only TOF tracks: Pion, Kaon, Proton
-      if (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTOFpion"), track.pt(), track.tofNSigmaPi());
-      if (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTOFkaon"), track.pt(), track.tofNSigmaKa());
-      if (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)
-        histos.fill(HIST("Rec/NSigamaTOFproton"), track.pt(), track.tofNSigmaPr());
-
-      if (track.hasTPC())
-        histos.fill(HIST("Rec/hdEdx"), track.p(), track.tpcSignal());
-      if (track.hasTOF())
-        histos.fill(HIST("Rec/hTOFbeta"), track.p(), track.beta());
-      if (track.hasTPC())
-        histos.fill(HIST("hdEdx_afterselection_rec_beforepidcut"), track.p(), track.tpcSignal());
-      if (track.hasTOF())
-        histos.fill(HIST("hTOFbeta_afterselection_rec_beforepidcut"), track.p(), track.beta());
-
-      //===================================pion==============================================================
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)) {
-        histos.fill(HIST("Rec/NSigamaTPCTOFpion"), track.tpcNSigmaPi(), track.tofNSigmaPi());
-
-        histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
-
-      if (selPion(track)) {
-        if (std::fabs(track.y()) > cRapidityCut05)
-          continue;
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("ptHistogramPionrec"), track.pt());
-        histos.fill(HIST("hPtEta_pi_rec"), track.pt(), track.eta());
-        histos.fill(HIST("Rec/hPtPion"), track.pt());
-        histos.fill(HIST("Rec/hEtaPion"), track.eta());
-        histos.fill(HIST("Rec/hyPion"), track.rapidity(massPi));
-        histos.fill(HIST("Rec/hPtyPion"), track.pt(), track.rapidity(massPi));
-        histos.fill(HIST("NSigamaTPCpion_rec"), track.p(), track.tpcNSigmaPi());
-        histos.fill(HIST("NSigamaTOFpion_rec"), track.p(), track.tofNSigmaPi());
-        histos.fill(HIST("NSigamaTPCTOFpion_rec"), track.tpcNSigmaPi(), track.tofNSigmaPi());
-        histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
-        if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kPiPlus) {
-          histos.fill(HIST("ptHistogramPionrec_purity"), track.pt());
+        if (std::abs(mcParticle.pdgCode()) == PDG_t::kPiPlus)
+          histos.fill(HIST("ptHistogramPionrec_pdg"), track.pt());
+        if (std::abs(mcParticle.pdgCode()) == PDG_t::kKPlus)
+          histos.fill(HIST("ptHistogramKaonrec_pdg"), track.pt());
+        if (std::abs(mcParticle.pdgCode()) == PDG_t::kProton)
+          histos.fill(HIST("ptHistogramProtonrec_pdg"), track.pt());
+
+        // only TPC tracks: Pion, Kaon, Proton
+        if (track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTPCpion"), track.pt(), track.tpcNSigmaPi());
+        if (track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTPCkaon"), track.pt(), track.tpcNSigmaKa());
+        if (track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTPCproton"), track.pt(), track.tpcNSigmaPr());
+
+        // only TOF tracks: Pion, Kaon, Proton
+        if (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTOFpion"), track.pt(), track.tofNSigmaPi());
+        if (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTOFkaon"), track.pt(), track.tofNSigmaKa());
+        if (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)
+          histos.fill(HIST("Rec/NSigamaTOFproton"), track.pt(), track.tofNSigmaPr());
+
+        if (track.hasTPC())
+          histos.fill(HIST("Rec/hdEdx"), track.p(), track.tpcSignal());
+        if (track.hasTOF())
+          histos.fill(HIST("Rec/hTOFbeta"), track.p(), track.beta());
+        if (track.hasTPC())
+          histos.fill(HIST("hdEdx_afterselection_rec_beforepidcut"), track.p(), track.tpcSignal());
+        if (track.hasTOF())
+          histos.fill(HIST("hTOFbeta_afterselection_rec_beforepidcut"), track.p(), track.beta());
+
+        //===================================pion==============================================================
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaPi()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPi()) < cNSigCut3)) {
+          histos.fill(HIST("Rec/NSigamaTPCTOFpion"), track.tpcNSigmaPi(), track.tofNSigmaPi());
+
+          histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
         }
-        nchPi += 1.;
-        q1Pi += track.pt();
-        q2Pi += (track.pt() * track.pt());
-
-        histos.fill(HIST("hPyPion_rec"), track.p(), track.rapidity(massPi));
-        histos.fill(HIST("hPtyPion_rec"), track.pt(), track.rapidity(massPi));
-      }
 
-      //===========================kaon===============================================================
+        if (selPion(track)) {
+          if (std::fabs(track.y()) > cRapidityCut05)
+            continue;
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("ptHistogramPionrec"), track.pt());
+          histos.fill(HIST("hPtEta_pi_rec"), track.pt(), track.eta());
+          histos.fill(HIST("Rec/hPtPion"), track.pt());
+          histos.fill(HIST("Rec/hEtaPion"), track.eta());
+          histos.fill(HIST("Rec/hyPion"), track.rapidity(massPi));
+          histos.fill(HIST("Rec/hPtyPion"), track.pt(), track.rapidity(massPi));
+          histos.fill(HIST("NSigamaTPCpion_rec"), track.p(), track.tpcNSigmaPi());
+          histos.fill(HIST("NSigamaTOFpion_rec"), track.p(), track.tofNSigmaPi());
+          histos.fill(HIST("NSigamaTPCTOFpion_rec"), track.tpcNSigmaPi(), track.tofNSigmaPi());
+          histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
+          if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kPiPlus) {
+            histos.fill(HIST("ptHistogramPionrec_purity"), track.pt());
+          }
+          nchPi += 1.;
+          q1Pi += track.pt();
+          q2Pi += (track.pt() * track.pt());
+
+          histos.fill(HIST("hPyPion_rec"), track.p(), track.rapidity(massPi));
+          histos.fill(HIST("hPtyPion_rec"), track.pt(), track.rapidity(massPi));
+        }
 
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)) {
-        histos.fill(HIST("Rec/NSigamaTPCTOFkaon"), track.tpcNSigmaKa(), track.tofNSigmaKa());
-        histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
+        //===========================kaon===============================================================
 
-      if (selKaon(track)) {
-        if (std::fabs(track.y()) > cRapidityCut05)
-          continue;
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("ptHistogramKaonrec"), track.pt());
-        histos.fill(HIST("hPtEta_ka_rec"), track.pt(), track.eta());
-        histos.fill(HIST("Rec/hPtKaon"), track.pt());
-        histos.fill(HIST("Rec/hEtaKaon"), track.eta());
-        histos.fill(HIST("Rec/hyKaon"), track.rapidity(massKa));
-        histos.fill(HIST("Rec/hPtyKaon"), track.pt(), track.rapidity(massKa));
-        histos.fill(HIST("NSigamaTPCkaon_rec"), track.p(), track.tpcNSigmaKa());
-        histos.fill(HIST("NSigamaTOFkaon_rec"), track.p(), track.tofNSigmaKa());
-        histos.fill(HIST("NSigamaTPCTOFkaon_rec"), track.tpcNSigmaKa(), track.tofNSigmaKa());
-        histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
-        if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kKPlus) {
-          histos.fill(HIST("ptHistogramKaonrec_purity"), track.pt());
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaKa()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaKa()) < cNSigCut3)) {
+          histos.fill(HIST("Rec/NSigamaTPCTOFkaon"), track.tpcNSigmaKa(), track.tofNSigmaKa());
+          histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
         }
-        nchKa += 1.;
-        q1Ka += track.pt();
-        q2Ka += (track.pt() * track.pt());
-
-        histos.fill(HIST("hPyKaon_rec"), track.p(), track.rapidity(massKa));
-        histos.fill(HIST("hPtyKaon_rec"), track.pt(), track.rapidity(massKa));
-      }
 
-      //============================proton===========================================================
+        if (selKaon(track)) {
+          if (std::fabs(track.y()) > cRapidityCut05)
+            continue;
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("ptHistogramKaonrec"), track.pt());
+          histos.fill(HIST("hPtEta_ka_rec"), track.pt(), track.eta());
+          histos.fill(HIST("Rec/hPtKaon"), track.pt());
+          histos.fill(HIST("Rec/hEtaKaon"), track.eta());
+          histos.fill(HIST("Rec/hyKaon"), track.rapidity(massKa));
+          histos.fill(HIST("Rec/hPtyKaon"), track.pt(), track.rapidity(massKa));
+          histos.fill(HIST("NSigamaTPCkaon_rec"), track.p(), track.tpcNSigmaKa());
+          histos.fill(HIST("NSigamaTOFkaon_rec"), track.p(), track.tofNSigmaKa());
+          histos.fill(HIST("NSigamaTPCTOFkaon_rec"), track.tpcNSigmaKa(), track.tofNSigmaKa());
+          histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
+          if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kKPlus) {
+            histos.fill(HIST("ptHistogramKaonrec_purity"), track.pt());
+          }
+          nchKa += 1.;
+          q1Ka += track.pt();
+          q2Ka += (track.pt() * track.pt());
+
+          histos.fill(HIST("hPyKaon_rec"), track.p(), track.rapidity(massKa));
+          histos.fill(HIST("hPtyKaon_rec"), track.pt(), track.rapidity(massKa));
+        }
 
-      if ((track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)) {
-        histos.fill(HIST("Rec/NSigamaTPCTOFproton"), track.tpcNSigmaPr(), track.tofNSigmaPr());
-        histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
-      }
+        //============================proton===========================================================
 
-      if (selProton(track)) {
-        if (std::fabs(track.y()) > cRapidityCut05)
-          continue;
-        if (track.beta() > 1)
-          continue;
-        histos.fill(HIST("ptHistogramProtonrec"), track.pt());
-        histos.fill(HIST("hPtEta_pr_rec"), track.pt(), track.eta());
-        histos.fill(HIST("Rec/hPtProton"), track.pt());
-        histos.fill(HIST("Rec/hEtaProton"), track.eta());
-        histos.fill(HIST("Rec/hyProton"), track.rapidity(massPr));
-        histos.fill(HIST("Rec/hPtyProton"), track.pt(), track.rapidity(massPr));
-        histos.fill(HIST("NSigamaTPCproton_rec"), track.p(), track.tpcNSigmaPr());
-        histos.fill(HIST("NSigamaTOFproton_rec"), track.p(), track.tofNSigmaPr());
-        histos.fill(HIST("NSigamaTPCTOFproton_rec"), track.tpcNSigmaPr(), track.tofNSigmaPr());
-        histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
-        histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
-        if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kProton) {
-          histos.fill(HIST("ptHistogramProtonrec_purity"), track.pt());
+        if ((track.hasTPC() && std::abs(track.tpcNSigmaPr()) < cNSigCut3) && (track.hasTOF() && std::abs(track.tofNSigmaPr()) < cNSigCut3)) {
+          histos.fill(HIST("Rec/NSigamaTPCTOFproton"), track.tpcNSigmaPr(), track.tofNSigmaPr());
+          histos.fill(HIST("Rec/hdEdx_afterselection"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection"), track.p(), track.beta());
         }
-        nchPr += 1.;
-        q1Pr += track.pt();
-        q2Pr += (track.pt() * track.pt());
 
-        histos.fill(HIST("hPyProton_rec"), track.p(), track.rapidity(massPr));
-        histos.fill(HIST("hPtyProton_rec"), track.pt(), track.rapidity(massPr));
+        if (selProton(track)) {
+          if (std::fabs(track.y()) > cRapidityCut05)
+            continue;
+          if (track.beta() > 1)
+            continue;
+          histos.fill(HIST("ptHistogramProtonrec"), track.pt());
+          histos.fill(HIST("hPtEta_pr_rec"), track.pt(), track.eta());
+          histos.fill(HIST("Rec/hPtProton"), track.pt());
+          histos.fill(HIST("Rec/hEtaProton"), track.eta());
+          histos.fill(HIST("Rec/hyProton"), track.rapidity(massPr));
+          histos.fill(HIST("Rec/hPtyProton"), track.pt(), track.rapidity(massPr));
+          histos.fill(HIST("NSigamaTPCproton_rec"), track.p(), track.tpcNSigmaPr());
+          histos.fill(HIST("NSigamaTOFproton_rec"), track.p(), track.tofNSigmaPr());
+          histos.fill(HIST("NSigamaTPCTOFproton_rec"), track.tpcNSigmaPr(), track.tofNSigmaPr());
+          histos.fill(HIST("Rec/hdEdx_afterselection1"), track.p(), track.tpcSignal());
+          histos.fill(HIST("Rec/hTOFbeta_afterselection1"), track.p(), track.beta());
+          if (std::abs(track.mcParticle().pdgCode()) == PDG_t::kProton) {
+            histos.fill(HIST("ptHistogramProtonrec_purity"), track.pt());
+          }
+          nchPr += 1.;
+          q1Pr += track.pt();
+          q2Pr += (track.pt() * track.pt());
+
+          histos.fill(HIST("hPyProton_rec"), track.p(), track.rapidity(massPr));
+          histos.fill(HIST("hPtyProton_rec"), track.pt(), track.rapidity(massPr));
+        }
       }
-       }
 
     } // loop over tracks
     histos.fill(HIST("Rec/hcent_nacc"), cent, nchAll);
     histos.fill(HIST("hNch_vs_Nch"), sample, nchAll, nchAll);
 
-    if (nchAll < cTwoPtlCut2)     return;
+    if (nchAll < cTwoPtlCut2)
+      return;
     var1 = (q1 * q1 - q2) / (nchAll * (nchAll - 1));
     var2 = (q1 / nchAll);
 
     histos.fill(HIST("hterm1"), nchAll, var1);
     histos.fill(HIST("hterm2"), nchAll, var2);
- 
+
     histos.fill(HIST("Rec/hVar1"), sample, cent, var1);
     histos.fill(HIST("Rec/hVar2"), sample, cent, var2);
     histos.fill(HIST("Rec/hVarc"), sample, cent);
@@ -1476,7 +1501,7 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       var1Ka = (q1Ka * q1Ka - q2Ka) / (nchKa * (nchKa - 1));
       var2Ka = (q1Ka / nchKa);
 <<<<<<< HEAD
-         }
+    }
 =======
     }
 >>>>>>> Mean pT Fluctuations
@@ -1485,7 +1510,7 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       var1Pr = (q1Pr * q1Pr - q2Pr) / (nchPr * (nchPr - 1));
       var2Pr = (q1Pr / nchPr);
     }
-    
+
     //-----------------------nch-------------------------------------
     histos.fill(HIST("Rec/hVar1x"), sample, nchAll, var1);
     histos.fill(HIST("Rec/hVar2x"), sample, nchAll, var2);
@@ -1494,49 +1519,48 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     histos.fill(HIST("Rec/hdiffVar2x"), sample, nch, var2);
     histos.fill(HIST("Rec/hdiffVarx"), sample, nch);
     histos.fill(HIST("Rec/hVar2meanptx"), nchAll, var2);
- 
-    if(pidSwitchHistoFill){
-    histos.fill(HIST("Rec/hVar1pi"), sample, cent, var1Pi);
-    histos.fill(HIST("Rec/hVar2pi"), sample, cent, var2Pi);
-    histos.fill(HIST("Rec/hVar2meanptpi"), cent, var2Pi);
-    histos.fill(HIST("Rec/hVar1k"), sample, cent, var1Ka);
-    histos.fill(HIST("Rec/hVar2k"), sample, cent, var2Ka);
-    histos.fill(HIST("Rec/hVar2meanptk"), cent, var2Ka);
-    histos.fill(HIST("Rec/hVar1p"), sample, cent, var1Pr);
-    histos.fill(HIST("Rec/hVar2p"), sample, cent, var2Pr);
-    histos.fill(HIST("Rec/hVar2meanptp"), cent, var2Pr);
-    histos.fill(HIST("Rec/hVar1pix"), sample, nchAll, var1Pi);
-    histos.fill(HIST("Rec/hVar2pix"), sample, nchAll, var2Pi);
-    histos.fill(HIST("Rec/hVarpix"), sample, nchPi);
-    histos.fill(HIST("Rec/hVar2meanptpix"), nchAll, var2Pi);
-    histos.fill(HIST("Rec/hVar1kx"), sample, nchAll, var1Ka);
-    histos.fill(HIST("Rec/hVar2kx"), sample, nchAll, var2Ka);
-    histos.fill(HIST("Rec/hVarkx"), sample, nchKa);
-    histos.fill(HIST("Rec/hVar2meanptkx"), nchAll, var2Ka);
-    histos.fill(HIST("Rec/hVar1px"), sample, nchAll, var1Pr);
-    histos.fill(HIST("Rec/hVar2px"), sample, nchAll, var2Pr);
-    histos.fill(HIST("Rec/hVarpx"), sample, nchPr);
-    histos.fill(HIST("Rec/hVar2meanptpx"), nchAll, var2Pr);
-    }
 
-    if(effSwitchHistoFill){
-    var1Eff = (sumPtWeight * sumPtWeight - sumPtPtWeight) / (sumWeight * (sumWeight - 1));
-    var2Eff = (sumPtWeight / sumWeight);
+    if (pidSwitchHistoFill) {
+      histos.fill(HIST("Rec/hVar1pi"), sample, cent, var1Pi);
+      histos.fill(HIST("Rec/hVar2pi"), sample, cent, var2Pi);
+      histos.fill(HIST("Rec/hVar2meanptpi"), cent, var2Pi);
+      histos.fill(HIST("Rec/hVar1k"), sample, cent, var1Ka);
+      histos.fill(HIST("Rec/hVar2k"), sample, cent, var2Ka);
+      histos.fill(HIST("Rec/hVar2meanptk"), cent, var2Ka);
+      histos.fill(HIST("Rec/hVar1p"), sample, cent, var1Pr);
+      histos.fill(HIST("Rec/hVar2p"), sample, cent, var2Pr);
+      histos.fill(HIST("Rec/hVar2meanptp"), cent, var2Pr);
+      histos.fill(HIST("Rec/hVar1pix"), sample, nchAll, var1Pi);
+      histos.fill(HIST("Rec/hVar2pix"), sample, nchAll, var2Pi);
+      histos.fill(HIST("Rec/hVarpix"), sample, nchPi);
+      histos.fill(HIST("Rec/hVar2meanptpix"), nchAll, var2Pi);
+      histos.fill(HIST("Rec/hVar1kx"), sample, nchAll, var1Ka);
+      histos.fill(HIST("Rec/hVar2kx"), sample, nchAll, var2Ka);
+      histos.fill(HIST("Rec/hVarkx"), sample, nchKa);
+      histos.fill(HIST("Rec/hVar2meanptkx"), nchAll, var2Ka);
+      histos.fill(HIST("Rec/hVar1px"), sample, nchAll, var1Pr);
+      histos.fill(HIST("Rec/hVar2px"), sample, nchAll, var2Pr);
+      histos.fill(HIST("Rec/hVarpx"), sample, nchPr);
+      histos.fill(HIST("Rec/hVar2meanptpx"), nchAll, var2Pr);
+    }
 
-    histos.fill(HIST("hEffVar1x_rec"), sample, nchAll, var1Eff);
-    histos.fill(HIST("hEffVar2x_rec"), sample, nchAll, var2Eff);
-    histos.fill(HIST("hEffVarx_rec"), sample, nchAll);
-    histos.fill(HIST("hEffVar2Meanptx_rec"), nchAll, var2Eff);
-    histos.fill(HIST("hEffVar1x_Naccorr_rec"), sample, sumWeight, var1Eff);
-    histos.fill(HIST("hEffVar2x_Naccorr_rec"), sample, sumWeight, var2Eff);
-    histos.fill(HIST("hEffVarx_Naccorr_rec"), sample, sumWeight);
-    histos.fill(HIST("hEffVar1x_Naccorr_xaxis_rec"), sample, sumWeight, var1);
-    histos.fill(HIST("hEffVar2x_Naccorr_xaxis_rec"), sample, sumWeight, var2);
-    histos.fill(HIST("hEffVarx_Naccorr_xaxis_rec"), sample, sumWeight);
+    if (effSwitchHistoFill) {
+      var1Eff = (sumPtWeight * sumPtWeight - sumPtPtWeight) / (sumWeight * (sumWeight - 1));
+      var2Eff = (sumPtWeight / sumWeight);
+
+      histos.fill(HIST("hEffVar1x_rec"), sample, nchAll, var1Eff);
+      histos.fill(HIST("hEffVar2x_rec"), sample, nchAll, var2Eff);
+      histos.fill(HIST("hEffVarx_rec"), sample, nchAll);
+      histos.fill(HIST("hEffVar2Meanptx_rec"), nchAll, var2Eff);
+      histos.fill(HIST("hEffVar1x_Naccorr_rec"), sample, sumWeight, var1Eff);
+      histos.fill(HIST("hEffVar2x_Naccorr_rec"), sample, sumWeight, var2Eff);
+      histos.fill(HIST("hEffVarx_Naccorr_rec"), sample, sumWeight);
+      histos.fill(HIST("hEffVar1x_Naccorr_xaxis_rec"), sample, sumWeight, var1);
+      histos.fill(HIST("hEffVar2x_Naccorr_xaxis_rec"), sample, sumWeight, var2);
+      histos.fill(HIST("hEffVarx_Naccorr_xaxis_rec"), sample, sumWeight);
 <<<<<<< HEAD
-    histos.fill(HIST("hcent_nacc_corr"), cent, sumWeight);
-    histos.fill(HIST("hNch_vs_corr"), sample, nchAll, sumWeight);
-
+      histos.fill(HIST("hcent_nacc_corr"), cent, sumWeight);
+      histos.fill(HIST("hNch_vs_corr"), sample, nchAll, sumWeight);
     }   
 =======
 
@@ -1600,41 +1624,41 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
       histos.fill(HIST("hnch_gen_all"), nchGenAll);
       histos.fill(HIST("hPtEta_gen"), mcpart.pt(), mcpart.eta());
 
-      if(pidSwitch) {
-      if (std::fabs(mcpart.y()) < cRapidityCut05) {
-
-        if (mcpart.pdgCode() == PDG_t::kPiPlus || mcpart.pdgCode() == PDG_t::kPiMinus) {
-          histos.fill(HIST("ptHistogramPion"), mcpart.pt());
-          histos.fill(HIST("hPtEta_pi_gen"), mcpart.pt(), mcpart.eta());
-          histos.fill(HIST("hPty_pi_gen"), mcpart.pt(), mcpart.y());
-          nchPiGen += 1.;
-          q1PiGen += mcpart.pt();
-          q2PiGen += (mcpart.pt() * mcpart.pt());
-          histos.fill(HIST("hnch_pi"), nchPiGen);
-        }
-
-        if (mcpart.pdgCode() == PDG_t::kKPlus || mcpart.pdgCode() == PDG_t::kKMinus) {
-          histos.fill(HIST("ptHistogramKaon"), mcpart.pt());
-          histos.fill(HIST("hPtEta_ka_gen"), mcpart.pt(), mcpart.eta());
-          histos.fill(HIST("hPty_ka_gen"), mcpart.pt(), mcpart.y());
-          nchKaGen += 1.;
-          q1KaGen += mcpart.pt();
-          q2KaGen += (mcpart.pt() * mcpart.pt());
-          histos.fill(HIST("hnch_ka"), nchKaGen);
-        }
-
-        if (mcpart.pdgCode() == PDG_t::kProton || mcpart.pdgCode() == PDG_t::kProtonBar) {
-          histos.fill(HIST("ptHistogramProton"), mcpart.pt());
-          histos.fill(HIST("hPtEta_pr_gen"), mcpart.pt(), mcpart.eta());
-          histos.fill(HIST("hPty_pr_gen"), mcpart.pt(), mcpart.y());
-          nchPrGen += 1.;
-          q1PrGen += mcpart.pt();
-          q2PrGen += (mcpart.pt() * mcpart.pt());
-          histos.fill(HIST("hnch_pr"), nchPrGen);
-        }
-
-      } //|y| < 0.5 cut ends!
-      }//pid flag
+      if (pidSwitch) {
+        if (std::fabs(mcpart.y()) < cRapidityCut05) {
+
+          if (mcpart.pdgCode() == PDG_t::kPiPlus || mcpart.pdgCode() == PDG_t::kPiMinus) {
+            histos.fill(HIST("ptHistogramPion"), mcpart.pt());
+            histos.fill(HIST("hPtEta_pi_gen"), mcpart.pt(), mcpart.eta());
+            histos.fill(HIST("hPty_pi_gen"), mcpart.pt(), mcpart.y());
+            nchPiGen += 1.;
+            q1PiGen += mcpart.pt();
+            q2PiGen += (mcpart.pt() * mcpart.pt());
+            histos.fill(HIST("hnch_pi"), nchPiGen);
+          }
+
+          if (mcpart.pdgCode() == PDG_t::kKPlus || mcpart.pdgCode() == PDG_t::kKMinus) {
+            histos.fill(HIST("ptHistogramKaon"), mcpart.pt());
+            histos.fill(HIST("hPtEta_ka_gen"), mcpart.pt(), mcpart.eta());
+            histos.fill(HIST("hPty_ka_gen"), mcpart.pt(), mcpart.y());
+            nchKaGen += 1.;
+            q1KaGen += mcpart.pt();
+            q2KaGen += (mcpart.pt() * mcpart.pt());
+            histos.fill(HIST("hnch_ka"), nchKaGen);
+          }
+
+          if (mcpart.pdgCode() == PDG_t::kProton || mcpart.pdgCode() == PDG_t::kProtonBar) {
+            histos.fill(HIST("ptHistogramProton"), mcpart.pt());
+            histos.fill(HIST("hPtEta_pr_gen"), mcpart.pt(), mcpart.eta());
+            histos.fill(HIST("hPty_pr_gen"), mcpart.pt(), mcpart.y());
+            nchPrGen += 1.;
+            q1PrGen += mcpart.pt();
+            q2PrGen += (mcpart.pt() * mcpart.pt());
+            histos.fill(HIST("hnch_pr"), nchPrGen);
+          }
+
+        } //|y| < 0.5 cut ends!
+      } // pid flag
     } // track loop ends!
     histos.fill(HIST("hcent_nacc_gen"), cent, nchGenAll);
 
@@ -1673,19 +1697,19 @@ bool eventSelected(const float& globalNch, const float& pvTrack, const float& ce
     histos.fill(HIST("hdiffVarx_gen"), sampleGen, nchgen);
     histos.fill(HIST("hVar2meanptx_gen"), nchGenAll, var2AllGen);
 
-    if(pidSwitchHistoFill){
-    histos.fill(HIST("hVar1pix_gen"), sampleGen, nchGenAll, var1PiGen);
-    histos.fill(HIST("hVar2pix_gen"), sampleGen, nchGenAll, var2PiGen);
-    histos.fill(HIST("hVarpix_gen"), sampleGen, nchPiGen);
-    histos.fill(HIST("hVar2meanptpix_gen"), nchGenAll, var2PiGen);
-    histos.fill(HIST("hVar1kx_gen"), sampleGen, nchGenAll, var1KaGen);
-    histos.fill(HIST("hVar2kx_gen"), sampleGen, nchGenAll, var2KaGen);
-    histos.fill(HIST("hVarkx_gen"), sampleGen, nchKaGen);
-    histos.fill(HIST("hVar2meanptkx_gen"), nchGenAll, var2KaGen);
-    histos.fill(HIST("hVar1px_gen"), sampleGen, nchGenAll, var1PrGen);
-    histos.fill(HIST("hVar2px_gen"), sampleGen, nchGenAll, var2PrGen);
-    histos.fill(HIST("hVarpx_gen"), sampleGen, nchPrGen);
-    histos.fill(HIST("hVar2meanptpx_gen"), nchGenAll, var2PrGen);
+    if (pidSwitchHistoFill) {
+      histos.fill(HIST("hVar1pix_gen"), sampleGen, nchGenAll, var1PiGen);
+      histos.fill(HIST("hVar2pix_gen"), sampleGen, nchGenAll, var2PiGen);
+      histos.fill(HIST("hVarpix_gen"), sampleGen, nchPiGen);
+      histos.fill(HIST("hVar2meanptpix_gen"), nchGenAll, var2PiGen);
+      histos.fill(HIST("hVar1kx_gen"), sampleGen, nchGenAll, var1KaGen);
+      histos.fill(HIST("hVar2kx_gen"), sampleGen, nchGenAll, var2KaGen);
+      histos.fill(HIST("hVarkx_gen"), sampleGen, nchKaGen);
+      histos.fill(HIST("hVar2meanptkx_gen"), nchGenAll, var2KaGen);
+      histos.fill(HIST("hVar1px_gen"), sampleGen, nchGenAll, var1PrGen);
+      histos.fill(HIST("hVar2px_gen"), sampleGen, nchGenAll, var2PrGen);
+      histos.fill(HIST("hVarpx_gen"), sampleGen, nchPrGen);
+      histos.fill(HIST("hVar2meanptpx_gen"), nchGenAll, var2PrGen);
     }
 
   } // void process