@@ -82,7 +82,7 @@ struct FlowGfwTask {
8282 O2_DEFINE_CONFIGURABLE (cfgCutDCAz, float , 2 .0f , " Custom DCA Z cut" )
8383 O2_DEFINE_CONFIGURABLE (cfgCutDCAxy, float , 1 .0f , " Custom DCA XY cut" )
8484 O2_DEFINE_CONFIGURABLE (cfgNbootstrap, int , 10 , " Number of subsamples" )
85- O2_DEFINE_CONFIGURABLE (cfgCentEstFt0c, bool , false , " Centrality estimator based on FT0C signal" )
85+ O2_DEFINE_CONFIGURABLE (cfgCentEstFt0c, bool , true , " Centrality estimator based on FT0C signal" )
8686 O2_DEFINE_CONFIGURABLE (cfgCentEstFt0a, bool , false , " Centrality estimator based on FT0A signal" )
8787 O2_DEFINE_CONFIGURABLE (cfgCentEstFt0m, bool , false , " A centrality estimator based on FT0A+FT0C signals." )
8888 O2_DEFINE_CONFIGURABLE (cfgCentEstFv0a, bool , false , " Centrality estimator based on FV0A signal" )
@@ -93,20 +93,20 @@ struct FlowGfwTask {
9393 O2_DEFINE_CONFIGURABLE (cfgMagnetField, std::string, " GLO/Config/GRPMagField" , " CCDB path to Magnet field object" )
9494 O2_DEFINE_CONFIGURABLE (cfgDCAzPt, bool , false , " switch for DCAz pt dependent" )
9595 O2_DEFINE_CONFIGURABLE (cfgTrackSelRun3ITSMatch, bool , false , " Track selection for ITS matches" )
96- O2_DEFINE_CONFIGURABLE (cfgUseAdditionalEventCut, bool , false , " Use additional event cut on mult correlations" )
97- O2_DEFINE_CONFIGURABLE (cfgUseAdditionalTrackCut, bool , false , " Use additional track cut on phi" )
96+ O2_DEFINE_CONFIGURABLE (cfgUseAdditionalEventCut, bool , true , " Use additional event cut on mult correlations" )
97+ O2_DEFINE_CONFIGURABLE (cfgUseAdditionalTrackCut, bool , true , " Use additional track cut on phi" )
9898 O2_DEFINE_CONFIGURABLE (cfgOccupancy, bool , false , " Bool for event selection on detector occupancy" );
9999 O2_DEFINE_CONFIGURABLE (cfgNoTimeFrameBorder, bool , false , " kNoTimeFrameBorder" );
100100 O2_DEFINE_CONFIGURABLE (cfgNoITSROFrameBorder, bool , false , " kNoITSROFrameBorder" );
101101 O2_DEFINE_CONFIGURABLE (cfgNoSameBunchPileup, bool , false , " kNoSameBunchPileup" );
102102 O2_DEFINE_CONFIGURABLE (cfgIsGoodZvtxFT0vsPV, bool , false , " kIsGoodZvtxFT0vsPV" );
103- O2_DEFINE_CONFIGURABLE (cfgIsVertexITSTPC, bool , false , " kIsVertexITSTPC" );
103+ O2_DEFINE_CONFIGURABLE (cfgIsVertexITSTPC, bool , true , " kIsVertexITSTPC" );
104104 O2_DEFINE_CONFIGURABLE (cfgNoCollInTimeRangeStandard, bool , false , " kNoCollInTimeRangeStandard" );
105105 O2_DEFINE_CONFIGURABLE (cfgEvSelkIsGoodITSLayersAll, bool , false , " kIsGoodITSLayersAll" )
106106 O2_DEFINE_CONFIGURABLE (cfgMultCut, bool , false , " Use additional event cut on mult correlations" );
107107 O2_DEFINE_CONFIGURABLE (cfgV0AT0ANSigma, bool , false , " V0A T0A n sigma cut" )
108108 O2_DEFINE_CONFIGURABLE (cfgNSigma, float , 5 .0f , " N sigma cut" )
109- O2_DEFINE_CONFIGURABLE (cfgGlobalTracks, bool , false , " Global tracks" )
109+ O2_DEFINE_CONFIGURABLE (cfgGlobalTracks, bool , true , " Global tracks" )
110110 O2_DEFINE_CONFIGURABLE (cfgGlobalplusITS, bool , false , " Global and ITS tracks" )
111111 O2_DEFINE_CONFIGURABLE (cfgGlobalonly, bool , false , " Global only tracks" )
112112 O2_DEFINE_CONFIGURABLE (cfgITSonly, bool , false , " ITS only tracks" )
@@ -894,9 +894,15 @@ struct FlowGfwTask {
894894 }
895895 }
896896
897- // Apply process filters GlobalTracks
897+ // Apply process filters Global+ITS_only sample
898898 Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex && (aod::cent::centFT0C > cfgMinCentFT0C) && (aod::cent::centFT0C < cfgMaxCentFT0C);
899- Filter trackFilter = ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t ) true )) && (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && (nabs(aod::track::dcaZ) < cfgCutDCAz) && (nabs(aod::track::dcaXY) < cfgCutDCAxy);
899+ Filter trackFilter = ncheckbit(aod::track::v001::detectorMap, (uint8_t )o2::aod::track::ITS) &&
900+ ncheckbit (aod::track::trackCutFlag, TrackSelectionITS) &&
901+ ifnode (ncheckbit(aod::track::v001::detectorMap, (uint8_t )o2::aod::track::TPC),
902+ ncheckbit(aod::track::trackCutFlag, TrackSelectionTPC), true) &&
903+ ifnode(dcaZ > 0 .f, nabs(aod::track::dcaZ) <= dcaZ && ncheckbit(aod::track::trackCutFlag, TrackSelectionDCAXYonly),
904+ ncheckbit(aod::track::trackCutFlag, TrackSelectionDCA)) && (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && (nabs(aod::track::dcaZ) < cfgCutDCAz) && (nabs(aod::track::dcaXY) < cfgCutDCAxy);
905+
900906
901907 void processData (Colls::iterator const & collision, aod::BCsWithTimestamps const &, AodTracks const & tracks, aod::FT0s const &, BCsRun3 const &)
902908 {
@@ -1239,7 +1245,7 @@ struct FlowGfwTask {
12391245 }
12401246
12411247 } // End of process
1242- PROCESS_SWITCH (FlowGfwTask, processData, " Process analysis for Run 3 data" , false );
1248+ PROCESS_SWITCH (FlowGfwTask, processData, " Process analysis for Run 3 data" , true );
12431249
12441250 using TheFilteredMyTracks = soa::Filtered<MyTracks>;
12451251 using TheFilteredMyCollisions = soa::Filtered<MyCollisions>;
0 commit comments