Skip to content

Commit

Permalink
clang
Browse files Browse the repository at this point in the history
  • Loading branch information
lietava committed Nov 16, 2024
1 parent ba4bea3 commit 0de363f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ o2::ctf::CTFIOSize CTFCoder::decode(const CTF::base& ec, VTRG& data, LumiInfo& l
}
if (mDecodeInps) {
uint64_t trgclassmask = 0xffffffffffffffff;
if(mCTPConfig.getRunNumber() != 0) {
if (mCTPConfig.getRunNumber() != 0) {
trgclassmask = mCTPConfig.getTriggerClassMask();
}
std::cout << "trgclassmask:" << std::hex << trgclassmask << std::dec << std::endl;
Expand Down
8 changes: 4 additions & 4 deletions Detectors/CTP/reconstruction/src/RawDataDecoder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ int RawDataDecoder::decodeRaw(o2::framework::InputRecord& inputs, std::vector<o2
}
if (mDoDigits & mDecodeInps) {
uint64_t trgclassmask = 0xffffffffffffffff;
if(mCTPConfig.getRunNumber() != 0) {
if (mCTPConfig.getRunNumber() != 0) {
trgclassmask = mCTPConfig.getTriggerClassMask();
}
std::cout << "trgclassmask:" << std::hex << trgclassmask << std::dec << std::endl;
Expand Down Expand Up @@ -604,11 +604,11 @@ int RawDataDecoder::shiftInputs(std::map<o2::InteractionRecord, CTPDigit>& digit
if (d.CTPInputMask.count()) {
nTwI++;
} else {
if(d.intRecord.bc == (o2::constants::lhc::LHCMaxBunches - L1shift)) { // input can be lost because latency class-l1input = 1
if (d.intRecord.bc == (o2::constants::lhc::LHCMaxBunches - L1shift)) { // input can be lost because latency class-l1input = 1
nTwoIlost++;
} else {
LOG(error) << d.intRecord << " " << d.CTPClassMask << " " << d.CTPInputMask;
//std::cout << std::hex << d.CTPClassMask << " " << d.CTPInputMask << std::dec << std::endl;
LOG(error) << d.intRecord << " " << d.CTPClassMask << " " << d.CTPInputMask;
// std::cout << std::hex << d.CTPClassMask << " " << d.CTPInputMask << std::dec << std::endl;
nTwoI++;
}
}
Expand Down
6 changes: 3 additions & 3 deletions Detectors/CTP/workflow/src/EntropyDecoderSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ void EntropyDecoderSpec::run(ProcessingContext& pc)

mCTFCoder.updateTimeDependentParams(pc, true);
auto buff = pc.inputs().get<gsl::span<o2::ctf::BufferType>>("ctf_CTP");

const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
auto& digits = pc.outputs().make<std::vector<CTPDigit>>(OutputRef{"digits"});
auto& lumi = pc.outputs().make<LumiInfo>(OutputRef{"CTPLumi"});

// since the buff is const, we cannot use EncodedBlocks::relocate directly, instead we wrap its data to another flat object
if (buff.size()) {
const auto ctfImage = o2::ctp::CTF::getImage(buff.data());
if(mCTFCoder.getDecodeInps()){
if (mCTFCoder.getDecodeInps()) {
const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
if(ctpcfg != nullptr) {
if (ctpcfg != nullptr) {
mCTFCoder.setCTPConfig(*ctpcfg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/CTP/workflow/src/RawDecoderSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void RawDecoderSpec::run(framework::ProcessingContext& ctx)
} else {
if (mDecodeinputs) {
const auto ctpcfg = inputs.get<o2::ctp::CTPConfiguration*>("ctpconfig");
if(ctpcfg != nullptr) {
if (ctpcfg != nullptr) {
mDecoder.setCTPConfig(*ctpcfg);
}
}
Expand Down

0 comments on commit 0de363f

Please sign in to comment.