From 5caf1f4c6544ec4a0107edad820cabd5a6f6502b Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 21 Sep 2025 16:56:38 +0200 Subject: [PATCH] [PWGCF] DptDpt - Independent CCDB date for PID adjustments --- PWGCF/TableProducer/dptDptFilter.cxx | 13 +++++++------ PWGCF/TableProducer/dptDptFilter.h | 2 +- PWGCF/Tasks/dptDptCorrelations.cxx | 10 +++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/PWGCF/TableProducer/dptDptFilter.cxx b/PWGCF/TableProducer/dptDptFilter.cxx index 25f54b5bdc8..d0feab6ac6d 100644 --- a/PWGCF/TableProducer/dptDptFilter.cxx +++ b/PWGCF/TableProducer/dptDptFilter.cxx @@ -540,7 +540,8 @@ struct DptDptFilter { Configurable url{"url", "http://ccdb-test.cern.ch:8080", "The CCDB url for the input file"}; Configurable pathNameCorrections{"pathNameCorrections", "", "The CCDB path for the corrections file. Default \"\", i.e. don't load from CCDB"}; Configurable pathNamePID{"pathNamePID", "", "The CCDB path for the PID adjusts file. Default \"\", i.e. don't load from CCDB"}; - Configurable date{"date", "20220307", "The CCDB date for the input file"}; + Configurable dateCorrections{"dateCorrections", "20220307", "The CCDB date for the corrections input file"}; + Configurable datePID{"datePID", "20220307", "The CCDB date for the PID adjustments input file"}; Configurable suffix{"suffix", "", "Dataset period suffix for metadata discrimination"}; } cfginputfile; Configurable cfgFullDerivedData{"cfgFullDerivedData", false, "Produce the full derived data for external storage. Default false"}; @@ -1101,7 +1102,7 @@ struct DptDptFilterTracks { std::string cfgCCDBUrl{"http://ccdb-test.cern.ch:8080"}; std::string cfgCCDBPathNamePID{""}; - std::string cfgCCDBDate{"20220307"}; + std::string cfgCCDBDatePID{"20220307"}; Configurable cfgOutDebugInfo{"cfgOutDebugInfo", false, "Out detailed debug information per track into a text file. Default false"}; Configurable cfgFullDerivedData{"cfgFullDerivedData", false, "Produce the full derived data for external storage. Default false"}; @@ -1172,7 +1173,7 @@ struct DptDptFilterTracks { /* self configure the CCDB access to the input file */ getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.url", cfgCCDBUrl, false); getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.pathNamePID", cfgCCDBPathNamePID, false); - getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.date", cfgCCDBDate, false); + getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.datePID", cfgCCDBDatePID, false); /* create the output list which will own the task histograms */ TList* fOutputList = new TList(); @@ -1439,9 +1440,9 @@ struct DptDptFilterTracks { using namespace analysis::dptdptfilter; /* let's get a potential PID adjustment */ - if ((cfgCCDBDate.length() > 0) && (cfgCCDBPathNamePID.length() > 0) && !storedccdbinfo) { - LOGF(info, "Getting information for PID adjustment from %s, at %s", cfgCCDBPathNamePID.c_str(), cfgCCDBDate.c_str()); - TList* pidinfo = getCCDBInput(ccdb, cfgCCDBPathNamePID.c_str(), cfgCCDBDate.c_str()); + if ((cfgCCDBDatePID.length() > 0) && (cfgCCDBPathNamePID.length() > 0) && !storedccdbinfo) { + LOGF(info, "Getting information for PID adjustment from %s, at %s", cfgCCDBPathNamePID.c_str(), cfgCCDBDatePID.c_str()); + TList* pidinfo = getCCDBInput(ccdb, cfgCCDBPathNamePID.c_str(), cfgCCDBDatePID.c_str()); if (pidinfo != nullptr) { pidselector.storePIDAdjustments(pidinfo); } diff --git a/PWGCF/TableProducer/dptDptFilter.h b/PWGCF/TableProducer/dptDptFilter.h index 5af712a2ec7..1920505d46a 100644 --- a/PWGCF/TableProducer/dptDptFilter.h +++ b/PWGCF/TableProducer/dptDptFilter.h @@ -1163,7 +1163,7 @@ inline float extractMultiplicity(CollisionObject const& collision, CentMultEstim return collision.multFT0A(); break; case CentMultFT0C: - return collision.multFT0M(); + return collision.multFT0C(); break; case CentMultNTPV: return collision.multNTracksPV(); diff --git a/PWGCF/Tasks/dptDptCorrelations.cxx b/PWGCF/Tasks/dptDptCorrelations.cxx index 3b5877a9966..e6ee088eca0 100644 --- a/PWGCF/Tasks/dptDptCorrelations.cxx +++ b/PWGCF/Tasks/dptDptCorrelations.cxx @@ -909,7 +909,7 @@ struct DptDptCorrelations { bool loadfromccdb = false; std::string cfgCCDBUrl{"http://ccdb-test.cern.ch:8080"}; std::string cfgCCDBPathNameCorrections{""}; - std::string cfgCCDBDate{"20220307"}; + std::string cfgCCDBDateCorrections{"20220307"}; std::string cfgCCDBSuffix{""}; /* pair conversion suppression defaults */ @@ -973,9 +973,9 @@ struct DptDptCorrelations { /* self configure the CCDB access to the input file */ getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.url", cfgCCDBUrl, false); getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.pathNameCorrections", cfgCCDBPathNameCorrections, false); - getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.date", cfgCCDBDate, false); + getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.dateCorrections", cfgCCDBDateCorrections, false); getTaskOptionValue(initContext, "dpt-dpt-filter", "cfgCCDB.suffix", cfgCCDBSuffix, false); - loadfromccdb = (cfgCCDBDate.length() > 0) && (cfgCCDBPathNameCorrections.length() > 0); + loadfromccdb = (cfgCCDBDateCorrections.length() > 0) && (cfgCCDBPathNameCorrections.length() > 0); /* update the potential binning change */ etabinwidth = (etaup - etalow) / static_cast(etabins); @@ -1230,7 +1230,7 @@ struct DptDptCorrelations { if (ccdblst == nullptr) { if (loadfromccdb) { - ccdblst = getCCDBInput(ccdb, cfgCCDBPathNameCorrections.c_str(), cfgCCDBDate.c_str(), true, cfgCCDBSuffix); + ccdblst = getCCDBInput(ccdb, cfgCCDBPathNameCorrections.c_str(), cfgCCDBDateCorrections.c_str(), true, cfgCCDBSuffix); } } @@ -1326,7 +1326,7 @@ struct DptDptCorrelations { if (ccdblst == nullptr) { if (loadfromccdb) { - ccdblst = getCCDBInput(ccdb, cfgCCDBPathNameCorrections.c_str(), cfgCCDBDate.c_str(), true, cfgCCDBSuffix); + ccdblst = getCCDBInput(ccdb, cfgCCDBPathNameCorrections.c_str(), cfgCCDBDateCorrections.c_str(), true, cfgCCDBSuffix); } }