Skip to content

Please consider the following formatting changes to #14291 #39

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

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #14291 #39

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
2 changes: 1 addition & 1 deletion DataFormats/Detectors/CTP/include/DataFormatsCTP/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class CTPConfiguration
const std::vector<CTPClass>& getCTPClasses() const { return mCTPClasses; } // Read-only interface
uint64_t getInputMask(const std::string& name) const;
int getInputIndex(const std::string& name) const;
std::string getClassNameFromIndex(int index) ;
std::string getClassNameFromIndex(int index);
std::string getClassNameFromHWIndex(int index);
const CTPClass* getCTPClassFromHWIndex(const int index) const;
bool isMaskInInputs(const uint64_t& mask) const;
Expand Down
8 changes: 4 additions & 4 deletions DataFormats/Detectors/CTP/src/Configuration.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,11 +781,11 @@ int CTPConfiguration::getInputIndex(const std::string& name) const
return index;
}
std::string CTPConfiguration::getClassNameFromIndex(int index)
{
if(index < mCTPClasses.size()) {
return mCTPClasses[index].name;
{
if (index < mCTPClasses.size()) {
return mCTPClasses[index].name;
} else {
std::string name = "Cls"+std::to_string(index);
std::string name = "Cls" + std::to_string(index);
return name;
}
};
Expand Down
7 changes: 4 additions & 3 deletions Detectors/CTP/reconstruction/src/RawDataDecoder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ int RawDataDecoder::decodeRaw(o2::framework::InputRecord& inputs, std::vector<o2
uint64_t trgclassmask = 0xffffffffffffffff;
uint64_t trgclassmaskNOTRGDet = 0xffffffffffffffff;
if (mCTPConfig.getRunNumber() != 0) {
trgclassmask = mCTPConfig.getTriggerClassMaskWInputs(); // classes triggered by internal ctp generators not here
trgclassmask = mCTPConfig.getTriggerClassMaskWInputs(); // classes triggered by internal ctp generators not here
trgclassmaskNOTRGDet = mCTPConfig.getTriggerClassMaskWInputsNoTrgDets();
// mCTPConfig.printStream(std::cout);
}
Expand Down Expand Up @@ -524,8 +524,9 @@ int RawDataDecoder::shiftNew(const o2::InteractionRecord& irin, uint32_t TFOrbit
digmap[ir] = digit;
}
} else {
//LOG(info) << "LOST:" << irin << " shift:" << shift;
return 1;;
// LOG(info) << "LOST:" << irin << " shift:" << shift;
return 1;
;
}
return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions Detectors/CTP/workflow/src/RawDecoderSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ void RawDecoderSpec::endOfStream(framework::EndOfStreamContext& ec)
if (mErrorIR || mErrorTCR) {
LOG(error) << "# of IR errors:" << mErrorIR << " TCR errors:" << mErrorTCR << std::endl;
}
if(mCheckConsistency) {
if (mCheckConsistency) {
LOG(info) << "Lost due to the shift Consistency Checker:" << mDecoder.getLostDueToShiftCls();
auto ctpcfg = mDecoder.getCTPConfig();
for (int i = 0; i < o2::ctp::CTP_NCLASSES; i++) {
std::string name = ctpcfg.getClassNameFromIndex(i);
if (mClsEA[i]) {
LOG(error) << " Class without inputs:";
}
LOG(important) << "CLASS:"<< name << ":" << i << " Cls=>Inp:" << mClsA[i] << " Inp=>Cls:" << mClsB[i] << " ErrorsCls=>Inps:" << mClsEA[i] << " MissingInps=>Cls:" << mClsEB[i];
LOG(important) << "CLASS:" << name << ":" << i << " Cls=>Inp:" << mClsA[i] << " Inp=>Cls:" << mClsB[i] << " ErrorsCls=>Inps:" << mClsEA[i] << " MissingInps=>Cls:" << mClsEB[i];
}
}
}
Expand Down Expand Up @@ -172,7 +172,7 @@ void RawDecoderSpec::run(framework::ProcessingContext& ctx)
auto clsEB = mDecoder.getClassErrorsB();
auto cntCA = mDecoder.getClassCountersA();
auto cntCB = mDecoder.getClassCountersB();
for(int i = 0; i < o2::ctp::CTP_NCLASSES; i++){
for (int i = 0; i < o2::ctp::CTP_NCLASSES; i++) {
mClsEA[i] += clsEA[i];
mClsEB[i] += clsEB[i];
mClsA[i] += cntCA[i];
Expand Down