Skip to content

Commit 4eee98e

Browse files
shahor02chiarazampolli
authored andcommitted
Avoid static vars in ITS/MFT digitizer
as in the merged digitization workflow the static vars will be shared between the ITS and MFT digitizers
1 parent 4d750cf commit 4eee98e

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

Steer/DigitizerWorkflow/src/ITSMFTDigitizerSpec.cxx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
9292
if (!mDigits.size()) {
9393
return; // no digits were flushed, nothing to accumulate
9494
}
95-
static int fixMC2ROF = 0; // 1st entry in mc2rofRecordsAccum to be fixed for ROFRecordID
9695
auto ndigAcc = digitsAccum.size();
9796
std::copy(mDigits.begin(), mDigits.end(), std::back_inserter(digitsAccum));
9897

@@ -200,11 +199,10 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
200199
o2::itsmft::TimeDeadMap* timedeadmap = (o2::itsmft::TimeDeadMap*)obj;
201200
if (!timedeadmap->isDefault()) {
202201
timedeadmap->decodeMap(mFirstOrbitTF, *mDeadMap, true);
203-
static bool UpdateDone = false;
204-
if (UpdateDone) {
202+
if (mTimeDeadMapUpdated) {
205203
LOGP(fatal, "Attempt to add time-dependent map to already modified static map");
206204
}
207-
UpdateDone = true;
205+
mTimeDeadMapUpdated = true;
208206
mDigitizer.setDeadChannelsMap(mDeadMap);
209207
LOG(info) << mID.getName() << " time-dependent dead map updated";
210208
} else {
@@ -301,6 +299,7 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
301299
o2::itsmft::NoiseMap* mDeadMap = nullptr;
302300

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

0 commit comments

Comments
 (0)