Skip to content

[PWGCF] DptDpt - Independent CCDB date for PID adjustments #13066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victor-gonzalez merged 1 commit into from
Sep 21, 2025
Merged

[PWGCF] DptDpt - Independent CCDB date for PID adjustments #13066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions PWGCF/TableProducer/dptDptFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,8 @@ struct DptDptFilter {
Configurable<std::string> url{"url", "http://ccdb-test.cern.ch:8080", "The CCDB url for the input file"};
Configurable<std::string> pathNameCorrections{"pathNameCorrections", "", "The CCDB path for the corrections file. Default \"\", i.e. don't load from CCDB"};
Configurable<std::string> pathNamePID{"pathNamePID", "", "The CCDB path for the PID adjusts file. Default \"\", i.e. don't load from CCDB"};
Configurable<std::string> date{"date", "20220307", "The CCDB date for the input file"};
Configurable<std::string> dateCorrections{"dateCorrections", "20220307", "The CCDB date for the corrections input file"};
Configurable<std::string> datePID{"datePID", "20220307", "The CCDB date for the PID adjustments input file"};
Configurable<std::string> suffix{"suffix", "", "Dataset period suffix for metadata discrimination"};
} cfginputfile;
Configurable<bool> cfgFullDerivedData{"cfgFullDerivedData", false, "Produce the full derived data for external storage. Default false"};
Expand Down Expand Up @@ -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<bool> cfgOutDebugInfo{"cfgOutDebugInfo", false, "Out detailed debug information per track into a text file. Default false"};
Configurable<bool> cfgFullDerivedData{"cfgFullDerivedData", false, "Produce the full derived data for external storage. Default false"};
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TableProducer/dptDptFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions PWGCF/Tasks/dptDptCorrelations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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<float>(etabins);
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
Loading