Skip to content

[PWGCF] Please consider the following formatting changes to #12946 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenyaCern merged 1 commit into from
Sep 16, 2025
Merged

[PWGCF] Please consider the following formatting changes to #12946 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PWGCF/DataModel/FemtoDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2025 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.
#ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
#define PWGCF_DATAMODEL_FEMTODERIVED_H_

Expand Down Expand Up @@ -38,7 +38,7 @@
<<<<<<< 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

Check failure on line 41 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
kNCollisionBinning
};
Expand All @@ -50,17 +50,17 @@

using BitMaskType = uint32_t; //! Definition of the data type for the collision masks

DECLARE_SOA_COLUMN(BitMaskTrackOne, bitmaskTrackOne, BitMaskType); //! Bit for track one

Check failure on line 53 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackTwo, bitmaskTrackTwo, BitMaskType); //! Bit for track two

Check failure on line 54 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit for track three

Check failure on line 55 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

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
Expand Down Expand Up @@ -98,7 +98,7 @@

namespace mcfdcolllabel
{
DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision

Check failure on line 101 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
}
DECLARE_SOA_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);

Expand Down Expand Up @@ -139,13 +139,13 @@

static constexpr std::string_view TrackTypeName[kNTrackTypes] = {"Trk", "Pos", "Neg", "Bach"}; //! Naming of the different particle types

DECLARE_SOA_INDEX_COLUMN(FDCollision, fdCollision);

Check failure on line 142 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(Pt, pt, float); //! p_T (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
DECLARE_SOA_COLUMN(PartType, partType, uint8_t); //! Type of the particle, according to femtodreamparticle::ParticleType
DECLARE_SOA_COLUMN(Cut, cut, cutContainerType); //! Bit-wise container for the different selection criteria
DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType); //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID

Check failure on line 148 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TempFitVar, tempFitVar, float); //! Observable for the template fitting (Track: DCA_xy, V0: CPA)
DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Children, children); //! Field for the track indices to remove auto-correlations
DECLARE_SOA_COLUMN(MLambda, mLambda, float); //! The invariant mass of V0 candidate, assuming lambda
Expand Down
32 changes: 16 additions & 16 deletions PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@
/// \param col Collision
/// \return whether or not the collisions fulfills the specified selections
template <typename C>
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();
Expand Down Expand Up @@ -260,7 +260,7 @@
if (doQnSeparation) {
=======

if (doQnSeparation){
if (doQnSeparation) {

Check failure on line 263 in PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
for (int iqn(0); iqn < mumQnBins; ++iqn) {
profilesC22.push_back(mHistogramQn->add<TProfile>(("Qn/profileC22_" + std::to_string(iqn)).c_str(), "; cent; c22", kTProfile, {{10, 0, 100}}));
Expand Down Expand Up @@ -452,9 +452,9 @@
}
}
=======
if (qnBin >= 0 && qnBin < numQnBins){
if (qnBin >= 0 && qnBin < numQnBins) {
std::get<std::shared_ptr<TH1>>(qnMults[qnBin])->Fill(mult);
}

Check failure on line 457 in PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
}

Expand Down Expand Up @@ -574,9 +574,9 @@
return; // invalid qn bin
}
=======
mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins){
std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins) {
std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
>>>>>>> 79d4db6e4 (fixed as comments)
}
return;
Expand All @@ -603,15 +603,15 @@
TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event
TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event
=======
std::vector<HistPtr> qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
std::vector<HistPtr> 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<HistPtr> qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
std::vector<HistPtr> 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

Check failure on line 614 in PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
};
} // namespace o2::analysis::femtoDream
Expand Down
20 changes: 10 additions & 10 deletions PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,12 +774,12 @@
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)
}
}
Expand Down Expand Up @@ -1142,7 +1142,7 @@
}

template <typename CollisionType, typename TrackType>
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
Expand Down Expand Up @@ -1269,9 +1269,9 @@
} else {
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
=======
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
} else {
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);

Check failure on line 1274 in PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
}
}
Expand Down Expand Up @@ -1299,9 +1299,9 @@
if (qnCal.ConfQnSeparation) {
fillCollisionsFlow<false, true, true>(col, tracks);
=======
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
} else {
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);

Check failure on line 1304 in PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
}
}
Expand Down Expand Up @@ -1352,7 +1352,7 @@
<<<<<<< HEAD
fillCollisionsAndTracksAndV0AndCascade<true, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
=======
fillCollisionsAndTracksAndV0AndCascade<true, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);

Check failure on line 1355 in PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
}
PROCESS_SWITCH(femtoDreamProducerTask, processMC_CentPbPb, "Provide MC data with centrality information for PbPb collisions", false);
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,8 @@
case femtodreamcollision::kMultPercentileqn:
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
=======
case femtodreamcollision::kMultPercentileQn:
case femtodreamcollision::kMultPercentileQn:
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);

Check failure on line 760 in PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
>>>>>>> 79d4db6e4 (fixed as comments)
break;
default:
Expand Down
Loading