Skip to content

Commit b4aead4

Browse files
wpierozakwpierozak
authored
Merge pull request #5 from alibuild/alibot-cleanup-14986
Please consider the following formatting changes to #14986
2 parents 61f71e9 + 3c5b138 commit b4aead4

File tree

4 files changed

+210
-212
lines changed

4 files changed

+210
-212
lines changed

‎Detectors/FIT/FT0/calibration/include/FT0Calibration/EventsPerBcCalibrator.h‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,52 @@
1818

1919
namespace o2::ft0
2020
{
21-
struct EventsPerBc
22-
{
23-
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
21+
struct EventsPerBc {
22+
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
2423

25-
size_t getEntries() const { return entries; }
26-
void print() const;
27-
void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
28-
void merge(const EventsPerBc* prev);
24+
size_t getEntries() const { return entries; }
25+
void print() const;
26+
void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
27+
void merge(const EventsPerBc* prev);
2928

30-
const int32_t mMinAmplitudeSideA;
31-
const int32_t mMinAmplitudeSideC;
29+
const int32_t mMinAmplitudeSideA;
30+
const int32_t mMinAmplitudeSideC;
3231

33-
std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
34-
size_t entries{0};
35-
long startTimeStamp{0};
36-
long stopTimeStamp{0};
32+
std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
33+
size_t entries{0};
34+
long startTimeStamp{0};
35+
long stopTimeStamp{0};
3736

38-
ClassDefNV(EventsPerBc, 1);
39-
};
37+
ClassDefNV(EventsPerBc, 1);
38+
};
4039

41-
class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
42-
{
43-
using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
44-
using TFType = o2::calibration::TFType;
45-
using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
40+
class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
41+
{
42+
using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
43+
using TFType = o2::calibration::TFType;
44+
using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
4645

47-
public:
48-
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
46+
public:
47+
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
4948

50-
bool hasEnoughData(const Slot& slot) const override;
51-
void initOutput() override;
52-
void finalizeSlot(Slot& slot) override;
53-
Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
49+
bool hasEnoughData(const Slot& slot) const override;
50+
void initOutput() override;
51+
void finalizeSlot(Slot& slot) override;
52+
Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
5453

55-
const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
56-
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
54+
const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
55+
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
5756

58-
private:
59-
const uint32_t mMinNumberOfEntries;
60-
const int32_t mMinAmplitudeSideA;
61-
const int32_t mMinAmplitudeSideC;
57+
private:
58+
const uint32_t mMinNumberOfEntries;
59+
const int32_t mMinAmplitudeSideA;
60+
const int32_t mMinAmplitudeSideC;
6261

63-
std::vector<EventsHistogram> mTvxPerBcs;
64-
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
62+
std::vector<EventsHistogram> mTvxPerBcs;
63+
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
6564

66-
ClassDefOverride(EventsPerBcCalibrator, 1);
67-
};
68-
}
65+
ClassDefOverride(EventsPerBcCalibrator, 1);
66+
};
67+
} // namespace o2::ft0
6968

7069
#endif

‎Detectors/FIT/FT0/calibration/src/EventsPerBcCalibrator.cxx‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,70 @@
33

44
namespace o2::ft0
55
{
6-
void EventsPerBc::print() const
7-
{
8-
LOG(info) << entries << " entries";
9-
}
6+
void EventsPerBc::print() const
7+
{
8+
LOG(info) << entries << " entries";
9+
}
1010

11-
void EventsPerBc::fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data)
12-
{
13-
size_t oldEntries = entries;
14-
for(const auto& digit: data) {
15-
double isVertex = digit.mTriggers.getVertex();
16-
if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
17-
continue;
18-
}
19-
mTvx[digit.mIntRecord.bc] += isVertex;
20-
entries += isVertex;
21-
}
22-
LOG(debug) << "Container is filled with " << entries - oldEntries << " new events";
11+
void EventsPerBc::fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data)
12+
{
13+
size_t oldEntries = entries;
14+
for (const auto& digit : data) {
15+
double isVertex = digit.mTriggers.getVertex();
16+
if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
17+
continue;
2318
}
19+
mTvx[digit.mIntRecord.bc] += isVertex;
20+
entries += isVertex;
21+
}
22+
LOG(debug) << "Container is filled with " << entries - oldEntries << " new events";
23+
}
2424

25-
void EventsPerBc::merge(const EventsPerBc* prev)
26-
{
27-
for(int bc = 0; bc < o2::constants::lhc::LHCMaxBunches; bc++){
28-
mTvx[bc] += prev->mTvx[bc];
29-
}
30-
entries += prev->entries;
31-
}
25+
void EventsPerBc::merge(const EventsPerBc* prev)
26+
{
27+
for (int bc = 0; bc < o2::constants::lhc::LHCMaxBunches; bc++) {
28+
mTvx[bc] += prev->mTvx[bc];
29+
}
30+
entries += prev->entries;
31+
}
3232

