@@ -85,10 +85,12 @@ struct F0980pbpbanalysis {
8585 Configurable<bool > cfgEventOccupancySel{" cfgEventOccupancySel" , false , " Occupancy selection" };
8686 Configurable<int > cfgEventOccupancyMax{" cfgEventOccupancyMax" , 999999 , " maximum occupancy of tracks in neighbouring collisions in a given time range" };
8787 Configurable<int > cfgEventOccupancyMin{" cfgEventOccupancyMin" , -100 , " minimum occupancy of tracks in neighbouring collisions in a given time range" };
88- Configurable<bool > cfgEventNCollinTRSel{" cfgEventNCollinTRSel" , false , " Additional selection for the number of coll in time range" };
88+ Configurable<bool > cfgEventGoodZvtxSel{" cfgEventGoodZvtxSel" , true , " kIsGoodZvtxFT0vsPV selection" };
89+ Configurable<bool > cfgEventNSamePileupSel{" cfgEventNSamePileupSel" , true , " kNoSameBunchPileup selection" };
90+ Configurable<bool > cfgEventNCollinTRSel{" cfgEventNCollinTRSel" , true , " kNoCollInTimeRangeStandard selection" };
8991 Configurable<bool > cfgEventPVSel{" cfgEventPVSel" , false , " Additional PV selection flag for syst" };
9092 Configurable<float > cfgEventPV{" cfgEventPV" , 8.0 , " Additional PV selection range for syst" };
91-
93+
9294 Configurable<float > cfgEventCentMax{" cfgEventCentMax" , 80 ., " CentralityMax cut" };
9395 Configurable<int > cfgEventCentEst{" cfgEventCentEst" , 1 , " Centrality estimator, 1: FT0C, 2: FT0M" };
9496
@@ -118,7 +120,7 @@ struct F0980pbpbanalysis {
118120 Configurable<double > cfgPIDMaxTPCnSigmaPion{" cfgPIDMaxTPCnSigmaPion" , 5.0 , " TPC nSigma cut for Pion" }; // TPC
119121 Configurable<double > cfgPIDMaxTPCnSigmaPionS{" cfgPIDMaxTPCnSigmaPionS" , 3.0 , " TPC nSigma cut for Pion as a standalone" };
120122 Configurable<double > cfgPIDMaxTiednSigmaPion{" cfgPIDMaxTiednSigmaPion" , 3.0 , " Combined nSigma cut for Pion" };
121-
123+
122124 // Flow Configurables
123125 Configurable<int > cfgQvecNMods{" cfgQvecNMods" , 1 , " The number of modulations of interest starting from 2" };
124126 Configurable<int > cfgQvecNum{" cfgQvecNum" , 7 , " The number of total Qvectors for looping over the task" };
@@ -228,10 +230,9 @@ struct F0980pbpbanalysis {
228230 };
229231
230232 TRandom* rn = new TRandom();
231- // float theta2;
232233
233234 using EventCandidatesOrigin = soa::Join<aod::Collisions, aod::EvSels, aod::FT0Mults, aod::FV0Mults, aod::TPCMults, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::Mults, aod::Qvectors>;
234- using TrackCandidatesOrigin = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTPCFullKa, aod::pidTOFbeta>;
235+ using TrackCandidatesOrigin = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTPCFullKa, aod::pidTOFbeta>;
235236
236237 Filter collisionFilter = nabs(aod::collision::posZ) < cfgEventCutVertex;
237238 Filter acceptanceFilter = (nabs(aod::track::eta) < cfgTrackEtaMax && nabs(aod::track::pt) > cfgTrackPtMin);
@@ -353,11 +354,11 @@ struct F0980pbpbanalysis {
353354 return 0 ;
354355 }
355356 histos.fill (HIST (" EventQA/hnEvents" ), 2 );
356- if (!collision.selection_bit (aod::evsel::kIsGoodZvtxFT0vsPV )) {
357+ if (cfgEventGoodZvtxSel && !collision.selection_bit (aod::evsel::kIsGoodZvtxFT0vsPV )) {
357358 return 0 ;
358359 }
359360 histos.fill (HIST (" EventQA/hnEvents" ), 3 );
360- if (!collision.selection_bit (aod::evsel::kNoSameBunchPileup )) {
361+ if (cfgEventNSamePileupSel && !collision.selection_bit (aod::evsel::kNoSameBunchPileup )) {
361362 return 0 ;
362363 }
363364 histos.fill (HIST (" EventQA/hnEvents" ), 4 );
@@ -369,7 +370,7 @@ struct F0980pbpbanalysis {
369370 return 0 ;
370371 }
371372 histos.fill (HIST (" EventQA/hnEvents" ), 6 );
372- if (cfgEventOccupancySel && (collision.trackOccupancyInTimeRange () > cfgEventOccupancyMax || collision.trackOccupancyInTimeRange () < cfgEventOccupancyMin)) {
373+ if (cfgEventOccupancySel && (collision.trackOccupancyInTimeRange () > cfgEventOccupancyMax || collision.trackOccupancyInTimeRange () < cfgEventOccupancyMin)) {
373374 return 0 ;
374375 }
375376 histos.fill (HIST (" EventQA/hnEvents" ), 7 );
@@ -398,44 +399,44 @@ struct F0980pbpbanalysis {
398399 bool trackSelected (const TrackType track, const bool QA)
399400 {
400401 if (cfgQATrackCut && QA)
401- fillQA (false , track, 3 );
402- //
403- if (std::abs (track.pt ()) < cfgTrackPtMin) {
404- return 0 ;
405- }
406- if (std::abs (track.eta ()) > cfgTrackEtaMax) {
407- return 0 ;
408- }
409- if (std::abs (track.dcaXY ()) > cfgTrackDCArToPVcutMax) {
410- return 0 ;
411- }
412- if (std::abs (track.dcaZ ()) > cfgTrackDCAzToPVcutMax) {
413- return 0 ;
414- }
415- if (cfgTrackIsPVContributor && !track.isPVContributor ()) {
416- return 0 ;
417- }
418- if (cfgTrackIsPrimaryTrack && !track.isPrimaryTrack ()) {
419- return 0 ;
420- }
421- if (cfgTrackIsGlobalWoDCATrack && !track.isGlobalTrackWoDCA ()) {
422- return 0 ;
423- }
424- if (cfgTrackNTPCCrossedRows > 0 && track.tpcNClsCrossedRows () < cfgTrackNTPCCrossedRows) {
425- return 0 ;
426- }
427- if (cfgTrackNFindableTPCClusters > 0 && track.tpcNClsFindable () < cfgTrackNFindableTPCClusters) {
428- return 0 ;
429- }
430- if (cfgTrackNRowsOverFindable > 0 && track.tpcCrossedRowsOverFindableCls () > cfgTrackNRowsOverFindable) {
431- return 0 ;
432- }
433- if (cfgTrackNTPCChi2 > 0 && track.tpcChi2NCl () > cfgTrackNTPCChi2) {
434- return 0 ;
435- }
436- if (cfgTrackNITSChi2 > 0 && track.itsChi2NCl () > cfgTrackNITSChi2) {
437- return 0 ;
438- }
402+ fillQA (false , track, 3 );
403+ //
404+ if (std::abs (track.pt ()) < cfgTrackPtMin) {
405+ return 0 ;
406+ }
407+ if (std::abs (track.eta ()) > cfgTrackEtaMax) {
408+ return 0 ;
409+ }
410+ if (std::abs (track.dcaXY ()) > cfgTrackDCArToPVcutMax) {
411+ return 0 ;
412+ }
413+ if (std::abs (track.dcaZ ()) > cfgTrackDCAzToPVcutMax) {
414+ return 0 ;
415+ }
416+ if (cfgTrackIsPVContributor && !track.isPVContributor ()) {
417+ return 0 ;
418+ }
419+ if (cfgTrackIsPrimaryTrack && !track.isPrimaryTrack ()) {
420+ return 0 ;
421+ }
422+ if (cfgTrackIsGlobalWoDCATrack && !track.isGlobalTrackWoDCA ()) {
423+ return 0 ;
424+ }
425+ if (cfgTrackNTPCCrossedRows > 0 && track.tpcNClsCrossedRows () < cfgTrackNTPCCrossedRows) {
426+ return 0 ;
427+ }
428+ if (cfgTrackNFindableTPCClusters > 0 && track.tpcNClsFindable () < cfgTrackNFindableTPCClusters) {
429+ return 0 ;
430+ }
431+ if (cfgTrackNRowsOverFindable > 0 && track.tpcCrossedRowsOverFindableCls () > cfgTrackNRowsOverFindable) {
432+ return 0 ;
433+ }
434+ if (cfgTrackNTPCChi2 > 0 && track.tpcChi2NCl () > cfgTrackNTPCChi2) {
435+ return 0 ;
436+ }
437+ if (cfgTrackNITSChi2 > 0 && track.itsChi2NCl () > cfgTrackNITSChi2) {
438+ return 0 ;
439+ }
439440 return 1 ;
440441 }
441442
@@ -447,32 +448,32 @@ struct F0980pbpbanalysis {
447448 //
448449 if (cfgListPID == PIDList::PIDRun3) {
449450 if (cfgPIDUSETOF) {
450- if (std::fabs (track.tofNSigmaPi ()) > cfgPIDMaxTOFnSigmaPion) {
451+ if (std::abs (track.tofNSigmaPi ()) > cfgPIDMaxTOFnSigmaPion) {
451452 return 0 ;
452453 }
453- if (std::fabs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPion) {
454+ if (std::abs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPion) {
454455 return 0 ;
455456 }
456457 }
457- if (std::fabs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
458+ if (std::abs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
458459 return 0 ;
459460 }
460461 } else if (cfgListPID == PIDList::PIDRun2) {
461462 if (cfgPIDUSETOF) {
462463 if (track.hasTOF ()) {
463- if (std::fabs (track.tofNSigmaPi ()) > cfgPIDMaxTOFnSigmaPion) {
464+ if (std::abs (track.tofNSigmaPi ()) > cfgPIDMaxTOFnSigmaPion) {
464465 return 0 ;
465466 }
466- if (std::fabs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPion) {
467+ if (std::abs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPion) {
467468 return 0 ;
468469 }
469470 } else {
470- if (std::fabs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
471+ if (std::abs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
471472 return 0 ;
472473 }
473474 }
474475 } else {
475- if (std::fabs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
476+ if (std::abs (track.tpcNSigmaPi ()) > cfgPIDMaxTPCnSigmaPionS) {
476477 return 0 ;
477478 }
478479 }
@@ -483,12 +484,12 @@ struct F0980pbpbanalysis {
483484 return 0 ;
484485 }
485486 } else {
486- if (std::fabs (getTpcNSigma (track)) > cfgPIDMaxTPCnSigmaPionS) {
487+ if (std::abs (getTpcNSigma (track)) > cfgPIDMaxTPCnSigmaPionS) {
487488 return 0 ;
488489 }
489490 }
490491 } else {
491- if (std::fabs (getTpcNSigma (track)) > cfgPIDMaxTPCnSigmaPionS) {
492+ if (std::abs (getTpcNSigma (track)) > cfgPIDMaxTPCnSigmaPionS) {
492493 return 0 ;
493494 }
494495 }
@@ -497,7 +498,7 @@ struct F0980pbpbanalysis {
497498 }
498499
499500 template <typename TrackType1, typename TrackType2>
500- bool indexSelection (const TrackType1 track1, const TrackType2 track2)
501+ bool pairIndexSelection (const TrackType1 track1, const TrackType2 track2)
501502 {
502503 if (cfgListPair == IndexSelList::woSame) {
503504 if (track2.globalIndex () == track1.globalIndex ()) {
@@ -587,7 +588,7 @@ struct F0980pbpbanalysis {
587588 fillQA (true , trk1, 5 );
588589 }
589590
590- if (!indexSelection (trk1, trk2)) {
591+ if (!pairIndexSelection (trk1, trk2)) {
591592 continue ;
592593 }
593594
@@ -629,7 +630,7 @@ struct F0980pbpbanalysis {
629630
630631 void processEventMixing (EventCandidates const & collisions, TrackCandidates const & tracks)
631632 {
632- // int nmode = 2; // second order
633+ // nmode = 2; // second order
633634 qVecDetInd = detId * 4 + 3 + (nmode - 2 ) * cfgQvecNum * 4 ;
634635
635636 auto trackTuple = std::make_tuple (tracks);
@@ -665,7 +666,7 @@ struct F0980pbpbanalysis {
665666 if (!selectionPID (trk2, false )) {
666667 continue ;
667668 }
668- // if (!indexSelection (trk1, trk2)) {
669+ // if (!pairIndexSelection (trk1, trk2)) {
669670 // continue;
670671 // }
671672 if (cfgPhiDeepAngleSel && !pairAngleSelection (trk1, trk2)) {
@@ -689,11 +690,12 @@ struct F0980pbpbanalysis {
689690 }
690691 PROCESS_SWITCH (F0980pbpbanalysis, processEventMixing, " Process Event mixing" , true );
691692
692- void processOnce (EventCandidatesOrigin const & events)
693+ void processOnce (EventCandidatesOrigin const & events)
693694 {
694695 nTotalEvents += events.size ();
695696 auto hTotalEvents = histos.get <TH1>(HIST (" EventQA/hnEvents" ));
696- if (hTotalEvents) hTotalEvents->SetBinContent (1 , static_cast <double >(nTotalEvents));
697+ if (hTotalEvents)
698+ hTotalEvents->SetBinContent (1 , static_cast <double >(nTotalEvents));
697699 // std::cout << "Total number of events processed: " << nTotalEvents << std::endl;
698700 }
699701 PROCESS_SWITCH (F0980pbpbanalysis, processOnce, " fill Total nEvents once" , true );
@@ -707,7 +709,7 @@ struct F0980pbpbanalysis {
707709 AxisSpec qaEpAxis = {100 , -1.0 * o2::constants::math::PI, o2::constants::math::PI};
708710 AxisSpec epresAxis = {102 , -1.02 , 1.02 };
709711
710- // Event QA
712+ // Event QA
711713 if (cfgQAEventCut) {
712714 histos.add (" EventQA/CentDist_BC" , " " , {HistType::kTH1F , {qaCentAxis}});
713715 histos.add (" EventQA/Vz_BC" , " " , {HistType::kTH1F , {qaVzAxis}});
@@ -781,7 +783,7 @@ struct F0980pbpbanalysis {
781783 {HistType::kTHnSparseF , {axisMass, axisPT, axisCent, axisEp}});
782784 // if (doprocessMCLight) {
783785 // histos.add("MCL/hpT_f0980_GEN", "generated f0 signals", HistType::kTH1F, {qaPtAxis});
784- // histos.add("MCL/hpT_f0980_REC", "reconstructed f0 signals", HistType::kTH3F, {massAxis , qaPtAxis, centAxis });
786+ // histos.add("MCL/hpT_f0980_REC", "reconstructed f0 signals", HistType::kTH3F, {axisMass , qaPtAxis, axisCent });
785787 // }
786788
787789 // Event Histograms
@@ -798,8 +800,7 @@ struct F0980pbpbanalysis {
798800 " Occupancy" ,
799801 " Centrality" ,
800802 " Additional PV cut" ,
801- " Passed Events"
802- };
803+ " Passed Events" };
803804 for (size_t i = 0 ; i < eventCutLabels.size (); ++i) {
804805 hEventsCutFlow->GetXaxis ()->SetBinLabel (i + 1 , eventCutLabels[i].c_str ());
805806 }
@@ -846,7 +847,7 @@ struct F0980pbpbanalysis {
846847 }
847848 fillQA (true , collision, 1 ); // Event QA
848849
849- fillHistograms<false >(collision, tracks); // second order
850+ fillHistograms<false >(collision, tracks);
850851 };
851852 PROCESS_SWITCH (F0980pbpbanalysis, processData, " Process Event for data" , true );
852853};
0 commit comments