Skip to content

Commit fc99753

Browse files
authored
Merge pull request #34 from alibuild/alibot-cleanup-9718
Please consider the following formatting changes to AliceO2Group#9718
2 parents 8a83012 + 7ce81e6 commit fc99753

File tree

1 file changed

+21
-25
lines changed

1 file changed

+21
-25
lines changed

PWGCF/Flow/Tasks/flowGfwTask.cxx

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct FlowGfwTask {
7979
O2_DEFINE_CONFIGURABLE(cfgNoSameBunchPileup, bool, false, "kNoSameBunchPileup");
8080
O2_DEFINE_CONFIGURABLE(cfgIsGoodZvtxFT0vsPV, bool, false, "kIsGoodZvtxFT0vsPV");
8181
O2_DEFINE_CONFIGURABLE(cfgNoCollInTimeRangeStandard, bool, false, "kNoCollInTimeRangeStandard");
82-
O2_DEFINE_CONFIGURABLE(cfgEvSelkIsGoodITSLayersAll, bool, false, "kIsGoodITSLayersAll")
82+
O2_DEFINE_CONFIGURABLE(cfgEvSelkIsGoodITSLayersAll, bool, false, "kIsGoodITSLayersAll")
8383
O2_DEFINE_CONFIGURABLE(cfgOccupancy, bool, false, "Bool for event selection on detector occupancy");
8484
O2_DEFINE_CONFIGURABLE(cfgMultCut, bool, false, "Use additional event cut on mult correlations");
8585
O2_DEFINE_CONFIGURABLE(FineBinning, bool, false, "Manually change to fine binning")
@@ -564,8 +564,8 @@ struct FlowGfwTask {
564564
}
565565
registry.fill(HIST("hEventCount"), kNOCOLLINTIMERANGESTANDART);
566566
}
567-
if (cfgEvSelkIsGoodITSLayersAll){
568-
if (cfgEvSelkIsGoodITSLayersAll && !collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
567+
if (cfgEvSelkIsGoodITSLayersAll) {
568+
if (cfgEvSelkIsGoodITSLayersAll && !collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
569569
// no other collisions in this Readout Frame with per-collision multiplicity above threshold
570570
return false;
571571
}
@@ -649,7 +649,6 @@ struct FlowGfwTask {
649649
}
650650
}
651651

652-
653652
// Apply process filters
654653
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
655654
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls) && (nabs(aod::track::dcaZ) < cfgCutDCAz) && (nabs(aod::track::dcaXY) < cfgCutDCAxy);
@@ -721,27 +720,25 @@ struct FlowGfwTask {
721720
registry.fill(HIST("multT0A_centT0A_Aft"), collision.centFT0A(), collision.multFT0A());
722721
registry.fill(HIST("multFT0M_centFT0M_Aft"), collision.centFT0M(), collision.multFT0M());
723722

724-
725723
const auto& foundBC = collision.foundBC_as<BCsRun3>();
726-
if (foundBC.has_zdc())
727-
{
728-
registry.fill(HIST("hEventCounterForZDC"), 1);
724+
if (foundBC.has_zdc()) {
725+
registry.fill(HIST("hEventCounterForZDC"), 1);
729726

730727
// FT0 amplitude to use in fine binning
731728
double ft0aAmp = 0;
732729
double ft0cAmp = 0;
733730

734-
if (collision.has_foundFT0()) {
731+
if (collision.has_foundFT0()) {
735732
auto ft0 = collision.foundFT0();
736733
for (const auto& amplitude : ft0.amplitudeA()) {
737-
ft0aAmp += amplitude;
734+
ft0aAmp += amplitude;
738735
}
739736
for (const auto& amplitude : ft0.amplitudeC()) {
740737
ft0cAmp += amplitude;
741-
}
742-
} else{
738+
}
739+
} else {
743740
ft0aAmp = ft0cAmp = -999;
744-
}
741+
}
745742

746743
registry.fill(HIST("FT0AAmp"), ft0aAmp);
747744
registry.fill(HIST("FT0CAmp"), ft0cAmp);
@@ -758,29 +755,29 @@ struct FlowGfwTask {
758755
auto aZEM1 = zdcread.amplitudeZEM1();
759756
auto aZEM2 = zdcread.amplitudeZEM2();
760757

761-
registry.fill(HIST("ZNAcoll"),aZNA);
762-
registry.fill(HIST("ZNCcoll"),aZNC);
763-
registry.fill(HIST("ZPAcoll"),aZPA);
764-
registry.fill(HIST("ZPCcoll"),aZPC);
758+
registry.fill(HIST("ZNAcoll"), aZNA);
759+
registry.fill(HIST("ZNCcoll"), aZNC);
760+
registry.fill(HIST("ZPAcoll"), aZPA);
761+
registry.fill(HIST("ZPCcoll"), aZPC);
765762

766763
double aZDC = aZNC + aZNA + aZPA + aZPC;
767764
registry.fill(HIST("ZNvsFT0correl"), (ft0aAmp + ft0aAmp) / 100., aZNC + aZNA);
768765
registry.fill(HIST("ZDCAmp"), aZDC);
769766

770767
registry.fill(HIST("ZNvsZEMcoll"), aZEM1 + aZEM2, aZNA + aZNC);
771768

772-
if(centrality>=0 && centrality<=5){
769+
if (centrality >= 0 && centrality <= 5) {
773770
registry.fill(HIST("ZNvsZEMcoll05"), aZEM1 + aZEM2, aZNA + aZNC);
774-
}else if (centrality>5 && centrality<=10){
771+
} else if (centrality > 5 && centrality <= 10) {
775772
registry.fill(HIST("ZNvsZEMcoll510"), aZEM1 + aZEM2, aZNA + aZNC);
776-
}else if (centrality>10 && centrality<=20){
773+
} else if (centrality > 10 && centrality <= 20) {
777774
registry.fill(HIST("ZNvsZEMcoll1020"), aZEM1 + aZEM2, aZNA + aZNC);
778-
}else if (centrality>20 && centrality<=30){
775+
} else if (centrality > 20 && centrality <= 30) {
779776
registry.fill(HIST("ZNvsZEMcoll2030"), aZEM1 + aZEM2, aZNA + aZNC);
780-
}else{
777+
} else {
781778
registry.fill(HIST("ZNvsZEMcollrest"), aZEM1 + aZEM2, aZNA + aZNC);
782779
}
783-
}//End of ZDC
780+
} // End of ZDC
784781

785782
// track weights
786783
float weff = 1, wacc = 1;
@@ -794,8 +791,7 @@ struct FlowGfwTask {
794791
// track loop
795792
int globalTracksNch = 0;
796793

797-
for (const auto& track : tracks)
798-
{
794+
for (const auto& track : tracks) {
799795
if (!trackSelected(track))
800796
continue;
801797

0 commit comments

Comments
 (0)