Merge branch 'AliceO2Group:master' into master

Author: arvindkhuntia

EventFiltering/macros/getMenu.C

@@ -12,9 +12,17 @@
 #include "CCDB/BasicCCDBManager.h"
 
 #include <TAxis.h>
+#include <TFile.h>
+#include <TGrid.h>
 #include <TH1.h>
+#include <TSystem.h>
 
+#include <iostream>
+#include <regex>
+#include <set>
+#include <sstream>
 #include <string>
+#include <vector>
 
 void getMenu(int runNumber, std::string baseCCDBPath = "Users/m/mpuccio/EventFiltering/OTS/Chunked/")
 {
@@ -29,3 +37,87 @@ void getMenu(int runNumber, std::string baseCCDBPath = "Users/m/mpuccio/EventFil
     std::cout << "Id " << i - 2 << ": " << axis->GetBinLabel(i) << "\n";
   }
 }
+
+std::vector<std::string> getMenuForPeriod(std::string period)
+{
+  std::regex pattern(R"(LHC(\d{2})[A-Za-z]{1,2})");
+  std::smatch match;
+
+  int year{2000};
+  if (!std::regex_match(period, match, pattern)) {
+    std::cout << "Invalid format for period: " << period << std::endl;
+    return {};
+  }
+
+  year += std::stoi(match[1]);
+  gSystem->Exec(Form("alien_find /alice/data/%i/%s/ ctf_skim_full/AnalysisResults_fullrun.root > list_tmp_%s.txt", year, period.data(), period.data()));
+
+  std::ifstream file(Form("list_tmp_%s.txt", period.data()));
+  if (!file) {
+    std::cerr << "Error: could not open file for period " << period << "\n";
+    return {};
+  }
+
+  std::string firstLine;
+  if (!std::getline(file, firstLine)) {
+    std::cerr << "Error: file is empty or read failed for period " << period << "\n";
+    return {};
+  }
+
+  TGrid::Connect("alien://");
+  TFile* scalersFile = TFile::Open((std::string("alien://") + firstLine).data(), "READ");
+  TH1D* counters = (TH1D*)scalersFile->Get("central-event-filter-task/scalers/mFiltered");
+  TAxis* axis = counters->GetXaxis();
+
+  std::vector<std::string> binLabels(axis->GetNbins() - 2);
+  for (int i = 2; i < axis->GetNbins(); ++i) {
+    binLabels[i - 2] = axis->GetBinLabel(i);
+  }
+
+  scalersFile->Close();
+  delete scalersFile;
+  gSystem->Exec(Form("rm list_tmp_%s.txt", period.data()));
+
+  return binLabels;
+}
+
+void getMenu(std::string periods)
+{
+  std::stringstream ss(periods);
+  std::string period;
+  std::vector<std::string> periodList;
+
+  // Parse comma-separated periods
+  while (std::getline(ss, period, ',')) {
+    // Trim whitespace
+    period.erase(0, period.find_first_not_of(" \t"));
+    period.erase(period.find_last_not_of(" \t") + 1);
+    periodList.push_back(period);
+  }
+
+  std::map<std::vector<std::string>, std::vector<std::string>> menuGroups;
+
+  // Get menus for each period
+  for (const auto& p : periodList) {
+    auto menu = getMenuForPeriod(p);
+    if (!menu.empty()) {
+      menuGroups[menu].push_back(p);
+    }
+  }
+
+  // Report different menus
+  int menuId = 1;
+  for (const auto& [menu, periods] : menuGroups) {
+    std::cout << "\n=== Menu " << menuId++ << " (periods: ";
+    for (size_t i = 0; i < periods.size(); ++i) {
+      std::cout << periods[i];
+      if (i < periods.size() - 1)
+        std::cout << ", ";
+    }
+    std::cout << ") ===\n";
+
+    for (size_t i = 0; i < menu.size(); ++i) {
+      std::cout << "Id " << i << ": " << menu[i] << "\n";
+    }
+  }
+}

PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h

@@ -317,11 +317,11 @@ void FemtoUniverseCascadeSelection::init(HistogramRegistry* registry)
                     "container - quitting!";
     }
 
-    posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
+    posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
                        aod::femtouniverseparticle::TrackType::kPosChild,
                        aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
-    negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
+    negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
                        aod::femtouniverseparticle::TrackType::kNegChild,
                        aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