33-
void EventsPerBcCalibrator::initOutput()
34-
{
35-
mTvxPerBcs.clear();
36-
mTvxPerBcInfos.clear();
37-
}
33+
void EventsPerBcCalibrator::initOutput()
34+
{
35+
mTvxPerBcs.clear();
36+
mTvxPerBcInfos.clear();
37+
}
3838

39-
EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
40-
{
41-
LOG(info) << "Defined threshold for number of entires per slot: " << mMinNumberOfEntries;
42-
LOG(info) << "Defined threshold for side A amplitude for event: " << mMinAmplitudeSideA;
43-
LOG(info) << "Defined threshold for side C amplitude for event: " << mMinAmplitudeSideC;
44-
}
39+
EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
40+
{
41+
LOG(info) << "Defined threshold for number of entires per slot: " << mMinNumberOfEntries;
42+
LOG(info) << "Defined threshold for side A amplitude for event: " << mMinAmplitudeSideA;
43+
LOG(info) << "Defined threshold for side C amplitude for event: " << mMinAmplitudeSideC;
44+
}
4545

46-
bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
47-
{
48-
return slot.getContainer()->entries > mMinNumberOfEntries;
49-
}
46+
bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
47+
{
48+
return slot.getContainer()->entries > mMinNumberOfEntries;
49+
}
5050

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

57-
auto clName = o2::utils::MemFileHelper::getClassName(mTvxPerBcs.back());
58-
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
57+
auto clName = o2::utils::MemFileHelper::getClassName(mTvxPerBcs.back());
58+
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
5959

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

65-
EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)
66-
{
67-
auto& cont = getSlots();
68-
auto& slot = front ? cont.emplace_front(tstart, tend) : cont.emplace_back(tstart, tend);
69-
slot.setContainer(std::make_unique<EventsPerBc>(mMinAmplitudeSideA, mMinAmplitudeSideC));
70-
return slot;
71-
}
72-
}
65+
EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)
66+
{
67+
auto& cont = getSlots();
68+
auto& slot = front ? cont.emplace_front(tstart, tend) : cont.emplace_back(tstart, tend);
69+
slot.setContainer(std::make_unique<EventsPerBc>(mMinAmplitudeSideA, mMinAmplitudeSideC));
70+
return slot;
71+
}
72+
} // namespace o2::ft0

‎Detectors/FIT/FT0/calibration/workflow/FT0EventsPerBcProcessor-Workflow.cxx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
#include <limits>
33
o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc)
44
{
5-
using namespace o2::framework;
6-
using o2::calibration::FT0EventsPerBcProcessor;
7-
std::vector<InputSpec> inputs;
8-
auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true, // orbitResetTime
9-
false, // GRPECS=true
5+
using namespace o2::framework;
6+
using o2::calibration::FT0EventsPerBcProcessor;
7+
std::vector<InputSpec> inputs;
8+
auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true, // orbitResetTime
9+
false, // GRPECS=true
1010
false, // GRPLHCIF
1111
false, // GRPMagField
1212
false, // askMatLUT
1313
o2::base::GRPGeomRequest::None, // geometry
1414
inputs);
15-
inputs.emplace_back("digits", "FT0", "DIGITSBC");
16-
std::vector<OutputSpec> outputs;
17-
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
18-
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
19-
DataProcessorSpec dataProcessorSpec{
20-
"FT0EventsPerBcProcessor",
21-
inputs,
22-
outputs,
23-
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>(ccdbRequest)),
24-
Options{
25-
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
26-
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
27-
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
28-
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
29-
{"min-ampl-side-a", VariantType::Int, 0, {"Amplitude threshold for Side A events"}},
30-
{"min-ampl-side-c", VariantType::Int, 0, {"Amplitude threshold for Side C events"}}}};
15+
inputs.emplace_back("digits", "FT0", "DIGITSBC");
16+
std::vector<OutputSpec> outputs;
17+
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
18+
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
19+
DataProcessorSpec dataProcessorSpec{
20+
"FT0EventsPerBcProcessor",
21+
inputs,
22+
outputs,
23+
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>(ccdbRequest)),
24+
Options{
25+
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
26+
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
27+
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
28+
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
29+
{"min-ampl-side-a", VariantType::Int, 0, {"Amplitude threshold for Side A events"}},
30+
{"min-ampl-side-c", VariantType::Int, 0, {"Amplitude threshold for Side C events"}}}};
3131

32-
WorkflowSpec workflow;
33-
workflow.emplace_back(dataProcessorSpec);
34-
return workflow;
32+
WorkflowSpec workflow;
33+
workflow.emplace_back(dataProcessorSpec);
34+
return workflow;
3535
}

0 commit comments

Comments
 (0)