@@ -166,23 +166,26 @@ struct FlowGenericFramework {
166166 O2_DEFINE_CONFIGURABLE (cfgDCAz, float , 2 , " Cut on DCA in the longitudinal direction (cm)" );
167167 O2_DEFINE_CONFIGURABLE (cfgNTPCCls, float , 50 , " Cut on number of TPC clusters found" );
168168 O2_DEFINE_CONFIGURABLE (cfgNTPCXrows, float , 70 , " Cut on number of TPC crossed rows" );
169- O2_DEFINE_CONFIGURABLE (cfgNTPCXrowsDaughters, float , 70 , " Cut on number of TPC crossed rows of V0 daughters" );
170169 O2_DEFINE_CONFIGURABLE (cfgMinNITSCls, float , 5 , " Cut on minimum number of ITS clusters found" );
170+ O2_DEFINE_CONFIGURABLE (cfgNTPCClsDaughters, float , 50 , " Cut on number of TPC clusters found of V0 daughter tracks" );
171+ O2_DEFINE_CONFIGURABLE (cfgNTPCXrowsDaughters, float , 70 , " Cut on number of TPC crossed rows of V0 daughter tracks" );
172+ O2_DEFINE_CONFIGURABLE (cfgMinNITSClsDaughters, float , 5 , " Cut on minimum number of ITS clusters found of V0 daughter tracks" );
171173 O2_DEFINE_CONFIGURABLE (cfgChi2PrITSCls, float , 36 , " Cut on chi^2 per ITS clusters found" );
172174 O2_DEFINE_CONFIGURABLE (cfgChi2PrTPCCls, float , 2.5 , " Cut on chi^2 per TPC clusters found" );
173175 O2_DEFINE_CONFIGURABLE (cfgTPCSectorCut, bool , false , " Cut on pt-phi distribution" );
176+ O2_DEFINE_CONFIGURABLE (cfgIsPVContributor, bool , false , " Select tracks contributing to the PV" );
174177 } cfgTrackCuts;
175178 struct : ConfigurableGroup {
176179 O2_DEFINE_CONFIGURABLE (cfgNoSameBunchPileupCut, bool , true , " NoSameBunchPileupCut" );
177180 O2_DEFINE_CONFIGURABLE (cfgIsGoodZvtxFT0vsPV, bool , true , " IsGoodZvtxFT0vsPV" );
178181 O2_DEFINE_CONFIGURABLE (cfgIsGoodITSLayersAll, bool , true , " IsGoodITSLayersAll" );
179- O2_DEFINE_CONFIGURABLE (cfgNoCollInTimeRangeStandard, bool , true , " NoCollInTimeRangeStandard" );
180- O2_DEFINE_CONFIGURABLE (cfgNoCollInRofStandard, bool , true , " NoCollInRofStandard" );
181- O2_DEFINE_CONFIGURABLE (cfgNoHighMultCollInPrevRof, bool , true , " NoHighMultCollInPrevRof" );
182- O2_DEFINE_CONFIGURABLE (cfgNoITSROFrameBorder, bool , true , " NoITSROFrameBorder" );
183- O2_DEFINE_CONFIGURABLE (cfgNoTimeFrameBorder, bool , true , " NoTimeFrameBorder" );
184- O2_DEFINE_CONFIGURABLE (cfgTVXinTRD, bool , true , " TVXinTRD - Use TVXinTRD (reject TRD triggered events)" );
185- O2_DEFINE_CONFIGURABLE (cfgIsVertexITSTPC, bool , true , " IsVertexITSTPC - Selects collisions with at least one ITS-TPC track" );
182+ O2_DEFINE_CONFIGURABLE (cfgNoCollInTimeRangeStandard, bool , false , " NoCollInTimeRangeStandard" );
183+ O2_DEFINE_CONFIGURABLE (cfgNoCollInRofStandard, bool , false , " NoCollInRofStandard" );
184+ O2_DEFINE_CONFIGURABLE (cfgNoHighMultCollInPrevRof, bool , false , " NoHighMultCollInPrevRof" );
185+ O2_DEFINE_CONFIGURABLE (cfgNoITSROFrameBorder, bool , false , " NoITSROFrameBorder" );
186+ O2_DEFINE_CONFIGURABLE (cfgNoTimeFrameBorder, bool , false , " NoTimeFrameBorder" );
187+ O2_DEFINE_CONFIGURABLE (cfgTVXinTRD, bool , false , " TVXinTRD - Use TVXinTRD (reject TRD triggered events)" );
188+ O2_DEFINE_CONFIGURABLE (cfgIsVertexITSTPC, bool , false , " IsVertexITSTPC - Selects collisions with at least one ITS-TPC track" );
186189 } cfgEventCutFlags;
187190 struct : ConfigurableGroup {
188191 O2_DEFINE_CONFIGURABLE (cfgUseNch, bool , false , " Do correlations as function of Nch" );
@@ -1575,24 +1578,10 @@ struct FlowGenericFramework {
15751578 if (!cfgTrackCuts.cfgDCAzPtDep .value .empty () && std::fabs (track.dcaZ ()) > fPtDepDCAz ->Eval (track.pt ())) {
15761579 return false ;
15771580 }
1578- return ((track.tpcNClsCrossedRows () >= cfgTrackCuts.cfgNTPCXrows ) && (track.tpcNClsFound () >= cfgTrackCuts.cfgNTPCCls ) && (track.itsNCls () >= cfgTrackCuts.cfgMinNITSCls ));
1579- }
1580-
1581- template <typename TTrack>
1582- bool nchSelected (const TTrack& track)
1583- {
1584- // Renormalise to default cut
1585- const float defaultNsigma = 7 ;
1586- if (cfgTrackCuts.cfgDCAxyNSigma && (std::fabs (track.dcaXY ()) > defaultNsigma / cfgTrackCuts.cfgDCAxyNSigma * fPtDepDCAxy ->Eval (track.pt ()))) {
1581+ if (cfgTrackCuts.cfgIsPVContributor && !track.isPVContributor ()) {
15871582 return false ;
15881583 }
1589- if (!cfgTrackCuts.cfgDCAzPtDep .value .empty () && std::fabs (track.dcaZ ()) > fPtDepDCAz ->Eval (track.pt ())) {
1590- return false ;
1591- }
1592- int tpcNClsCrossedRowsDefault = 70 ;
1593- int tpcNClsFoundDefault = 50 ;
1594- int itsNclsDefault = 5 ;
1595- return ((track.tpcNClsCrossedRows () >= tpcNClsCrossedRowsDefault) && (track.tpcNClsFound () >= tpcNClsFoundDefault) && (track.itsNCls () >= itsNclsDefault));
1584+ return ((track.tpcNClsCrossedRows () >= cfgTrackCuts.cfgNTPCXrows ) && (track.tpcNClsFound () >= cfgTrackCuts.cfgNTPCCls ) && (track.itsNCls () >= cfgTrackCuts.cfgMinNITSCls ));
15961585 }
15971586
15981587 template <typename TTrack>
@@ -2315,8 +2304,7 @@ struct FlowGenericFramework {
23152304 if (mcParticle.eta () < gfwMemberCache.etalow || mcParticle.eta () > gfwMemberCache.etaup || mcParticle.pt () < gfwMemberCache.ptlow || mcParticle.pt () > gfwMemberCache.ptup ) {
23162305 return ;
23172306 }
2318- // Select tracks with nominal cuts always
2319- if (!nchSelected (track)) {
2307+ if (!trackSelected (track, field)) {
23202308 return ;
23212309 }
23222310 double weffCh = getEfficiency (track, centrality, 0 );
@@ -2326,11 +2314,6 @@ struct FlowGenericFramework {
23262314 }
23272315 ++acceptedTracks.totaluncorr ;
23282316 }
2329-
2330- if (!trackSelected (track, field)) {
2331- return ;
2332- }
2333-
23342317 int pidIndex = 0 ;
23352318 if (std::abs (mcParticle.pdgCode ()) == kPiPlus ) {
23362319 pidIndex = PionID;
@@ -2401,20 +2384,19 @@ struct FlowGenericFramework {
24012384 if (cfgFill.cfgFillQA ) {
24022385 fillTrackQA<Reco, Before>(track, vtxz);
24032386 }
2404- // Select tracks with nominal cuts always
2405- if (!nchSelected (track)) {
2387+
2388+ if (!trackSelected (track, field )) {
24062389 return ;
24072390 }
2391+
24082392 double weffCh = getEfficiency (track, centrality, 0 );
24092393 if (track.eta () > cfgKinematics.cfgEtaNch ->first && track.eta () < cfgKinematics.cfgEtaNch ->second ) {
24102394 if (weffCh > 0 ) {
24112395 acceptedTracks.total += (cfgEventSelection.cfgUseNchCorrection ) ? weffCh : 1.0 ;
24122396 }
24132397 ++acceptedTracks.totaluncorr ;
24142398 }
2415- if (!trackSelected (track, field)) {
2416- return ;
2417- }
2399+
24182400 // int pidIndex = 0;
24192401 // if (cfgFill.cfgUsePID) Need PID for v02
24202402 int pidIndex = getNsigmaPID (track);
@@ -2578,12 +2560,10 @@ struct FlowGenericFramework {
25782560 bool isAL = false ;
25792561 };
25802562
2563+ // V0 daughter track selection has no DCA cuts
25812564 template <typename TTrack>
25822565 bool selectionV0Daughter (const TTrack& track, int pid)
25832566 {
2584- if (track.tpcNClsCrossedRows () < cfgTrackCuts.cfgNTPCXrowsDaughters ) {
2585- return false ;
2586- }
25872567 // Only accept daughters consistent with the expected identities of K0 or Lambda decay.
25882568 if (cfgPIDCuts.cfgDaughterPIDRejection ) {
25892569 if (cfgPIDCuts.cfgUseOnlyTPC ) {
@@ -2604,7 +2584,7 @@ struct FlowGenericFramework {
26042584 return false ;
26052585 }
26062586 }
2607- return true ;
2587+ return ((track. tpcNClsCrossedRows () >= cfgTrackCuts. cfgNTPCXrowsDaughters ) && (track. tpcNClsFound () >= cfgTrackCuts. cfgNTPCClsDaughters ) && (track. itsNCls () >= cfgTrackCuts. cfgMinNITSClsDaughters )) ;
26082588 }
26092589
26102590 template <typename TTrack>
0 commit comments