Skip to content

Commit 986a12b

Browse files
author
wpierozak
committed
FT0: executed clang-format
1 parent 675464b commit 986a12b

File tree

4 files changed

+90
-93
lines changed

4 files changed

+90
-93
lines changed

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ namespace o2::ft0
2020
{
2121
struct EventsPerBc
2222
{
23-
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC): mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
24-
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);
23+
EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
2924

30-
const int32_t mMinAmplitudeSideA;
31-
const int32_t mMinAmplitudeSideC;
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);
3229

33-
std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
34-
size_t entries{0};
35-
long startTimeStamp{0};
36-
long stopTimeStamp{0};
30+
const int32_t mMinAmplitudeSideA;
31+
const int32_t mMinAmplitudeSideC;
3732

38-
ClassDefNV(EventsPerBc, 1);
33+
std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
34+
size_t entries{0};
35+
long startTimeStamp{0};
36+
long stopTimeStamp{0};
37+
38+
ClassDefNV(EventsPerBc, 1);
3939
};
4040

4141
class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
@@ -44,25 +44,25 @@ namespace o2::ft0
4444
using TFType = o2::calibration::TFType;
4545

4646
public:
47-
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
48-
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;
47+
EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
48+
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;
5353

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

5757
private:
58-
const uint32_t mMinNumberOfEntries;
59-
const int32_t mMinAmplitudeSideA;
60-
const int32_t mMinAmplitudeSideC;
58+
const uint32_t mMinNumberOfEntries;
59+
const int32_t mMinAmplitudeSideA;
60+
const int32_t mMinAmplitudeSideC;
6161

62-
std::vector<std::unique_ptr<TH1F>> mTvxPerBcs;
63-
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
62+
std::vector<std::unique_ptr<TH1F>> mTvxPerBcs;
63+
std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
6464

65-
ClassDefOverride(EventsPerBcCalibrator, 1);
65+
ClassDefOverride(EventsPerBcCalibrator, 1);
6666
};
6767
}
6868

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace o2::ft0
1313
size_t oldEntries = entries;
1414
for(const auto& digit: data) {
1515
double isVertex = digit.mTriggers.getVertex();
16-
if(digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
17-
continue;
16+
if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
17+
continue;
1818
}
1919
mTvx[digit.mIntRecord.bc] += isVertex;
2020
entries += isVertex;
@@ -36,12 +36,11 @@ namespace o2::ft0
3636
mTvxPerBcInfos.clear();
3737
}
3838

39-
40-
EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC): mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
39+
EventsPerBcCalibrator::EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinNumberOfEntries(minNumberOfEntries), mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC)
4140
{
42-
LOG(info) << "Defined threshold for number of entires per slot: " << mMinNumberOfEntries;
43-
LOG(info) << "Defined threshold for side A amplitude for event: " << mMinAmplitudeSideA;
44-
LOG(info) << "Defined threshold for side C amplitude for event: " << mMinAmplitudeSideC;
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;
4544
}
4645

4746
bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
@@ -51,17 +50,17 @@ namespace o2::ft0
5150

