Skip to content

Commit 1b2127a

Browse files
authored
Refactor variable names for clarity in tableDiffWake
1 parent 3205395 commit 1b2127a

1 file changed

Lines changed: 39 additions & 33 deletions

File tree

PWGJE/TableProducer/tableDiffWake.cxx

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -219,52 +219,58 @@ struct tableDiffWake {
219219

220220
//------------ Translate values to less memory consuming values --------------------
221221
// Px, Py, Pz
222-
uint64_t Substitute_p = 0;
223-
224-
int64_t Particle_px = (track.px() * 6000);
225-
if (Particle_px < 0)
226-
Substitute_p |= (uint64_t)1 << 20;
227-
if (Particle_px < 0)
228-
Particle_px = (-1) * Particle_px;
229-
for (Int_t i_bit = 0; i_bit < 20; i_bit++) {
230-
if ((Particle_px & ((int64_t)1 << i_bit)))
231-
Substitute_p |= (uint64_t)1 << i_bit;
222+
uint64_t substituteP = 0;
223+
uint8_t uppermostBit = 20;
224+
uint8_t lowermostBit = 0;
225+
226+
int64_t particlePx = (track.px() * 6000);
227+
if (particlePx < 0)
228+
substituteP |= (uint64_t)1 << uppermostBit;
229+
if (particlePx < 0)
230+
particlePx = (-1) * particlePx;
231+
for (int8_t i_bit = lowermostBit; i_bit < uppermostBit; i_bit++) {
232+
if ((particlePx & ((int64_t)1 << i_bit)))
233+
substituteP |= (uint64_t)1 << i_bit;
232234
}
233235

234-
int64_t Particle_py = (track.py() * 6000);
235-
if (Particle_py < 0)
236-
Substitute_p |= (uint64_t)1 << 41;
237-
if (Particle_py < 0)
238-
Particle_py = (-1) * Particle_py;
239-
for (Int_t i_bit = 21; i_bit < 41; i_bit++) {
240-
if ((Particle_py & ((int64_t)1 << (i_bit - 21))))
241-
Substitute_p |= (uint64_t)1 << i_bit;
236+
uppermostBit = 41;
237+
lowermostBit = 21;
238+
int64_t particlePy = (track.py() * 6000);
239+
if (particlePy < 0)
240+
substituteP |= (uint64_t)1 << uppermostBit;
241+
if (particlePy < 0)
242+
particlePy = (-1) * particlePy;
243+
for (int8_t i_bit = lowermostBit; i_bit < uppermostBit; i_bit++) {
244+
if ((particlePy & ((int64_t)1 << (i_bit - lowermostBit))))
245+
substituteP |= (uint64_t)1 << i_bit;
242246
}
243247

244-
int64_t Particle_pz = (track.pz() * 6000);
245-
if (Particle_pz < 0)
246-
Substitute_p |= (uint64_t)1 << 62;
247-
if (Particle_pz < 0)
248-
Particle_pz = (-1) * Particle_pz;
249-
for (Int_t i_bit = 42; i_bit < 62; i_bit++) {
250-
if ((Particle_pz & ((int64_t)1 << (i_bit - 42))))
251-
Substitute_p |= (uint64_t)1 << i_bit;
248+
uppermostBit = 62;
249+
lowermostBit = 42;
250+
int64_t particlePz = (track.pz() * 6000);
251+
if (particlePz < 0)
252+
substituteP |= (uint64_t)1 << uppermostBit;
253+
if (particlePz < 0)
254+
particlePz = (-1) * particlePz;
255+
for (int8_t i_bit = lowermostBit; i_bit < uppermostBit; i_bit++) {
256+
if ((particlePz & ((int64_t)1 << (i_bit - lowermostBit))))
257+
substituteP |= (uint64_t)1 << i_bit;
252258
}
253259

254260
// dEdx
255-
uint16_t Substitute_dEdx = (uint16_t)(track.tpcSignal() * 10);
261+
uint16_t substituteDEDX = (uint16_t)(track.tpcSignal() * 10);
256262

257263
// DCA
258-
int16_t Substitute_DCAXY = (int16_t)(track.dcaXY() * 100);
259-
int16_t Substitute_DCAZ = (int16_t)(track.dcaZ() * 100);
264+
int16_t substituteDCAXY = (int16_t)(track.dcaXY() * 100);
265+
int16_t substituteDCAZ = (int16_t)(track.dcaZ() * 100);
260266

261267
//--------------- Fill track table ------------------
262268
testtrack(track.collisionId(),
263269
track.sign(),
264-
Substitute_p,
265-
Substitute_dEdx,
266-
Substitute_DCAXY,
267-
Substitute_DCAZ);
270+
substituteP,
271+
substituteDEDX,
272+
substituteDCAXY,
273+
substituteDCAZ);
268274
}
269275
}
270276
};

0 commit comments

Comments
 (0)