Skip to content

Please consider the following formatting changes to #14986 #5

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
wpierozak merged 1 commit into from
Jan 22, 2026
+210 −212
Merged

Please consider the following formatting changes to #14986 #5

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
73 changes: 36 additions & 37 deletions Detectors/FIT/FT0/calibration/include/FT0Calibration/EventsPerBcCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,52 @@

namespace o2::ft0
{
struct EventsPerBc
{
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
struct EventsPerBc {
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}

size_t getEntries() const { return entries; }
void print() const;
void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
void merge(const EventsPerBc* prev);
size_t getEntries() const { return entries; }
void print() const;
void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
void merge(const EventsPerBc* prev);

const int32_t mMinAmplitudeSideA;
const int32_t mMinAmplitudeSideC;
const int32_t mMinAmplitudeSideA;
const int32_t mMinAmplitudeSideC;

std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
size_t entries{0};
long startTimeStamp{0};
long stopTimeStamp{0};
std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
size_t entries{0};
long startTimeStamp{0};
long stopTimeStamp{0};

ClassDefNV(EventsPerBc, 1);
};
ClassDefNV(EventsPerBc, 1);
};

class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
{
using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
using TFType = o2::calibration::TFType;
using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
{
using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
using TFType = o2::calibration::TFType;
using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;

public:
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
public:
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);

bool hasEnoughData(const Slot& slot) const override;
void initOutput() override;
void finalizeSlot(Slot& slot) override;
Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
bool hasEnoughData(const Slot& slot) const override;
void initOutput() override;
void finalizeSlot(Slot& slot) override;
Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;

const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }

private:
const uint32_t mMinNumberOfEntries;
const int32_t mMinAmplitudeSideA;
const int32_t mMinAmplitudeSideC;
private:
const uint32_t mMinNumberOfEntries;
const int32_t mMinAmplitudeSideA;
const int32_t mMinAmplitudeSideC;

std::vector<EventsHistogram> mTvxPerBcs;
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
std::vector<EventsHistogram> mTvxPerBcs;
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;

ClassDefOverride(EventsPerBcCalibrator, 1);
};
}
ClassDefOverride(EventsPerBcCalibrator, 1);
};
} // namespace o2::ft0

#endif
114 changes: 57 additions & 57 deletions Detectors/FIT/FT0/calibration/src/EventsPerBcCalibrator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,70 @@

namespace o2::ft0
{
void EventsPerBc::print() const
{
LOG(info) << entries << " entries";
}
void EventsPerBc::print() const
{
LOG(info) << entries << " entries";
}

void EventsPerBc::fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data)
{
size_t oldEntries = entries;
for(const auto& digit: data) {
double isVertex = digit.mTriggers.getVertex();
if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
continue;
}
mTvx[digit.mIntRecord.bc] += isVertex;
entries += isVertex;
}
LOG(debug) << "Container is filled with " << entries - oldEntries << " new events";
void EventsPerBc::fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data)
{
size_t oldEntries = entries;
for (const auto& digit : data) {
double isVertex = digit.mTriggers.getVertex();
if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
continue;
}
mTvx[digit.mIntRecord.bc] += isVertex;
entries += isVertex;
}
LOG(debug) << "Container is filled with " << entries - oldEntries << " new events";
}

void EventsPerBc::merge(const EventsPerBc* prev)
{
for(int bc = 0; bc < o2::constants::lhc::LHCMaxBunches; bc++){
mTvx[bc] += prev->mTvx[bc];
}
entries += prev->entries;
}
void EventsPerBc::merge(const EventsPerBc* prev)
{
for (int bc = 0; bc < o2::constants::lhc::LHCMaxBunches; bc++) {
mTvx[bc] += prev->mTvx[bc];
}
entries += prev->entries;
}

void EventsPerBcCalibrator::initOutput()
{
mTvxPerBcs.clear();
mTvxPerBcInfos.clear();
}
void EventsPerBcCalibrator::initOutput()
{
mTvxPerBcs.clear();
mTvxPerBcInfos.clear();
}

EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
{
LOG(info) << "Defined threshold for number of entires per slot: " << mMinNumberOfEntries;
LOG(info) << "Defined threshold for side A amplitude for event: " << mMinAmplitudeSideA;
LOG(info) << "Defined threshold for side C amplitude for event: " << mMinAmplitudeSideC;
}
EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
{
LOG(info) << "Defined threshold for number of entires per slot: " << mMinNumberOfEntries;
LOG(info) << "Defined threshold for side A amplitude for event: " << mMinAmplitudeSideA;
LOG(info) << "Defined threshold for side C amplitude for event: " << mMinAmplitudeSideC;
}

bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
{
return slot.getContainer()->entries > mMinNumberOfEntries;
}
bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
{
return slot.getContainer()->entries > mMinNumberOfEntries;
}

void EventsPerBcCalibrator::finalizeSlot(EventsPerBcCalibrator::Slot& slot)
{
LOG(info) << "Finalizing slot from " << slot.getStartTimeMS() << " to " << slot.getEndTimeMS();
o2::ft0::EventsPerBc* data = slot.getContainer();
mTvxPerBcs.emplace_back(std::move(data->mTvx));
void EventsPerBcCalibrator::finalizeSlot(EventsPerBcCalibrator::Slot& slot)
{
LOG(info) << "Finalizing slot from " << slot.getStartTimeMS() << " to " << slot.getEndTimeMS();
o2::ft0::EventsPerBc* data = slot.getContainer();
mTvxPerBcs.emplace_back(std::move(data->mTvx));

auto clName = o2::utils::MemFileHelper::getClassName(mTvxPerBcs.back());
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
auto clName = o2::utils::MemFileHelper::getClassName(mTvxPerBcs.back());
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);

std::map<std::string, std::string> metaData;
mTvxPerBcInfos.emplace_back(std::make_unique<o2::ccdb::CcdbObjectInfo>("FT0/Calib/EventsPerBc", clName, flName, metaData, slot.getStartTimeMS(), slot.getEndTimeMS()));
LOG(info) << "Created object valid from " << mTvxPerBcInfos.back()->getStartValidityTimestamp() << " to " << mTvxPerBcInfos.back()->getEndValidityTimestamp();
}
std::map<std::string, std::string> metaData;
mTvxPerBcInfos.emplace_back(std::make_unique<o2::ccdb::CcdbObjectInfo>("FT0/Calib/EventsPerBc", clName, flName, metaData, slot.getStartTimeMS(), slot.getEndTimeMS()));
LOG(info) << "Created object valid from " << mTvxPerBcInfos.back()->getStartValidityTimestamp() << " to " << mTvxPerBcInfos.back()->getEndValidityTimestamp();
}

EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)
{
auto& cont = getSlots();
auto& slot = front ? cont.emplace_front(tstart, tend) : cont.emplace_back(tstart, tend);
slot.setContainer(std::make_unique<EventsPerBc>(mMinAmplitudeSideA, mMinAmplitudeSideC));
return slot;
}
}
EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)
{
auto& cont = getSlots();
auto& slot = front ? cont.emplace_front(tstart, tend) : cont.emplace_back(tstart, tend);
slot.setContainer(std::make_unique<EventsPerBc>(mMinAmplitudeSideA, mMinAmplitudeSideC));
return slot;
}
} // namespace o2::ft0
48 changes: 24 additions & 24 deletions Detectors/FIT/FT0/calibration/workflow/FT0EventsPerBcProcessor-Workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
#include <limits>
o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc)
{
using namespace o2::framework;
using o2::calibration::FT0EventsPerBcProcessor;
std::vector<InputSpec> inputs;
auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true, // orbitResetTime
false, // GRPECS=true
using namespace o2::framework;
using o2::calibration::FT0EventsPerBcProcessor;
std::vector<InputSpec> inputs;
auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true, // orbitResetTime
false, // GRPECS=true
false, // GRPLHCIF
false, // GRPMagField
false, // askMatLUT
o2::base::GRPGeomRequest::None, // geometry
inputs);
inputs.emplace_back("digits", "FT0", "DIGITSBC");
std::vector<OutputSpec> outputs;
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
DataProcessorSpec dataProcessorSpec{
"FT0EventsPerBcProcessor",
inputs,
outputs,
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>(ccdbRequest)),
Options{
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
{"min-ampl-side-a", VariantType::Int, 0, {"Amplitude threshold for Side A events"}},
{"min-ampl-side-c", VariantType::Int, 0, {"Amplitude threshold for Side C events"}}}};
inputs.emplace_back("digits", "FT0", "DIGITSBC");
std::vector<OutputSpec> outputs;
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
DataProcessorSpec dataProcessorSpec{
"FT0EventsPerBcProcessor",
inputs,
outputs,
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>(ccdbRequest)),
Options{
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
{"min-ampl-side-a", VariantType::Int, 0, {"Amplitude threshold for Side A events"}},
{"min-ampl-side-c", VariantType::Int, 0, {"Amplitude threshold for Side C events"}}}};

WorkflowSpec workflow;
workflow.emplace_back(dataProcessorSpec);
return workflow;
WorkflowSpec workflow;
workflow.emplace_back(dataProcessorSpec);
return workflow;
}
Loading