5251
void EventsPerBcCalibrator::finalizeSlot(EventsPerBcCalibrator::Slot& slot)
5352
{
54-
LOG(info) << "Finalizing slot from " << slot.getStartTimeMS() << " to " << slot.getEndTimeMS();
53+
LOG(info) << "Finalizing slot from " << slot.getStartTimeMS() << " to " << slot.getEndTimeMS();
5554
o2::ft0::EventsPerBc* data = slot.getContainer();
5655
mTvxPerBcs.emplace_back(std::make_unique<TH1F>("TvxPerBc", "FT0 TVX per BC", o2::constants::lhc::LHCMaxBunches, 0, o2::constants::lhc::LHCMaxBunches - 1));
57-
for(int bin = 0; bin < o2::constants::lhc::LHCMaxBunches; bin++) {
56+
for (int bin = 0; bin < o2::constants::lhc::LHCMaxBunches; bin++) {
5857
mTvxPerBcs.back()->Fill(bin, data->mTvx[bin]);
5958
}
6059
auto clName = o2::utils::MemFileHelper::getClassName(*mTvxPerBcs.back());
6160
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
6261
std::map<std::string, std::string> metaData;
6362
mTvxPerBcInfos.emplace_back(std::make_unique<o2::ccdb::CcdbObjectInfo>("FT0/Calib/TvxPerBc", clName, flName, metaData, slot.getStartTimeMS(), slot.getEndTimeMS()));
64-
LOG(info) << "Created new calibration object. Current number of objects: " << mTvxPerBcs.size();
63+
LOG(info) << "Created object valid from " << mTvxPerBcInfos.back()->getStartValidityTimestamp() << " to " << TvxPerBcInfos.back()->getEndValidityTimestamp() << ""
6564
}
6665

6766
EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,17 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
1010
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
1111
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
1212
DataProcessorSpec dataProcessorSpec{
13-
"FT0EventsPerBcProcessor",
14-
inputs,
15-
outputs,
16-
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>()),
17-
Options{
18-
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
19-
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
20-
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
21-
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
22-
{"min-ampl-side-a", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side A events"}},
23-
{"min-ampl-side-c", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side C events"}}
24-
}
25-
};
13+
"FT0EventsPerBcProcessor",
14+
inputs,
15+
outputs,
16+
AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>()),
17+
Options{
18+
{"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
19+
{"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
20+
{"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
21+
{"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
22+
{"min-ampl-side-a", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side A events"}},
23+
{"min-ampl-side-c", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side C events"}}}};
2624

2725
WorkflowSpec workflow;
2826
workflow.emplace_back(dataProcessorSpec);

Detectors/FIT/FT0/calibration/workflow/FT0EventsPerBcSpec.h

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,39 @@ namespace o2::calibration
2424

2525
void init(o2::framework::InitContext& ic) final
2626
{
27-
if(ic.options().hasOption("slot-len-sec")) {
28-
mSlotLenSec = ic.options().get<uint32_t>("slot-len-sec");
29-
}
30-
if(ic.options().hasOption("one-object-per-run")) {
31-
mOneObjectPerRun = ic.options().get<bool>("one-object-per-run");
32-
}
33-
if(ic.options().hasOption("slot-len-tf")) {
34-
mSlotLen = ic.options().get<o2::calibration::TFType>("slot-len-tf");
35-
}
36-
if(ic.options().hasOption("min-entries-number")) {
37-
mMinNumberOfEntries = ic.options().get<uint32_t>("min-entries-number");
38-
}
39-
if(ic.options().hasOption("min-ampl-side-a")) {
40-
mMinAmplitudeSideA = ic.options().get<int32_t>("min-ampl-side-a");
41-
}
42-
if(ic.options().hasOption("min-ampl-side-c")) {
43-
mMinAmplitudeSideC = ic.options().get<int32_t>("min-ampl-side-c");
44-
}
27+
if (ic.options().hasOption("slot-len-sec")) {
28+
mSlotLenSec = ic.options().get<uint32_t>("slot-len-sec");
29+
}
30+
if (ic.options().hasOption("one-object-per-run")) {
31+
mOneObjectPerRun = ic.options().get<bool>("one-object-per-run");
32+
}
33+
if (ic.options().hasOption("slot-len-tf")) {
34+
mSlotLen = ic.options().get<o2::calibration::TFType>("slot-len-tf");
35+
}
36+
if (ic.options().hasOption("min-entries-number")) {
37+
mMinNumberOfEntries = ic.options().get<uint32_t>("min-entries-number");
38+
}
39+
if (ic.options().hasOption("min-ampl-side-a")) {
40+
mMinAmplitudeSideA = ic.options().get<int32_t>("min-ampl-side-a");
41+
}
42+
if (ic.options().hasOption("min-ampl-side-c")) {
43+
mMinAmplitudeSideC = ic.options().get<int32_t>("min-ampl-side-c");
44+
}
4545

46-
mCalibrator = std::make_unique<o2::ft0::EventsPerBcCalibrator>(mMinNumberOfEntries, mMinAmplitudeSideA, mMinAmplitudeSideC);
46+
mCalibrator = std::make_unique<o2::ft0::EventsPerBcCalibrator>(mMinNumberOfEntries, mMinAmplitudeSideA, mMinAmplitudeSideC);
4747

48-
if(mOneObjectPerRun) {
49-
LOG(info) << "Only one object will be created at the end of run";
50-
mCalibrator->setUpdateAtTheEndOfRunOnly();
51-
}
52-
if (mOneObjectPerRun == false && mSlotLen == 0){
53-
LOG(info) << "Defined slot interval to " << mSlotLenSec << " seconds";
54-
mCalibrator->setSlotLengthInSeconds(mSlotLenSec);
55-
}
56-
if (mOneObjectPerRun == false && mSlotLen != 0) {
57-
LOG(info) << "Defined slot interval to " << mSlotLen << " TFS";
58-
mCalibrator->setSlotLength(mSlotLen);
59-
}
48+
if (mOneObjectPerRun) {
49+
LOG(info) << "Only one object will be created at the end of run";
50+
mCalibrator->setUpdateAtTheEndOfRunOnly();
51+
}
52+
if (mOneObjectPerRun == false && mSlotLen == 0) {
53+
LOG(info) << "Defined slot interval to " << mSlotLenSec << " seconds";
54+
mCalibrator->setSlotLengthInSeconds(mSlotLenSec);
55+
}
56+
if (mOneObjectPerRun == false && mSlotLen != 0) {
57+
LOG(info) << "Defined slot interval to " << mSlotLen << " TFS";
58+
mCalibrator->setSlotLength(mSlotLen);
59+
}
6060
}
6161

6262
void run(o2::framework::ProcessingContext& pc) final
@@ -74,26 +74,26 @@ namespace o2::calibration
7474

7575
void endOfStream(o2::framework::EndOfStreamContext& ec) final
7676
{
77-
LOG(info) << "Received end-of-stream, checking for slot to finalize...";
78-
mCalibrator->checkSlotsToFinalize();
79-
sendOutput(ec.outputs());
80-
mCalibrator->initOutput();
77+
LOG(info) << "Received end-of-stream, checking for slot to finalize...";
78+
mCalibrator->checkSlotsToFinalize();
79+
sendOutput(ec.outputs());
80+
mCalibrator->initOutput();
8181
}
8282

8383
void sendOutput(o2::framework::DataAllocator& output)
8484
{
8585
using o2::framework::Output;
8686
const auto& tvxHists = mCalibrator->getTvxPerBc();
8787
auto& infos = mCalibrator->getTvxPerBcCcdbInfo();
88-
for(unsigned int idx = 0; idx < tvxHists.size(); idx++){
89-
auto& info = infos[idx];
90-
const auto& payload = tvxHists[idx];
88+
for (unsigned int idx = 0; idx < tvxHists.size(); idx++) {
89+
auto& info = infos[idx];
90+
const auto& payload = tvxHists[idx];
9191

92-
auto image = o2::ccdb::CcdbApi::createObjectImage(payload.get(), info.get());
93-
LOG(info) << "Sending object " << info->getPath() << "/" << info->getFileName() << " of size " << image->size()
94-
<< " bytes, valid for " << info->getStartValidityTimestamp() << " : " << info->getEndValidityTimestamp();
95-
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc", idx}, *image.get());
96-
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc", idx}, *info.get());
92+
auto image = o2::ccdb::CcdbApi::createObjectImage(payload.get(), info.get());
93+
LOG(info) << "Sending object " << info->getPath() << "/" << info->getFileName() << " of size " << image->size()
94+
<< " bytes, valid for " << info->getStartValidityTimestamp() << " : " << info->getEndValidityTimestamp();
95+
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc", idx}, *image.get());
96+
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc", idx}, *info.get());
9797
}
9898

9999
if(tvxHists.size()) {

0 commit comments

Comments
 (0)