2020#include " Common/CCDB/RCTSelectionFlags.h"
2121#include " Common/DataModel/Centrality.h"
2222#include " Common/DataModel/EventSelection.h"
23- #include " Common/DataModel/TrackSelectionTables.h"
2423#include " Common/DataModel/Multiplicity.h"
24+ #include " Common/DataModel/TrackSelectionTables.h"
2525
2626#include < CCDB/BasicCCDBManager.h>
2727#include < CommonConstants/MathConstants.h>
4747#include < cmath>
4848#include < cstddef>
4949#include < cstdint>
50+ #include < memory>
5051#include < numeric>
5152#include < string>
5253#include < string_view>
5354#include < vector>
54- #include < memory>
5555
5656#include < stdlib.h>
5757
@@ -171,10 +171,10 @@ struct ZdcQVectors {
171171
172172 // define my.....
173173 // Filter collisionFilter = nabs(aod::collision::posZ) <;
174-
174+
175175 using UsedCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNGlobals>;
176176 using BCsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
177- Filter trackFilter = nabs(aod::track::eta) < cfgTrackSelsEta && aod::track::pt > cfgTrackSelsPtmin && aod::track::pt < cfgTrackSelsPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t )true )) && nabs(aod::track::dcaXY) < cfgTrackSelsDCAxy && nabs(aod::track::dcaZ) < cfgTrackSelsDCAz;
177+ Filter trackFilter = nabs(aod::track::eta) < cfgTrackSelsEta && aod::track::pt > cfgTrackSelsPtmin&& aod::track::pt < cfgTrackSelsPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t )true )) && nabs(aod::track::dcaXY) < cfgTrackSelsDCAxy&& nabs(aod::track::dcaZ) < cfgTrackSelsDCAz;
178178 using UnfilteredTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;
179179 using UsedTracks = soa::Filtered<UnfilteredTracks>;
180180
@@ -412,7 +412,7 @@ struct ZdcQVectors {
412412 fMultPVCutHigh = std::make_unique<TF1 >(" fMultPVCutHigh" , " [0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x" , 0 , 100 );
413413 fMultCutLow = std::make_unique<TF1 >(" fMultCutLow" , " [0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x" , 0 , 100 );
414414 fMultCutHigh = std::make_unique<TF1 >(" fMultCutHigh" , " [0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x" , 0 , 100 );
415-
415+
416416 std::vector<double > paramsMultPVCut = cfgEvSelsMultPv;
417417 std::vector<double > paramsMultCut = cfgEvSelsMult;
418418
@@ -427,8 +427,8 @@ struct ZdcQVectors {
427427 fMultPVCutHigh ->SetParameters (paramsMultPVCut[5 ], paramsMultPVCut[6 ], paramsMultPVCut[7 ], paramsMultPVCut[8 ], paramsMultPVCut[9 ]);
428428 fMultCutLow ->SetParameters (paramsMultCut[0 ], paramsMultCut[1 ], paramsMultCut[2 ], paramsMultCut[3 ], paramsMultCut[4 ]);
429429 fMultCutHigh ->SetParameters (paramsMultCut[5 ], paramsMultCut[6 ], paramsMultCut[7 ], paramsMultCut[8 ], paramsMultCut[9 ]);
430+ }
430431 }
431- }
432432
433433 double rescaleTimestamp (uint64_t timestamp, int runnumber)
434434 {
@@ -505,15 +505,15 @@ struct ZdcQVectors {
505505 if (selected) {
506506 selectionBits |= static_cast <uint16_t >(0x1u << evSel_Zvtx);
507507 fillCutAnalysis (collision, bunchCrossing, evSel_Zvtx);
508- } else if (cfgSelVec.value [evSel_Zvtx]){
508+ } else if (cfgSelVec.value [evSel_Zvtx]) {
509509 isEventSelected = false ;
510510 }
511511
512512 selected = collision.sel8 ();
513513 if (selected) {
514514 selectionBits |= static_cast <uint16_t >(0x1u << evSel_sel8);
515515 fillCutAnalysis (collision, bunchCrossing, evSel_sel8);
516- } else if (cfgSelVec.value [evSel_sel8]){
516+ } else if (cfgSelVec.value [evSel_sel8]) {
517517 isEventSelected = false ;
518518 }
519519
@@ -522,71 +522,71 @@ struct ZdcQVectors {
522522 if (selected) {
523523 selectionBits |= static_cast <uint16_t >(0x1u << evSel_occupancy);
524524 fillCutAnalysis (collision, bunchCrossing, evSel_occupancy);
525- } else if (cfgSelVec.value [evSel_occupancy]){
525+ } else if (cfgSelVec.value [evSel_occupancy]) {
526526 isEventSelected = false ;
527527 }
528528
529529 selected = collision.selection_bit (o2::aod::evsel::kNoSameBunchPileup );
530530 if (selected) {
531531 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kNoSameBunchPileup);
532532 fillCutAnalysis (collision, bunchCrossing, evSel_kNoSameBunchPileup);
533- } else if (cfgSelVec.value [evSel_kNoSameBunchPileup]){
533+ } else if (cfgSelVec.value [evSel_kNoSameBunchPileup]) {
534534 isEventSelected = false ;
535535 }
536536
537537 selected = collision.selection_bit (o2::aod::evsel::kIsGoodZvtxFT0vsPV );
538538 if (selected) {
539539 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kIsGoodZvtxFT0vsPV);
540540 fillCutAnalysis (collision, bunchCrossing, evSel_kIsGoodZvtxFT0vsPV);
541- } else if (cfgSelVec.value [evSel_kIsGoodZvtxFT0vsPV]){
541+ } else if (cfgSelVec.value [evSel_kIsGoodZvtxFT0vsPV]) {
542542 isEventSelected = false ;
543543 }
544544
545545 selected = collision.selection_bit (o2::aod::evsel::kNoCollInTimeRangeStandard );
546546 if (selected) {
547547 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kNoCollInTimeRangeStandard);
548548 fillCutAnalysis (collision, bunchCrossing, evSel_kNoCollInTimeRangeStandard);
549- } else if (cfgSelVec.value [evSel_kNoCollInTimeRangeStandard]){
549+ } else if (cfgSelVec.value [evSel_kNoCollInTimeRangeStandard]) {
550550 isEventSelected = false ;
551551 }
552552
553553 selected = collision.selection_bit (o2::aod::evsel::kNoCollInTimeRangeNarrow );
554554 if (selected) {
555555 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kNoCollInTimeRangeNarrow);
556556 fillCutAnalysis (collision, bunchCrossing, evSel_kNoCollInTimeRangeNarrow);
557- } else if (cfgSelVec.value [evSel_kNoCollInTimeRangeNarrow]){
557+ } else if (cfgSelVec.value [evSel_kNoCollInTimeRangeNarrow]) {
558558 isEventSelected = false ;
559559 }
560560
561561 selected = collision.selection_bit (o2::aod::evsel::kIsVertexITSTPC );
562562 if (selected) {
563563 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kIsVertexITSTPC);
564564 fillCutAnalysis (collision, bunchCrossing, evSel_kIsVertexITSTPC);
565- } else if (cfgSelVec.value [evSel_kIsVertexITSTPC]){
565+ } else if (cfgSelVec.value [evSel_kIsVertexITSTPC]) {
566566 isEventSelected = false ;
567567 }
568568
569569 selected = collision.selection_bit (o2::aod::evsel::kIsGoodITSLayersAll );
570570 if (selected) {
571571 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kIsGoodITSLayersAll);
572572 fillCutAnalysis (collision, bunchCrossing, evSel_kIsGoodITSLayersAll);
573- } else if (cfgSelVec.value [evSel_kIsGoodITSLayersAll]){
573+ } else if (cfgSelVec.value [evSel_kIsGoodITSLayersAll]) {
574574 isEventSelected = false ;
575575 }
576576
577577 selected = collision.selection_bit (o2::aod::evsel::kIsGoodITSLayer0123 );
578578 if (selected) {
579579 selectionBits |= static_cast <uint16_t >(0x1u << evSel_kIsGoodITSLayer0123);
580580 fillCutAnalysis (collision, bunchCrossing, evSel_kIsGoodITSLayer0123);
581- } else if (cfgSelVec.value [evSel_kIsGoodITSLayer0123]){
581+ } else if (cfgSelVec.value [evSel_kIsGoodITSLayer0123]) {
582582 isEventSelected = false ;
583583 }
584584
585585 selected = rctChecker (collision);
586586 if (selected) {
587587 selectionBits |= static_cast <uint16_t >(0x1u << evSel_RCTFlagsZDC);
588588 fillCutAnalysis (collision, bunchCrossing, evSel_RCTFlagsZDC);
589- } else if (cfgSelVec.value [evSel_RCTFlagsZDC]){
589+ } else if (cfgSelVec.value [evSel_RCTFlagsZDC]) {
590590 isEventSelected = false ;
591591 }
592592
@@ -601,8 +601,8 @@ struct ZdcQVectors {
601601 }
602602
603603 auto multNTracksPV = collision.multNTracksPV ();
604- selected = true ;
605-
604+ selected = true ;
605+
606606 if (vtxz > cfgVtxZ || vtxz < -cfgVtxZ)
607607 selected = false ;
608608 if (multNTracksPV < fMultPVCutLow ->Eval (collision.centFT0C ()))
@@ -617,7 +617,7 @@ struct ZdcQVectors {
617617 if (selected) {
618618 selectionBits |= static_cast <uint16_t >(0x1u << evSel_MultCut);
619619 fillCutAnalysis (collision, bunchCrossing, evSel_MultCut);
620- } else if (cfgSelVec.value [evSel_MultCut]){
620+ } else if (cfgSelVec.value [evSel_MultCut]) {
621621 isEventSelected = false ;
622622 }
623623
@@ -910,7 +910,7 @@ struct ZdcQVectors {
910910
911911 // Use this bool to check for given set of event selections of Q-vectors would be selected
912912 // Enable plotting only if event would be selected
913- bool isEventSelected = true ;
913+ bool isEventSelected = true ;
914914
915915 uint16_t eventSelectionFlags = eventSelected (collision, foundBC.zdc (), isEventSelected, tracks.size ());
916916
@@ -997,7 +997,7 @@ struct ZdcQVectors {
997997 calibtower++;
998998 }
999999
1000- if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
1000+ if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
10011001 for (int i = 0 ; i < nTowersPerSide; i++) {
10021002 float bincenter = i + .5 ;
10031003 registry.fill (HIST (" QA/ZNA_Energy" ), bincenter, eZN[i]);
@@ -1056,7 +1056,7 @@ struct ZdcQVectors {
10561056 }
10571057 }
10581058
1059- if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
1059+ if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
10601060 registry.get <TProfile>(HIST (" QA/before/ZNA_Qx" ))->Fill (Form (" %d" , runnumber), q[0 ]);
10611061 registry.get <TProfile>(HIST (" QA/before/ZNA_Qy" ))->Fill (Form (" %d" , runnumber), q[1 ]);
10621062 registry.get <TProfile>(HIST (" QA/before/ZNC_Qx" ))->Fill (Form (" %d" , runnumber), q[2 ]);
@@ -1088,7 +1088,7 @@ struct ZdcQVectors {
10881088 lastRunNumber = runnumber;
10891089 return ;
10901090 } else {
1091- if (cfgFillHistRegistry && isEventSelected)
1091+ if (cfgFillHistRegistry && isEventSelected)
10921092 fillCommonRegistry<kBefore >(q[0 ], q[1 ], q[2 ], q[3 ], v, centrality, rsTimestamp);
10931093
10941094 // vector of 4
0 commit comments