From 8aa426fca2baedc32ec2de8357428fd3731be5a5 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 16 Sep 2025 11:47:55 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGCF/DataModel/FemtoDerived.h | 8 ++--- .../Core/femtoDreamCollisionSelection.h | 32 +++++++++---------- .../TableProducer/femtoDreamProducerTask.cxx | 20 ++++++------ .../Tasks/femtoDreamPairTaskTrackTrack.cxx | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/PWGCF/DataModel/FemtoDerived.h b/PWGCF/DataModel/FemtoDerived.h index e45602f6b6a..fe012ac6989 100644 --- a/PWGCF/DataModel/FemtoDerived.h +++ b/PWGCF/DataModel/FemtoDerived.h @@ -38,7 +38,7 @@ enum CollisionBinning { <<<<<<< HEAD kMultPercentileqn, //! Bin collision in multiplicity percentile an qn value for mixing ======= - kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing + kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing >>>>>>> 79d4db6e4 (fixed as comments) kNCollisionBinning }; @@ -57,10 +57,10 @@ DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit f DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling <<<<<<< HEAD -DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn bins for dividing events -DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! TPC occupancy +DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn bins for dividing events +DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! TPC occupancy ======= -DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events +DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! Occupancy of the event >>>>>>> 79d4db6e4 (fixed as comments) } // namespace femtodreamcollision diff --git a/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h b/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h index bb0f9a97a00..3f8ed66ed9c 100644 --- a/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h +++ b/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h @@ -185,8 +185,8 @@ class FemtoDreamCollisionSelection /// \param col Collision /// \return whether or not the collisions fulfills the specified selections template - bool occupancySelection(C const& col, - int tpcOccupancyMin, int tpcOccupancyMax) + bool occupancySelection(C const& col, + int tpcOccupancyMin, int tpcOccupancyMax) >>>>>>> 79d4db6e4 (fixed as comments) { const auto occupancy = col.trackOccupancyInTimeRange(); @@ -260,7 +260,7 @@ class FemtoDreamCollisionSelection if (doQnSeparation) { ======= - if (doQnSeparation){ + if (doQnSeparation) { >>>>>>> 79d4db6e4 (fixed as comments) for (int iqn(0); iqn < mumQnBins; ++iqn) { profilesC22.push_back(mHistogramQn->add(("Qn/profileC22_" + std::to_string(iqn)).c_str(), "; cent; c22", kTProfile, {{10, 0, 100}})); @@ -452,7 +452,7 @@ class FemtoDreamCollisionSelection } } ======= - if (qnBin >= 0 && qnBin < numQnBins){ + if (qnBin >= 0 && qnBin < numQnBins) { std::get>(qnMults[qnBin])->Fill(mult); } >>>>>>> 79d4db6e4 (fixed as comments) @@ -574,9 +574,9 @@ class FemtoDreamCollisionSelection return; // invalid qn bin } ======= - mHistogramQn->get(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ)); - if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins){ - std::get>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ)); + mHistogramQn->get(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ)); + if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins) { + std::get>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ)); >>>>>>> 79d4db6e4 (fixed as comments) } return; @@ -603,15 +603,15 @@ class FemtoDreamCollisionSelection TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event ======= - std::vector qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager. - std::vector profilesC22; /// Pofile Histograms of c22 per Qn bin. - HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output - TH2D* mReQthisEvt = nullptr; ///< For flow cumulant in an event - TH2D* mImQthisEvt = nullptr; ///< For flow cumulant in an event - TH2D* mReQ2thisEvt = nullptr; ///< For flow cumulant in an event - TH2D* mImQ2thisEvt = nullptr; ///< For flow cumulant in an event - TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event - TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event + std::vector qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager. + std::vector profilesC22; /// Pofile Histograms of c22 per Qn bin. + HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output + TH2D* mReQthisEvt = nullptr; ///< For flow cumulant in an event + TH2D* mImQthisEvt = nullptr; ///< For flow cumulant in an event + TH2D* mReQ2thisEvt = nullptr; ///< For flow cumulant in an event + TH2D* mImQ2thisEvt = nullptr; ///< For flow cumulant in an event + TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event + TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event >>>>>>> 79d4db6e4 (fixed as comments) }; } // namespace o2::analysis::femtoDream diff --git a/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx b/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx index bea6aebafe2..ef4f1e15ef3 100644 --- a/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx +++ b/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx @@ -774,12 +774,12 @@ struct femtoDreamProducerTask { return; ======= if (OptionEvtSpecialSelections.ConfIsUsePileUpPbPb && - !colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)){ - return; + !colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)) { + return; } - if (OptionEvtSpecialSelections.ConfIsUseOccupancy && - !colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) { - return; + if (OptionEvtSpecialSelections.ConfIsUseOccupancy && + !colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) { + return; >>>>>>> 79d4db6e4 (fixed as comments) } } @@ -1142,7 +1142,7 @@ struct femtoDreamProducerTask { } template - void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr) + void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr) { float myqn = -999.; // Calculate and fill qn values @@ -1269,9 +1269,9 @@ struct femtoDreamProducerTask { } else { fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracks, fullV0s, fullCascades); ======= - fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracksWithItsPid, fullV0s, fullCascades); + fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracksWithItsPid, fullV0s, fullCascades); } else { - fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracks, fullV0s, fullCascades); + fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracks, fullV0s, fullCascades); >>>>>>> 79d4db6e4 (fixed as comments) } } @@ -1299,9 +1299,9 @@ struct femtoDreamProducerTask { if (qnCal.ConfQnSeparation) { fillCollisionsFlow(col, tracks); ======= - fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracksWithItsPid, fullV0s, fullCascades); + fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracksWithItsPid, fullV0s, fullCascades); } else { - fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracks, fullV0s, fullCascades); + fillCollisionsAndTracksAndV0AndCascade(col, tracks, tracks, fullV0s, fullCascades); >>>>>>> 79d4db6e4 (fixed as comments) } } diff --git a/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx b/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx index 974e801370f..31096df325a 100644 --- a/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx +++ b/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx @@ -756,7 +756,7 @@ struct femtoDreamPairTaskTrackTrack { case femtodreamcollision::kMultPercentileqn: doMixedEvent_NotMasked(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn); ======= - case femtodreamcollision::kMultPercentileQn: + case femtodreamcollision::kMultPercentileQn: doMixedEvent_NotMasked(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn); >>>>>>> 79d4db6e4 (fixed as comments) break;