@@ -193,16 +193,16 @@ struct FlowGfwTask {
193193
194194 // Contruct Global+ITS sample
195195 static constexpr TrackSelectionFlags::flagtype TrackSelectionITS =
196- TrackSelectionFlags::kITSNCls | TrackSelectionFlags::kITSChi2NDF |
197- TrackSelectionFlags::kITSHits ;
196+ TrackSelectionFlags::kITSNCls | TrackSelectionFlags::kITSChi2NDF |
197+ TrackSelectionFlags::kITSHits ;
198198 static constexpr TrackSelectionFlags::flagtype TrackSelectionTPC =
199- TrackSelectionFlags::kTPCNCls |
200- TrackSelectionFlags::kTPCCrossedRowsOverNCls |
201- TrackSelectionFlags::kTPCChi2NDF ;
199+ TrackSelectionFlags::kTPCNCls |
200+ TrackSelectionFlags::kTPCCrossedRowsOverNCls |
201+ TrackSelectionFlags::kTPCChi2NDF ;
202202 static constexpr TrackSelectionFlags::flagtype TrackSelectionDCA =
203- TrackSelectionFlags::kDCAz | TrackSelectionFlags::kDCAxy ;
203+ TrackSelectionFlags::kDCAz | TrackSelectionFlags::kDCAxy ;
204204 static constexpr TrackSelectionFlags::flagtype TrackSelectionDCAXYonly =
205- TrackSelectionFlags::kDCAxy ;
205+ TrackSelectionFlags::kDCAxy ;
206206
207207 // Additional Event selection cuts - Copy from flowGenericFramework.cxx
208208 TrackSelection myTrackSel;
@@ -296,7 +296,6 @@ struct FlowGfwTask {
296296 registry.add (" pt_Cen_ITSOnly" , " pt_Cen_ITS;Centrality (%); p_{T} (GeV/c);" , {HistType::kTH2D , {axisCentrality, axisPt}});
297297 registry.add (" phi_Cen_ITSOnly" , " phi_Cen_ITS;Centrality (%); #phi;" , {HistType::kTH2D , {axisCentrality, axisPhi}});
298298
299-
300299 // Track types
301300 registry.add (" GlobalplusITS" , " Global plus ITS;Centrality FT0C;Nch" , kTH1F , {axisCentrality});
302301 registry.add (" Globalonly" , " Global only;Centrality FT0C;Nch" , kTH1F , {axisCentrality});
@@ -677,12 +676,12 @@ struct FlowGfwTask {
677676 // Apply process filters
678677 Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex && (aod::cent::centFT0C > cfgMinCentFT0C) && (aod::cent::centFT0C < cfgMaxCentFT0C);
679678 Filter trackFilter = ncheckbit(aod::track::v001::detectorMap, (uint8_t )o2::aod::track::ITS) &&
680- ncheckbit (aod::track::trackCutFlag, TrackSelectionITS) &&
681- ifnode (ncheckbit(aod::track::v001::detectorMap, (uint8_t )o2::aod::track::TPC),
682- ncheckbit(aod::track::trackCutFlag, TrackSelectionTPC), true) &&
683- ifnode(dcaZ > 0 .f, nabs(aod::track::dcaZ) <= dcaZ && ncheckbit(aod::track::trackCutFlag, TrackSelectionDCAXYonly),
684- ncheckbit(aod::track::trackCutFlag, TrackSelectionDCA)) &&
685- (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);
679+ ncheckbit (aod::track::trackCutFlag, TrackSelectionITS) &&
680+ ifnode (ncheckbit(aod::track::v001::detectorMap, (uint8_t )o2::aod::track::TPC),
681+ ncheckbit(aod::track::trackCutFlag, TrackSelectionTPC), true) &&
682+ ifnode(dcaZ > 0 .f, nabs(aod::track::dcaZ) <= dcaZ && ncheckbit(aod::track::trackCutFlag, TrackSelectionDCAXYonly),
683+ ncheckbit(aod::track::trackCutFlag, TrackSelectionDCA)) &&
684+ (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);
686685
687686 using Colls = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0As, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0CVariant1s>>; // collisions filter
688687 using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksDCA, aod::TracksExtra>>; // tracks filter
@@ -701,12 +700,19 @@ struct FlowGfwTask {
701700
702701 // Choose centrality estimator -- Only one can be true
703702 float centrality = 0 ;
704- if (cfgcentEstFt0c){const auto centrality = collision.centFT0C ();}
705- else if (cfgcentEstFt0a) {const auto centrality = collision.centFT0A ();}
706- else if (cfgcentEstFt0m) {const auto centrality = collision.centFT0M ();}
707- else if (cfgcentEstFv0a) {const auto centrality = collision.centFV0A ();}
708- else if (cfgcentEstFt0cVariant1) {const auto centrality = collision.centFT0CVariant1 ();}
709- else {return ;}
703+ if (cfgcentEstFt0c) {
704+ const auto centrality = collision.centFT0C ();
705+ } else if (cfgcentEstFt0a) {
706+ const auto centrality = collision.centFT0A ();
707+ } else if (cfgcentEstFt0m) {
708+ const auto centrality = collision.centFT0M ();
709+ } else if (cfgcentEstFv0a) {
710+ const auto centrality = collision.centFV0A ();
711+ } else if (cfgcentEstFt0cVariant1) {
712+ const auto centrality = collision.centFT0CVariant1 ();
713+ } else {
714+ return ;
715+ }
710716
711717 // fill event QA before cuts
712718 registry.fill (HIST (" BeforeCut_globalTracks_centT0C" ), collision.centFT0C (), tracks.size ());
@@ -860,35 +866,30 @@ struct FlowGfwTask {
860866 registry.fill (HIST (" hDCAxy" ), track.dcaXY (), track.pt ());
861867 }
862868
863- globalPlusitsNch++;
869+ globalPlusitsNch++;
864870
865- registry.fill (HIST (" GlobalplusITS" ), centrality);
871+ registry.fill (HIST (" GlobalplusITS" ), centrality);
866872
867- if (cfgGlobalplusITS){
868- if (withinPtRef){
869- fGFW ->Fill (track.eta (),fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
873+ if (cfgGlobalplusITS) {
874+ if (withinPtRef) {
875+ fGFW ->Fill (track.eta (), fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
870876 }
871877 }
872878
873- if (track.hasTPC ()){
874- if (cfgGlobalonly)
875- {
876- if (withinPtRef){
877- fGFW ->Fill (track.eta (),fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
879+ if (track.hasTPC ()) {
880+ if (cfgGlobalonly) {
881+ if (withinPtRef) {
882+ fGFW ->Fill (track.eta (), fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
878883 gloabalOnlyNch++;
879884 registry.fill (HIST (" Globalonly" ), centrality);
880885 registry.fill (HIST (" pt_Cen_ITSOnly" ), centrality, track.pt ());
881886 registry.fill (HIST (" phi_Cen_GlobalOnly" ), centrality, track.pt ());
882-
883887 }
884888 }
885- }
886- else
887- {
888- if (cfgITSonly)
889- {
890- if (withinPtRef){
891- fGFW ->Fill (track.eta (),fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
889+ } else {
890+ if (cfgITSonly) {
891+ if (withinPtRef) {
892+ fGFW ->Fill (track.eta (), fPtAxis ->FindBin (track.pt ()) - 1 , track.phi (), wacc * weff, 1 );
892893 itsOnlyNch++;
893894 registry.fill (HIST (" ITSonly" ), centrality);
894895 registry.fill (HIST (" pt_Cen_ITSOnly" ), centrality, track.pt ());
0 commit comments