@@ -42,11 +42,11 @@ AxisSpec PtAxis = {2401, -0.005, 24.005};
4242
4343static constexpr TrackSelectionFlags::flagtype trackSelectionPattern = TrackSelectionFlags::kTrackType |
4444 TrackSelectionFlags::kTPCNCls |
45+ TrackSelectionFlags::kITSNCls |
4546 TrackSelectionFlags::kTPCCrossedRowsOverNCls |
4647 TrackSelectionFlags::kTPCChi2NDF |
4748 TrackSelectionFlags::kITSChi2NDF |
4849 TrackSelectionFlags::kITSHits |
49- TrackSelectionFlags::kGoldenChi2 |
5050 TrackSelectionFlags::kDCAz |
5151 TrackSelectionFlags::kDCAxy ;
5252
@@ -57,8 +57,6 @@ struct MultiplicityCounter {
5757
5858 Configurable<float > estimatorEta{" estimatorEta" , 1.0 , " eta range for INEL>0 sample definition" };
5959 Configurable<bool > useEvSel{" useEvSel" , true , " use event selection" };
60- Configurable<float > maxDCAZ{" maxDCAZ" , 0 .3f , " max track DCAZ" };
61- Configurable<bool > useDCAZcut{" useDCAZcut" , true , " apply track DCAZ cut" };
6260 Configurable<bool > fillResponse{" fillResponse" , false , " Fill response matrix" };
6361
6462 HistogramRegistry registry{
@@ -244,7 +242,7 @@ struct MultiplicityCounter {
244242 auto counter = 0 ;
245243 auto relatedTracks = particle.tracks_as <soa::Filtered<LabeledTracksEx>>();
246244 for (auto & track : relatedTracks) {
247- if (useDCAZcut && std::abs (track. dcaZ ()) > maxDCAZ ) {
245+ if ((track. trackCutFlag () & TrackSelectionFlags:: kDCAz ) != TrackSelectionFlags:: kDCAz ) {
248246 continue ;
249247 }
250248 ++counter;
@@ -264,7 +262,7 @@ struct MultiplicityCounter {
264262 }
265263 if (counter > 1 ) {
266264 for (auto & track : relatedTracks) {
267- if (useDCAZcut && std::abs (track. dcaZ ()) > maxDCAZ ) {
265+ if ((track. trackCutFlag () & TrackSelectionFlags:: kDCAz ) != TrackSelectionFlags:: kDCAz ) {
268266 continue ;
269267 }
270268 for (auto layer = 0 ; layer < 7 ; ++layer) {
@@ -287,7 +285,7 @@ struct MultiplicityCounter {
287285 if (relatedTracks.size () > 1 ) {
288286 registry.fill (HIST (" Tracks/Control/PhiEtaGenDuplicates" ), particle.phi (), particle.eta ());
289287 for (auto & track : relatedTracks) {
290- if (useDCAZcut && std::abs (track. dcaZ ()) > maxDCAZ ) {
288+ if ((track. trackCutFlag () & TrackSelectionFlags:: kDCAz ) != TrackSelectionFlags:: kDCAz ) {
291289 continue ;
292290 }
293291 registry.fill (HIST (" Tracks/Control/PhiEtaDuplicates" ), track.phi (), track.eta ());
@@ -381,14 +379,11 @@ struct MultiplicityCounter {
381379 if (perCollisionSample.size () > 0 ) {
382380 registry.fill (HIST (" Events/Efficiency" ), 5 .);
383381 }
384-
385- registry.fill (HIST (" Events/Efficiency" ), 6 .);
386382 ++moreThanOne;
387383 atLeastOne = true ;
388384 Nrec += perCollisionSample.size ();
389385 if (perCollisionSample.size () > 0 ) {
390386 atLeastOne_gt0 = true ;
391- registry.fill (HIST (" Events/Efficiency" ), 7 .);
392387 }
393388 registry.fill (HIST (" Events/NtrkZvtxGen" ), perCollisionSample.size (), collision.posZ ());
394389 }
0 commit comments