Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions PWGCF/Femto/Core/collisionBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ class CollisionBuilder
}
if (confRct.useRctFlags.value) {
mUseRctFlags = true;
LOG(info) << "Init RCT flag checker with label: " << confRct.label.value << "; use ZDC: " << confRct.useZdc.value << "; Limimted acceptance is bad: " << confRct.treatLimitedAcceptanceAsBad.value;
mRctFlagsChecker.init(confRct.label.value, confRct.useZdc.value, confRct.treatLimitedAcceptanceAsBad.value);
}
mMagFieldForced = confCcdb.magFieldForced.value;
Expand All @@ -440,16 +441,19 @@ class CollisionBuilder
mRunNumber = bc.runNumber();
if (mMagFieldForced == 0) {
static o2::parameters::GRPMagField* grpo = nullptr;
LOG(info) << "Get magentic field with Path: " << mGrpPath << "; Run number: " << mRunNumber;
grpo = ccdb->template getForRun<o2::parameters::GRPMagField>(mGrpPath, mRunNumber);
if (grpo == nullptr) {
LOG(fatal) << "GRP object not found for Run " << mRunNumber;
}
mMagField = static_cast<int>(grpo->getNominalL3Field()); // get magnetic field in kG
} else {
LOG(info) << "Force magentic field to " << mMagFieldForced << "kG";
mMagField = mMagFieldForced;
}

if (mUseTrigger) {
LOG(info) << "Init Zorro with Run Number: " << mRunNumber << "; timestamp: " << bc.timestamp() << "; Trigger Names: " << mTriggerNames;
mZorro.initCCDB(ccdb.service, mRunNumber, bc.timestamp(), mTriggerNames);
mZorro.populateHistRegistry(histRegistry, mRunNumber);
}
Expand All @@ -472,8 +476,10 @@ class CollisionBuilder
bool checkCollision(T1 const& col)
{
// check RCT flags first
if (mUseRctFlags && !mRctFlagsChecker(col)) {
return false;
if (mUseRctFlags) {
if (!mRctFlagsChecker(col)) {
return false;
}
}
// make other checks
return mCollisionSelection.checkFilters(col) &&
Expand Down
1 change: 1 addition & 0 deletions PWGCF/Femto/TableProducer/femtoProducer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ struct FemtoProducer {
}

// init ccdb
LOG(info) << "Setting up connection to CCDB with URL: " << confCcdb.ccdbUrl.value;
ccdb->setURL(confCcdb.ccdbUrl.value);
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
Expand Down
Loading