@@ -235,7 +235,6 @@ struct NucleitpcPbPb {
235235
236236 histos.add<THnSparse>("hSpectra", " ", HistType::kTHnSparseF, {speciesBitAxis, ptAxis, nsigmaAxis, {5, -2.5, 2.5}, axisCent, axisRigidity, axisdEdx, axisDCA, axisDCA, nsigmaAxis});
237237
238-
239238 if (doprocessMC) {
240239 histomc.add("histVtxZgen", "histVtxZgen", kTH1F, {axisVtxZ});
241240 histomc.add("ImptParameter", "ImptParameter", kTH1F, {axisImpt});
@@ -283,87 +282,86 @@ struct NucleitpcPbPb {
283282 histos.fill(HIST("histCentFTOC_cut"), collision.centFT0C());
284283 const uint64_t collIdx = collision.globalIndex();
285284 auto tracksByColl = tracksColl.sliceBy(perCollision, collIdx);
286- /////////////////////////////////////////////////////////////////////////////////
287- for (const auto& trackId : tracksByColl) {
288- const auto& track = tracks.rawIteratorAt(trackId.trackId());
289- if (!track.isPVContributor() && cfgUsePVcontributors)
290- continue;
291- if (!track.hasITS() && cfgITSrequire)
292- continue;
293- if (!track.hasTPC() && cfgTPCrequire)
294- continue;
295- if (!track.passedITSRefit() && cfgPassedITSRefit)
296- continue;
297- if (!track.passedTPCRefit() && cfgPassedTPCRefit)
298- continue;
299- if (std::abs(track.eta()) > cfgCutEta && cfgetaRequire)
300- continue;
301- for (size_t i = 0; i < primaryParticles.size(); i++) {
302-
303- float ptMomn;
304- setTrackParCov(track, mTrackParCov);
305- mTrackParCov.setPID(track.pidForTracking());
306- ptMomn = (i == he3 || i == he4) ? 2 * mTrackParCov.getPt() : mTrackParCov.getPt();
307- int sign = 0;
308- if (track.sign() > 0) {
309- sign = 1;
310- }
311- if (track.sign() < 0) {
312- sign = -1;
313- } // <- This redeclares a new local variable!
314- if (std::abs(getRapidity(track, i)) > cfgCutRapidity && cfgRapidityRequire)
315- continue;
316- if (track.tpcNClsFound() < cfgTrackPIDsettings->get(i, "minTPCnCls") && cfgTPCNClsfoundRequire)
317- continue;
318- if (((track.tpcNClsCrossedRows() < cfgTrackPIDsettings->get(i, "minTPCnClsCrossedRows")) || track.tpcNClsCrossedRows() < 0.8 * track.tpcNClsFindable()) && cfgTPCNClsCrossedRowsRequire) // o2-linter: disable=magic-number (To be checked)
319- continue;
320- if (track.tpcChi2NCl() > cfgTrackPIDsettings->get(i, "maxTPCchi2") && cfgmaxTPCchi2Require)
321- continue;
322- if (track.tpcChi2NCl() < cfgTrackPIDsettings->get(i, "minTPCchi2") && cfgminTPCchi2Require)
323- continue;
324- if (track.itsNCls() < cfgTrackPIDsettings->get(i, "minITSnCls") && cfgminITSnClsRequire)
285+ /////////////////////////////////////////////////////////////////////////////////
286+ for (const auto& trackId : tracksByColl) {
287+ const auto& track = tracks.rawIteratorAt(trackId.trackId());
288+ if (!track.isPVContributor() && cfgUsePVcontributors)
325289 continue;
326- double cosheta = std::cosh(track.eta());
327- if ((track.itsNCls() / cosheta) < cfgTrackPIDsettings->get(i, "minITSnClscos") && cfgminITSnClscosRequire)
290+ if (!track.hasITS() && cfgITSrequire)
328291 continue;
329- if (( track.itsNClsInnerBarrel () < cfgTrackPIDsettings->get(i, "minReqClusterITSib")) && cfgminReqClusterITSibRequire )
292+ if (! track.hasTPC () && cfgTPCrequire )
330293 continue;
331- if (track.itsChi2NCl () > cfgTrackPIDsettings->get(i, "maxITSchi2") && cfgmaxITSchi2Require )
294+ if (! track.passedITSRefit () && cfgPassedITSRefit )
332295 continue;
333- if (getMeanItsClsSize( track) < cfgTrackPIDsettings->get(i, "minITSclsSize" ) && cfgminGetMeanItsClsSizeRequire )
296+ if (! track.passedTPCRefit( ) && cfgPassedTPCRefit )
334297 continue;
335- if (getMeanItsClsSize (track) > cfgTrackPIDsettings->get(i, "maxITSclsSize") && cfgmaxGetMeanItsClsSizeRequire )
298+ if (std::abs (track.eta()) > cfgCutEta && cfgetaRequire )
336299 continue;
300+ for (size_t i = 0; i < primaryParticles.size(); i++) {
337301
338- bool insideDCAxy = (std::abs(track.dcaXY()) <= (cfgTrackPIDsettings->get(i, "maxDcaXY") * (0.0105f + 0.0350f / std::pow(ptMomn, 1.1f)))); // o2-linter: disable=magic-number (To be checked)
339- if ((!(insideDCAxy) || std::abs(track.dcaZ()) > dcazSigma(ptMomn, cfgTrackPIDsettings->get(i, "maxDcaZ"))) && cfgDCAwithptRequire)
340- continue;
302+ float ptMomn;
303+ setTrackParCov(track, mTrackParCov);
304+ mTrackParCov.setPID(track.pidForTracking());
305+ ptMomn = (i == he3 || i == he4) ? 2 * mTrackParCov.getPt() : mTrackParCov.getPt();
306+ int sign = 0;
307+ if (track.sign() > 0) {
308+ sign = 1;
309+ }
310+ if (track.sign() < 0) {
311+ sign = -1;
312+ } // <- This redeclares a new local variable!
313+ if (std::abs(getRapidity(track, i)) > cfgCutRapidity && cfgRapidityRequire)
314+ continue;
315+ if (track.tpcNClsFound() < cfgTrackPIDsettings->get(i, "minTPCnCls") && cfgTPCNClsfoundRequire)
316+ continue;
317+ if (((track.tpcNClsCrossedRows() < cfgTrackPIDsettings->get(i, "minTPCnClsCrossedRows")) || track.tpcNClsCrossedRows() < 0.8 * track.tpcNClsFindable()) && cfgTPCNClsCrossedRowsRequire) // o2-linter: disable=magic-number (To be checked)
318+ continue;
319+ if (track.tpcChi2NCl() > cfgTrackPIDsettings->get(i, "maxTPCchi2") && cfgmaxTPCchi2Require)
320+ continue;
321+ if (track.tpcChi2NCl() < cfgTrackPIDsettings->get(i, "minTPCchi2") && cfgminTPCchi2Require)
322+ continue;
323+ if (track.itsNCls() < cfgTrackPIDsettings->get(i, "minITSnCls") && cfgminITSnClsRequire)
324+ continue;
325+ double cosheta = std::cosh(track.eta());
326+ if ((track.itsNCls() / cosheta) < cfgTrackPIDsettings->get(i, "minITSnClscos") && cfgminITSnClscosRequire)
327+ continue;
328+ if ((track.itsNClsInnerBarrel() < cfgTrackPIDsettings->get(i, "minReqClusterITSib")) && cfgminReqClusterITSibRequire)
329+ continue;
330+ if (track.itsChi2NCl() > cfgTrackPIDsettings->get(i, "maxITSchi2") && cfgmaxITSchi2Require)
331+ continue;
332+ if (getMeanItsClsSize(track) < cfgTrackPIDsettings->get(i, "minITSclsSize") && cfgminGetMeanItsClsSizeRequire)
333+ continue;
334+ if (getMeanItsClsSize(track) > cfgTrackPIDsettings->get(i, "maxITSclsSize") && cfgmaxGetMeanItsClsSizeRequire)
335+ continue;
341336
342- float tpcNsigma = getTPCnSigma(track, primaryParticles.at(i));
343- if ((std::abs(tpcNsigma) > cfgTrackPIDsettings->get(i, "maxTPCnSigma")) && cfgmaxTPCnSigmaRequire)
344- continue;
345- float itsSigma = getITSnSigma(track, primaryParticles.at(i));
337+ bool insideDCAxy = (std::abs(track.dcaXY()) <= (cfgTrackPIDsettings->get(i, "maxDcaXY") * (0.0105f + 0.0350f / std::pow(ptMomn, 1.1f)))); // o2-linter: disable=magic-number (To be checked)
338+ if ((!(insideDCAxy) || std::abs(track.dcaZ()) > dcazSigma(ptMomn, cfgTrackPIDsettings->get(i, "maxDcaZ"))) && cfgDCAwithptRequire)
339+ continue;
346340
347- if (itsSigma < cfgTrackPIDsettings2->get(i, "minITSnsigma") && cfgTrackPIDsettings2->get(i, "useITSnsigma") < 1)
348- continue;
349- if (itsSigma > cfgTrackPIDsettings2->get(i, "maxITSnsigma") && cfgTrackPIDsettings2->get(i, "useITSnsigma") < 1)
350- continue;
341+ float tpcNsigma = getTPCnSigma(track, primaryParticles.at(i));
342+ if ((std::abs(tpcNsigma) > cfgTrackPIDsettings->get(i, "maxTPCnSigma")) && cfgmaxTPCnSigmaRequire)
343+ continue;
344+ float itsSigma = getITSnSigma(track, primaryParticles.at(i));
345+
346+ if (itsSigma < cfgTrackPIDsettings2->get(i, "minITSnsigma") && cfgTrackPIDsettings2->get(i, "useITSnsigma") < 1)
347+ continue;
348+ if (itsSigma > cfgTrackPIDsettings2->get(i, "maxITSnsigma") && cfgTrackPIDsettings2->get(i, "useITSnsigma") < 1)
349+ continue;
351350
352- fillhmass(track, i);
353- if (cfgFillhspectra && cfgTrackPIDsettings2->get(i, "fillsparsh") == 1 ) {
354- histos.fill(HIST("hSpectra"), i, ptMomn, tpcNsigma, sign, collision.centFT0C(), getRigidity(track) * track.sign(), track.tpcSignal(), track.dcaZ(), track.dcaXY(), itsSigma);
351+ fillhmass(track, i);
352+ if (cfgFillhspectra && cfgTrackPIDsettings2->get(i, "fillsparsh") == 1) {
353+ histos.fill(HIST("hSpectra"), i, ptMomn, tpcNsigma, sign, collision.centFT0C(), getRigidity(track) * track.sign(), track.tpcSignal(), track.dcaZ(), track.dcaXY(), itsSigma);
354+ }
355+ if (cfgRequirebetaplot) {
356+ histos.fill(HIST("Tofsignal"), getRigidity(track) * track.sign(), o2::pid::tof::Beta::GetBeta(track));
357+ }
355358 }
356- if (cfgRequirebetaplot ) {
357- histos.fill(HIST("Tofsignal "), getRigidity(track) * track.sign(), o2::pid::tof::Beta::GetBeta( track));
359+ if (track.tpcNClsFound() > cfgtpcNClsFound || track.itsNCls() > cfgitsNCls ) {
360+ histos.fill(HIST("Tpcsignal "), getRigidity(track) * track.sign(), track.tpcSignal( ));
358361 }
359- }
360- if (track.tpcNClsFound() > cfgtpcNClsFound || track.itsNCls() > cfgitsNCls) {
361- histos.fill(HIST("Tpcsignal"), getRigidity(track) * track.sign(), track.tpcSignal());
362- }
363- histos.fill(HIST("histeta"), track.eta());
364- } // track loop
365- ///////////////////////////////////////////////
366-
362+ histos.fill(HIST("histeta"), track.eta());
363+ } // track loop
364+ ///////////////////////////////////////////////
367365 }
368366 }
369367 PROCESS_SWITCH(NucleitpcPbPb, processData, "data analysis", false);
@@ -520,7 +518,7 @@ struct NucleitpcPbPb {
520518 continue;
521519
522520 fillhmass(track, i);
523- if (cfgFillhspectra && cfgTrackPIDsettings2->get(i, "fillsparsh") == 1 ) {
521+ if (cfgFillhspectra && cfgTrackPIDsettings2->get(i, "fillsparsh") == 1) {
524522 histos.fill(HIST("hSpectra"), i, ptMomn, tpcNsigma, sign, collision.centFT0C(), getRigidity(track) * track.sign(), track.tpcSignal(), track.dcaZ(), track.dcaXY(), itsSigma);
525523 }
526524 if (cfgRequirebetaplot) {
0 commit comments