Skip to content
Merged
Changes from all commits
Commits
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
45 changes: 22 additions & 23 deletions Detectors/CTP/simulation/src/Digitizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ std::vector<CTPDigit> Digitizer::process(const gsl::span<o2::ctp::CTPInputDigit>
emcMBaccept.set(CTP_NINPUTS - 1, 1);
inpmaskcoll |= emcMBaccept;
} // else { // needs to be done always, remove else
for (auto const& ctpinp : det2ctpinp[o2::detectors::DetID::EMC]) {
uint64_t mask = inpmaskdebug & detInputName2Mask[ctpinp.name];
// uint64_t mask = (inp->inputsMask).to_ullong() & detInputName2Mask[ctpinp.name];
if (mask) {
inpmaskcoll |= std::bitset<CTP_NINPUTS>(ctpinp.inputMask);
}
for (auto const& ctpinp : det2ctpinp[o2::detectors::DetID::EMC]) {
uint64_t mask = inpmaskdebug & detInputName2Mask[ctpinp.name];
// uint64_t mask = (inp->inputsMask).to_ullong() & detInputName2Mask[ctpinp.name];
if (mask) {
inpmaskcoll |= std::bitset<CTP_NINPUTS>(ctpinp.inputMask);
}
// }
// LOG(info) << "EMC input mask:" << inpmaskcoll << " with IR = " << currentIR.bc << ", orbit = " << currentIR.orbit;
break;
}
// }
// LOG(info) << "EMC input mask:" << inpmaskcoll << " with IR = " << currentIR.bc << ", orbit = " << currentIR.orbit;
break;
}
case o2::detectors::DetID::PHS: {
for (auto const& ctpinp : det2ctpinp[o2::detectors::DetID::PHS]) {
Expand Down Expand Up @@ -153,21 +153,20 @@ void Digitizer::calculateClassMask(const std::bitset<CTP_NINPUTS> ctpinpmask, st
if (clustername == "emc") {
tvxMBemc |= tcl.name.find("minbias_TVX_L0") != std::string::npos; // 2022
}
if (tvxMBemc || (ctpinpmask.to_ullong() & tcl.descriptor->getInputsMask()) == tcl.descriptor->getInputsMask()) {
// require real physics input in any case
if (tvxMBemc) {
// if the class is a min. bias class accept it only if the MB-accept bit is set in addition
// (fake trigger input)
if (ctpinpmask[CTP_NINPUTS - 1]) {
classmask |= tcl.classMask;
LOG(info) << "adding MBA:" << tcl.name;
}
} // else {
// EMCAL rare triggers - physical trigger input
// class identification can be handled like in the case of the other
// classes as EMCAL trigger input is required
// require real physics input in any case
if (tvxMBemc) {
// if the class is a min. bias class accept it only if the MB-accept bit is set in addition
// (fake trigger input)
if (ctpinpmask[CTP_NINPUTS - 1]) {
classmask |= tcl.classMask;
// }
LOG(info) << "adding MBA:" << tcl.name;
}
} else if ((ctpinpmask.to_ullong() & tcl.descriptor->getInputsMask()) == tcl.descriptor->getInputsMask()) {
// EMCAL rare triggers - physical trigger input
// class identification can be handled like in the case of the other
// classes as EMCAL trigger input is required
LOG(info) << "adding EMCal rare trigger:" << tcl.name;
classmask |= tcl.classMask;
}
} else {
if (tcl.descriptor && ((ctpinpmask.to_ullong() & tcl.descriptor->getInputsMask()) == tcl.descriptor->getInputsMask())) {
Expand Down