Skip to content

Commit 1303b68

Browse files
author
Emil Gorm Nielsen
committed
load run-by-run weights with PID information correctly
1 parent c70d557 commit 1303b68

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -385,29 +385,19 @@ struct FlowGenericFramework {
385385
uint64_t timestamp = bc.timestamp();
386386
if (cfg.correctionsLoaded)
387387
return;
388-
//old
389-
/* if (!cfgAcceptance.value.empty()) {
390-
cfg.mAcceptance = ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance, timestamp);
391-
if (cfg.mAcceptance)
392-
LOGF(info, "Loaded acceptance weights from %s", cfgAcceptance.value.c_str());
393-
else
394-
LOGF(warning, "Could not load acceptance weights from %s", cfgAcceptance.value.c_str());
395-
} */
396-
//new
397-
/*if(!cfgAcceptance.value.empty()) {
398-
std::string runstr = (cfgRunByRun)?"RBR/":"";
388+
if(!cfgAcceptance.value.empty()) {
389+
std::string runstr = (cfgRunByRun)?"RBR/":"";
399390
if(cfgUsePID){
400-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance+runstr+"ref/", timestamp));
401-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance+runstr+"ch/", timestamp));
402-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance+runstr+"pi/", timestamp));
403-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance+runstr+"ka/", timestamp));
404-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance+runstr+"pr/", timestamp));
391+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value+runstr+"ref/", timestamp));
392+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value+runstr+"ch/", timestamp));
393+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value+runstr+"pi/", timestamp));
394+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value+runstr+"ka/", timestamp));
395+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value+runstr+"pr/", timestamp));
405396
}
406397
else {
407-
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance + runstr, timestamp));
398+
cfg.mAcceptance.push_back(ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance.value + runstr, timestamp));
408399
}
409400
}
410-
*/
411401
if (!cfgEfficiency.value.empty()) {
412402
cfg.mEfficiency = ccdb->getForTimeStamp<TH1D>(cfgEfficiency, timestamp);
413403
if (cfg.mEfficiency == nullptr) {
@@ -422,9 +412,9 @@ struct FlowGenericFramework {
422412
double getAcceptance(TTrack track, const double& vtxz, int index)
423413
{ // 0 ref, 1 ch, 2 pi, 3 ka, 4 pr
424414
double wacc = 1;
425-
/* if (!cfg.mAcceptance.empty())
415+
if (!cfg.mAcceptance.empty())
426416
wacc = cfg.mAcceptance[index]->getNUA(track.phi(), track.eta(), vtxz);
427-
return wacc;*/
417+
return wacc;
428418
}
429419

430420
template <typename TTrack>

0 commit comments

Comments
 (0)