[MegaLinter] Apply linters automatic fixes to #4661

DPG/Tasks/AOTTrack/PID/qaPIDTPC.cxx

@@ -90,19 +90,23 @@ struct tpcPidQa {
   Configurable<float> minP{"minP", 0.01, "Minimum momentum in range"};
   Configurable<float> maxP{"maxP", 20, "Maximum momentum in range"};
   ConfigurableAxis etaBins{"etaBins", {100, -1.f, 1.f}, "Binning in eta"};
-  ConfigurableAxis phiBins{"phiBins", {100, 0, TMath::TwoPi()}, "Binning in eta"};
+  ConfigurableAxis phiBins{"phiBins", {100, 0, TMath::TwoPi()}, "Binning in phi"};
   ConfigurableAxis trackLengthBins{"trackLengthBins", {100, 0, 1000.f}, "Binning in track length plot"};
   ConfigurableAxis deltaBins{"deltaBins", {200, -1000.f, 1000.f}, "Binning in Delta (dEdx - expected dEdx)"};
   ConfigurableAxis expSigmaBins{"expSigmaBins", {200, 0.f, 200.f}, "Binning in expected Sigma"};
   ConfigurableAxis nSigmaBins{"nSigmaBins", {401, -10.025f, 10.025f}, "Binning in NSigma"};
   ConfigurableAxis dEdxBins{"dEdxBins", {5000, 0.f, 5000.f}, "Binning in dE/dx"};
+  // Axes for optional THnSparse
+  ConfigurableAxis binsPForSparse{"binsPForSparse", {200, 0.f, 20.f}, "Binning in momentum for optional THnSparse"};
+  ConfigurableAxis binsEtaForSparse{"binsEtaForSparse", {50, -1.f, 1.f}, "Binning in eta for optional THnSparse"};
+  ConfigurableAxis binsnSigmaForSparse{"binsnSigmaForSparse", {101, -7.575, 7.575}, "Binning in nsigma for optional THnSparse"};
   Configurable<int> applyEvSel{"applyEvSel", 2, "Flag to apply event selection cut: 0 -> no event selection, 1 -> Run 2 event selection, 2 -> Run 3 event selection"};
   Configurable<int> trackSelection{"trackSelection", 1, "Track selection: 0 -> No Cut, 1 -> kGlobalTrack, 2 -> kGlobalTrackWoPtEta, 3 -> kGlobalTrackWoDCA, 4 -> kQualityTracks, 5 -> kInAcceptanceTracks"};
   Configurable<bool> applyRapidityCut{"applyRapidityCut", false, "Flag to apply rapidity cut"};
   Configurable<bool> splitSignalPerCharge{"splitSignalPerCharge", true, "Split the signal per charge (reduces memory footprint if off)"};
   Configurable<bool> enableDeDxPlot{"enableDeDxPlot", true, "Enables the dEdx plot (reduces memory footprint if off)"};
   Configurable<int16_t> minTPCNcls{"minTPCNcls", 0, "Minimum number or TPC Clusters for tracks"};
-  ConfigurableAxis tpcNclsBins{"tpcNclsBins", {16, 0, 160}, "Bining in number of cluster in TPC"};
+  ConfigurableAxis tpcNclsBins{"tpcNclsBins", {16, 0, 160}, "Binning in number of clusters in TPC"};
   Configurable<bool> fillTHnSparses{"fillTHnSparses", false, "Flag to fill multidimensional histograms for nsigma vs pt, eta, Ncls"};
 
   template <o2::track::PID::ID id>
@@ -185,8 +189,10 @@ struct tpcPidQa {
 
     const AxisSpec etaAxis{etaBins, "#it{#eta}"};
     const AxisSpec tpcnclsAxis{tpcNclsBins, "TPC #cls"};
-
-    HistogramConfigSpec particleSparseHists{HistType::kTHnSparseF, {pAxis, etaAxis, nSigmaAxis, tpcnclsAxis}};
+    const AxisSpec sparseMomentumAxis{binsPForSparse, "#it{p} (GeV/#it{c})"};
+    const AxisSpec sparseEtaAxis{binsEtaForSparse, "#eta"};
+    const AxisSpec sparseNSigmaAxis{binsnSigmaForSparse, "#n_{#sigma}^{TPC}"};
+    HistogramConfigSpec particleSparseHists{HistType::kTHnSparseF, {sparseMomentumAxis, sparseEtaAxis, sparseNSigmaAxis, tpcnclsAxis}};
     if (fillTHnSparses) {
       histos.add(hnsigma_p_eta_Ncl[id].data(), axisTitle, particleSparseHists);
     }
@@ -202,7 +208,7 @@ struct tpcPidQa {
     histos.add(hexpsigma_wTOF[id].data(), "With TOF", kTH2F, {pAxis, expSigmaAxis});
     histos.add(hnsigma_wTOF[id].data(), Form("With TOF %s", axisTitle), kTH2F, {pAxis, nSigmaAxis});
 
-    HistogramConfigSpec particleSparseHists_wTOF{HistType::kTHnSparseF, {pAxis, etaAxis, nSigmaAxis, tpcnclsAxis}};
+    HistogramConfigSpec particleSparseHists_wTOF{HistType::kTHnSparseF, {sparseMomentumAxis, sparseEtaAxis, sparseNSigmaAxis, tpcnclsAxis}};
     if (fillTHnSparses) {
       histos.add(hnsigma_p_eta_Ncl_wTOF[id].data(), Form("With TOF %s", axisTitle), particleSparseHists_wTOF);
     }

DPG/Tasks/AOTTrack/qaEfficiency.cxx

@@ -68,6 +68,7 @@ struct QaEfficiency {
   Configurable<bool> noFakesHits{"noFakesHits", false, "Flag to reject tracks that have fake hits"};
   Configurable<bool> skipEventsWithoutTPCTracks{"skipEventsWithoutTPCTracks", false, "Flag to reject events that have no tracks reconstructed in the TPC"};
   Configurable<float> maxProdRadius{"maxProdRadius", 9999.f, "Maximum production radius of the particle under study"};
+  Configurable<float> nsigmaTPCDe{"nsigmaTPCDe", 3.f, "Value of the Nsigma TPC cut for deuterons PID"};
   // Charge selection
   Configurable<bool> doPositivePDG{"doPositivePDG", false, "Flag to fill histograms for positive PDG codes."};
   Configurable<bool> doNegativePDG{"doNegativePDG", false, "Flag to fill histograms for negative PDG codes."};
@@ -820,10 +821,14 @@ struct QaEfficiency {
 
   void initData(const AxisSpec& axisSel)
   {
-    if (!doprocessData) {
+    if (!doprocessData && !doprocessDataWithPID) {
       return;
     }
 
+    if (doprocessData == true && doprocessDataWithPID == true) {
+      LOG(fatal) << "Can't enable processData and doprocessDataWithPID in the same time, pick one!";
+    }
+
     auto h = histos.add<TH1>("Data/trackSelection", "Track Selection", kTH1F, {axisSel});
     h->GetXaxis()->SetBinLabel(trkCutIdxTrkRead, "Tracks read");
     h->GetXaxis()->SetBinLabel(trkCutIdxHasMcPart, "");
@@ -1640,18 +1645,25 @@ struct QaEfficiency {
     switch (globalTrackSelection) {
       case 0:
         isTrackSelectedAfteAll = true;
+        break;
       case 1:
         isTrackSelectedAfteAll = track.isGlobalTrack();
+        break;
       case 2:
         isTrackSelectedAfteAll = track.isGlobalTrackWoPtEta();
+        break;
       case 3:
         isTrackSelectedAfteAll = track.isGlobalTrackWoDCA();
+        break;
       case 4:
         isTrackSelectedAfteAll = track.isQualityTrack();
+        break;
       case 5:
         isTrackSelectedAfteAll = track.isInAcceptanceTrack();
+        break;
       case 6:
         isTrackSelectedAfteAll = customTrackCuts.IsSelected(track);
+        break;
       default:
         LOG(fatal) << "Can't interpret track asked selection " << globalTrackSelection;
     }
@@ -1925,7 +1937,7 @@ struct QaEfficiency {
       if (!isTrackSelected<false>(track, HIST("Data/trackSelection"))) {
         continue;
       }
-      if (abs(track.tpcNSigmaDe()) > 3.f) {
+      if (abs(track.tpcNSigmaDe()) > nsigmaTPCDe) {
         continue;
       }
       histos.fill(HIST("Data/trackLength"), track.length());
@@ -2036,7 +2048,7 @@ struct QaEfficiency {
       }
     }
   }
-  PROCESS_SWITCH(QaEfficiency, processHmpid, "process HMPID matching", true);
+  PROCESS_SWITCH(QaEfficiency, processHmpid, "process HMPID matching", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)