Skip to content

Commit

Permalink
Avoid static vars in ITS/MFT digitizer
Browse files Browse the repository at this point in the history
as in the merged digitization workflow the static vars will be shared between
the ITS and MFT digitizers
  • Loading branch information
shahor02 committed Feb 1, 2024
1 parent 97c22d3 commit 63f2da7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Steer/DigitizerWorkflow/src/ITSMFTDigitizerSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
if (!mDigits.size()) {
return; // no digits were flushed, nothing to accumulate
}
static int fixMC2ROF = 0; // 1st entry in mc2rofRecordsAccum to be fixed for ROFRecordID
auto ndigAcc = digitsAccum.size();
std::copy(mDigits.begin(), mDigits.end(), std::back_inserter(digitsAccum));

Expand Down Expand Up @@ -200,11 +199,10 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
o2::itsmft::TimeDeadMap* timedeadmap = (o2::itsmft::TimeDeadMap*)obj;
if (!timedeadmap->isDefault()) {
timedeadmap->decodeMap(mFirstOrbitTF, *mDeadMap, true);
static bool UpdateDone = false;
if (UpdateDone) {
if (mTimeDeadMapUpdated) {
LOGP(fatal, "Attempt to add time-dependent map to already modified static map");
}
UpdateDone = true;
mTimeDeadMapUpdated = true;
mDigitizer.setDeadChannelsMap(mDeadMap);
LOG(info) << mID.getName() << " time-dependent dead map updated";
} else {
Expand Down Expand Up @@ -301,6 +299,7 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
o2::itsmft::NoiseMap* mDeadMap = nullptr;

int mFixMC2ROF = 0; // 1st entry in mc2rofRecordsAccum to be fixed for ROFRecordID
bool mTimeDeadMapUpdated = false;
o2::parameters::GRPObject::ROMode mROMode = o2::parameters::GRPObject::PRESENT; // readout mode
};

Expand Down

0 comments on commit 63f2da7

Please sign in to comment.