Skip to content

Commit 69f68c9

Browse files
authored
[PWGLF] Fix CCDB calls in the non-promt cascade code (#9179)
1 parent 0ae1a11 commit 69f68c9

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

PWGLF/Tasks/Strangeness/nonPromptCascade.cxx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,17 +250,21 @@ struct NonPromptCascadeTask {
250250
return;
251251
}
252252
mRunNumber = bc.runNumber();
253-
auto timestamp = bc.timestamp();
254253

255-
if (o2::parameters::GRPObject* grpo = ccdb->getForTimeStamp<o2::parameters::GRPObject>(cfgGRPpath, timestamp)) {
254+
if (o2::parameters::GRPObject* grpo = ccdb->getForRun<o2::parameters::GRPObject>(cfgGRPpath, mRunNumber)) {
256255
o2::base::Propagator::initFieldFromGRP(grpo);
257256
bz = grpo->getNominalL3Field();
258-
} else if (o2::parameters::GRPMagField* grpmag = ccdb->getForTimeStamp<o2::parameters::GRPMagField>(cfgGRPmagPath, timestamp)) {
257+
} else if (o2::parameters::GRPMagField* grpmag = ccdb->getForRun<o2::parameters::GRPMagField>(cfgGRPmagPath, mRunNumber)) {
259258
o2::base::Propagator::initFieldFromGRP(grpmag);
260259
bz = std::lround(5.f * grpmag->getL3Current() / 30000.f);
261260
LOG(debug) << "bz = " << bz;
262261
} else {
263-
LOG(fatal) << "Got nullptr from CCDB for path " << cfgGRPmagPath << " of object GRPMagField and " << cfgGRPpath << " of object GRPObject for timestamp " << timestamp;
262+
LOG(fatal) << "Got nullptr from CCDB for path " << cfgGRPmagPath << " of object GRPMagField and " << cfgGRPpath << " of object GRPObject for run " << mRunNumber;
263+
}
264+
265+
if (static_cast<o2::base::Propagator::MatCorrType>(cfgMaterialCorrection.value) == o2::base::Propagator::MatCorrType::USEMatCorrLUT) {
266+
auto* lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->getForRun<o2::base::MatLayerCylSet>("GLO/Param/MatLUT", mRunNumber));
267+
o2::base::Propagator::Instance(true)->setMatLUT(lut);
264268
}
265269
}
266270

@@ -271,11 +275,6 @@ struct NonPromptCascadeTask {
271275
ccdb->setCaching(true);
272276
ccdb->setLocalObjectValidityChecking();
273277

274-
if (static_cast<o2::base::Propagator::MatCorrType>(cfgMaterialCorrection.value) == o2::base::Propagator::MatCorrType::USEMatCorrLUT) {
275-
auto* lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>("GLO/Param/MatLUT"));
276-
o2::base::Propagator::Instance(true)->setMatLUT(lut);
277-
}
278-
279278
std::vector<double> ptBinning = {0.4, 0.8, 1.2, 1.6, 2.0, 2.4, 2.8, 3.2, 3.6, 4.0, 4.4, 4.8, 5.2, 5.6, 6.0};
280279
AxisSpec ptAxis = {ptBinning, "#it{p}_{T} (GeV/#it{c})"};
281280

0 commit comments

Comments
 (0)