@@ -580,9 +580,9 @@ void FemtoUniverseCascadeSelection::fillCascadeQA(Col const& col, Casc const& ca
 template <typename Col, typename Casc, typename Track>
 void FemtoUniverseCascadeSelection::fillQA(Col const& /*col*/, Casc const& /*cascade*/, Track const& posTrack, Track const& negTrack, Track const& bachTrack)
 {
-  posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
+  posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
                        aod::femtouniverseparticle::TrackType::kPosChild>(posTrack);
-  negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
+  negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
                        aod::femtouniverseparticle::TrackType::kNegChild>(negTrack);
   bachTrackSel.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeBachelor,
                       aod::femtouniverseparticle::TrackType::kBachelor>(bachTrack);

PWGCF/FemtoUniverse/DataModel/FemtoDerived.h

@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
@@ -64,6 +66,7 @@ enum ParticleType {
   kV0,              //! V0
   kV0Child,         //! Child track of a V0
   kCascade,         //! Cascade
+  kCascadeV0Child,  //! Child track of a V0 coming from a cascade
   kCascadeBachelor, //! Bachelor track of a cascade
   kPhi,             //! Phi meson
   kPhiChild,        //! Child track of a Phi meson
@@ -72,7 +75,7 @@ enum ParticleType {
   kNParticleTypes   //! Number of particle types
 };
 
-static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
+static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeV0Child,", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
 static constexpr std::string_view TempFitVarName[kNParticleTypes] = {"/hDCAxy", "/hPDGvspT", "/hCPA", "/hDCAxy", "/hCPA", "/hDCAxy", "/hInvMass", "/hDCAxy", "/hInvMass", "/hDCAxy"};
 
 using CutContainerType = uint32_t; //! Definition of the data type for the bit-wise container for the different selection criteria

PWGCF/Flow/Tasks/flowTask.cxx

@@ -72,7 +72,9 @@ struct FlowTask {
   O2_DEFINE_CONFIGURABLE(cfgCutPtMin, float, 0.2f, "Minimal pT for all tracks")
   O2_DEFINE_CONFIGURABLE(cfgCutPtMax, float, 10.0f, "Maximal pT for all tracks")
   O2_DEFINE_CONFIGURABLE(cfgCutEta, float, 0.8f, "Eta range for tracks")
-  O2_DEFINE_CONFIGURABLE(cfgEtaPtPt, float, 0.4, "eta cut for pt-pt correlations");
+  O2_DEFINE_CONFIGURABLE(cfgEtaPtPt, float, 0.4, "eta range for pt-pt correlations")
+  O2_DEFINE_CONFIGURABLE(cfgEtaGapPtPt, float, 0.2, "eta gap for pt-pt correlations, cfgEtaGapPtPt<|eta|<cfgEtaPtPt")
+  O2_DEFINE_CONFIGURABLE(cfgEtaGapPtPtEnabled, bool, false, "switch of subevent pt-pt correlations")
   O2_DEFINE_CONFIGURABLE(cfgCutChi2prTPCcls, float, 2.5f, "max chi2 per TPC clusters")
   O2_DEFINE_CONFIGURABLE(cfgCutTPCclu, float, 50.0f, "minimum TPC clusters")
   O2_DEFINE_CONFIGURABLE(cfgCutTPCCrossedRows, float, 70.0f, "minimum TPC crossed rows")
@@ -508,6 +510,8 @@ struct FlowTask {
     fFCpt->setUseCentralMoments(cfgUseCentralMoments);
     fFCpt->setUseGapMethod(true);
     fFCpt->initialise(axisIndependent, cfgMpar, gfwConfigs, cfgNbootstrap);
+    if (cfgEtaGapPtPtEnabled)
+      fFCpt->initialiseSubevent(axisIndependent, cfgMpar, cfgNbootstrap);
     for (auto i = 0; i < gfwConfigs.GetSize(); ++i) {
       corrconfigsPtVn.push_back(fGFW->GetCorrelatorConfig(gfwConfigs.GetCorrs()[i], gfwConfigs.GetHeads()[i], gfwConfigs.GetpTDifs()[i]));
     }
@@ -642,6 +646,14 @@ struct FlowTask {
   {
     if (std::abs(track.eta()) < cfgEtaPtPt) {
       (dt == kGen) ? fFCptgen->fill(1., track.pt()) : fFCpt->fill(weff, track.pt());
+      if (cfgEtaGapPtPtEnabled) {
+        if (track.eta() < -1. * cfgEtaGapPtPt) {
+          (dt == kGen) ? fFCptgen->fillSub1(1., track.pt()) : fFCpt->fillSub1(weff, track.pt());
+        }
+        if (track.eta() > cfgEtaGapPtPt) {
+          (dt == kGen) ? fFCptgen->fillSub2(1., track.pt()) : fFCpt->fillSub2(weff, track.pt());
+        }
+      }
     }
   }
 
@@ -651,6 +663,11 @@ struct FlowTask {
     (dt == kGen) ? fFCptgen->calculateCorrelations() : fFCpt->calculateCorrelations();
     (dt == kGen) ? fFCptgen->fillPtProfiles(centmult, rndm) : fFCpt->fillPtProfiles(centmult, rndm);
     (dt == kGen) ? fFCptgen->fillCMProfiles(centmult, rndm) : fFCpt->fillCMProfiles(centmult, rndm);
+    if (cfgEtaGapPtPtEnabled) {
+      (dt == kGen) ? fFCptgen->calculateSubeventCorrelations() : fFCpt->calculateSubeventCorrelations();
+      (dt == kGen) ? fFCptgen->fillSubeventPtProfiles(centmult, rndm) : fFCpt->fillSubeventPtProfiles(centmult, rndm);
+      (dt == kGen) ? fFCptgen->fillCMSubeventProfiles(centmult, rndm) : fFCpt->fillCMSubeventProfiles(centmult, rndm);
+    }
     for (uint l_ind = 0; l_ind < corrconfigsPtVn.size(); ++l_ind) {
       if (!corrconfigsPtVn.at(l_ind).pTDif) {
         auto dnx = fGFW->Calculate(corrconfigsPtVn.at(l_ind), 0, kTRUE).real();