PWGCF: JCorran: Fix track filters (#5615)

* Fix track filters

* clang-format

* JHistManager compiler error fixes

Author: jaelpark

PWGCF/JCorran/Core/JHistManager.cxx

@@ -254,7 +254,7 @@ void JBin::Print()
 int JBin::GetBin(double x)
 {
   auto i = TMath::BinarySearch(fBinD.size(), &fBinD[0], x);
-  if (fMode == kRange && i + 1 >= fBinD.size())
+  if (fMode == kRange && i + 1 >= decltype(i)(fBinD.size()))
     return -1;
   return i;
 }
@@ -590,7 +590,7 @@ TString JTH1::GetString()
   TString s = Form("%s\t%s\t\"%s\"\t%s\t",
                    ClassName(), fName.Data(), fTitle.Data(), fOption.Data());
   for (int i = 0; i < Dimension(); i++) {
-    if (fBins.size() > i && fBins[i] != NULL) {
+    if (decltype(i)(fBins.size()) > i && fBins[i] != NULL) {
       s += " " + fBins[i]->GetName();
     } else {
       s += TString(" ") + Form("%d", SizeOf(i));
@@ -641,8 +641,8 @@ TString JTH1::BuildName()
 {
   TString name = fName;
   if (!HasOption("Single")) {
-    for (UInt_t i = 0; i < Dimension(); i++) {
-      name += ((fBins.size() > i && fBins[i] != NULL) ? fBins[i]->GetIndexName() : "H") + Form("%02d", Index(i));
+    for (int i = 0; i < Dimension(); i++) {
+      name += ((decltype(i)(fBins.size()) > i && fBins[i] != NULL) ? fBins[i]->GetIndexName() : "H") + Form("%02d", Index(i));
     }
   }
   return name;

PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx

@@ -157,14 +157,15 @@ struct jflucAnalysisTask {
     delete pcf;
   }
 
-  O2_DEFINE_CONFIGURABLE(etamin, double, 0.4, "Minimal eta for tracks");
-  O2_DEFINE_CONFIGURABLE(etamax, double, 0.8, "Maximal eta for tracks");
-  O2_DEFINE_CONFIGURABLE(ptmin, double, 0.2, "Minimal pt for tracks");
-  O2_DEFINE_CONFIGURABLE(ptmax, double, 0.5, "Maximal pt for tracks");
+  O2_DEFINE_CONFIGURABLE(etamin, float, 0.4, "Minimal eta for tracks");
+  O2_DEFINE_CONFIGURABLE(etamax, float, 0.8, "Maximal eta for tracks");
+  O2_DEFINE_CONFIGURABLE(ptmin, float, 0.2, "Minimal pt for tracks");
+  O2_DEFINE_CONFIGURABLE(ptmax, float, 0.5, "Maximal pt for tracks");
 
   ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10, 20, 30, 40, 50, 100.1}, "multiplicity / centrality axis for histograms"};
 
-  Filter trackFilter = (aod::track::pt > ptmin) && (aod::track::pt < ptmax); // eta cuts done by jfluc
+  Filter jtrackFilter = (aod::jtrack::pt > ptmin) && (aod::jtrack::pt < ptmax);    // eta cuts done by jfluc
+  Filter cftrackFilter = (aod::cftrack::pt > ptmin) && (aod::cftrack::pt < ptmax); // eta cuts done by jfluc
 
   OutputObj<TDirectory> output{"jflucO2"};