Skip to content

Commit 8aa426f

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 45ba967 commit 8aa426f

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎PWGCF/DataModel/FemtoDerived.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum CollisionBinning {
3838
<<<<<<< HEAD
3939
kMultPercentileqn, //! Bin collision in multiplicity percentile an qn value for mixing
4040
=======
41-
kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing
41+
kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing
4242
>>>>>>> 79d4db6e4 (fixed as comments)
4343
kNCollisionBinning
4444
};
@@ -57,10 +57,10 @@ DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit f
5757
DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
5858

5959
<<<<<<< HEAD
60-
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn bins for dividing events
61-
DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! TPC occupancy
60+
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn bins for dividing events
61+
DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! TPC occupancy
6262
=======
63-
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events
63+
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events
6464
DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! Occupancy of the event
6565
>>>>>>> 79d4db6e4 (fixed as comments)
6666
} // namespace femtodreamcollision

‎PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ class FemtoDreamCollisionSelection
185185
/// \param col Collision
186186
/// \return whether or not the collisions fulfills the specified selections
187187
template <typename C>
188-
bool occupancySelection(C const& col,
189-
int tpcOccupancyMin, int tpcOccupancyMax)
188+
bool occupancySelection(C const& col,
189+
int tpcOccupancyMin, int tpcOccupancyMax)
190190
>>>>>>> 79d4db6e4 (fixed as comments)
191191
{
192192
const auto occupancy = col.trackOccupancyInTimeRange();
@@ -260,7 +260,7 @@ class FemtoDreamCollisionSelection
260260
if (doQnSeparation) {
261261
=======
262262

263-
if (doQnSeparation){
263+
if (doQnSeparation) {
264264
>>>>>>> 79d4db6e4 (fixed as comments)
265265
for (int iqn(0); iqn < mumQnBins; ++iqn) {
266266
profilesC22.push_back(mHistogramQn->add<TProfile>(("Qn/profileC22_" + std::to_string(iqn)).c_str(), "; cent; c22", kTProfile, {{10, 0, 100}}));
@@ -452,7 +452,7 @@ class FemtoDreamCollisionSelection
452452
}
453453
}
454454
=======
455-
if (qnBin >= 0 && qnBin < numQnBins){
455+
if (qnBin >= 0 && qnBin < numQnBins) {
456456
std::get<std::shared_ptr<TH1>>(qnMults[qnBin])->Fill(mult);
457457
}
458458
>>>>>>> 79d4db6e4 (fixed as comments)
@@ -574,9 +574,9 @@ class FemtoDreamCollisionSelection
574574
return; // invalid qn bin
575575
}
576576
=======
577-
mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
578-
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins){
579-
std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
577+
mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
578+
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins) {
579+
std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
580580
>>>>>>> 79d4db6e4 (fixed as comments)
581581
}
582582
return;
@@ -603,15 +603,15 @@ class FemtoDreamCollisionSelection
603603
TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event
604604
TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event
605605
=======
606-
std::vector<HistPtr> qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
607-
std::vector<HistPtr> profilesC22; /// Pofile Histograms of c22 per Qn bin.
608-
HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output
609-
TH2D* mReQthisEvt = nullptr; ///< For flow cumulant in an event
610-
TH2D* mImQthisEvt = nullptr; ///< For flow cumulant in an event
611-
TH2D* mReQ2thisEvt = nullptr; ///< For flow cumulant in an event
612-
TH2D* mImQ2thisEvt = nullptr; ///< For flow cumulant in an event
613-
TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event
614-
TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event
606+
std::vector<HistPtr> qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
607+
std::vector<HistPtr> profilesC22; /// Pofile Histograms of c22 per Qn bin.
608+
HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output
609+
TH2D* mReQthisEvt = nullptr; ///< For flow cumulant in an event
610+
TH2D* mImQthisEvt = nullptr; ///< For flow cumulant in an event
611+
TH2D* mReQ2thisEvt = nullptr; ///< For flow cumulant in an event
612+
TH2D* mImQ2thisEvt = nullptr; ///< For flow cumulant in an event
613+
TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event
614+
TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event
615615
>>>>>>> 79d4db6e4 (fixed as comments)
616616
};
617617
} // namespace o2::analysis::femtoDream

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -774,12 +774,12 @@ struct femtoDreamProducerTask {
774774
return;
775775
=======
776776
if (OptionEvtSpecialSelections.ConfIsUsePileUpPbPb &&
777-
!colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)){
778-
return;
777+
!colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)) {
778+
return;
779779
}
780-
if (OptionEvtSpecialSelections.ConfIsUseOccupancy &&
781-
!colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
782-
return;
780+
if (OptionEvtSpecialSelections.ConfIsUseOccupancy &&
781+
!colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
782+
return;
783783
>>>>>>> 79d4db6e4 (fixed as comments)
784784
}
785785
}
@@ -1142,7 +1142,7 @@ struct femtoDreamProducerTask {
11421142
}
11431143

11441144
template <typename CollisionType, typename TrackType>
1145-
void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr)
1145+
void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr)
11461146
{
11471147
float myqn = -999.;
11481148
// Calculate and fill qn values
@@ -1269,9 +1269,9 @@ struct femtoDreamProducerTask {
12691269
} else {
12701270
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
12711271
=======
1272-
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
1272+
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
12731273
} else {
1274-
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
1274+
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
12751275
>>>>>>> 79d4db6e4 (fixed as comments)
12761276
}
12771277
}
@@ -1299,9 +1299,9 @@ struct femtoDreamProducerTask {
12991299
if (qnCal.ConfQnSeparation) {
13001300
fillCollisionsFlow<false, true, true>(col, tracks);
13011301
=======
1302-
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
1302+
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
13031303
} else {
1304-
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
1304+
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
13051305
>>>>>>> 79d4db6e4 (fixed as comments)
13061306
}
13071307
}

‎PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ struct femtoDreamPairTaskTrackTrack {
756756
case femtodreamcollision::kMultPercentileqn:
757757
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
758758
=======
759-
case femtodreamcollision::kMultPercentileQn:
759+
case femtodreamcollision::kMultPercentileQn:
760760
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
761761
>>>>>>> 79d4db6e4 (fixed as comments)
762762
break;

0 commit comments

Comments
 (0)