Skip to content

Commit abd0ced

Browse files
wenyaCernwenyaCern
committed
fixed as comments, no confllicts
1 parent 1000501 commit abd0ced

File tree

4 files changed

+13
-208
lines changed

4 files changed

+13
-208
lines changed

‎PWGCF/DataModel/FemtoDerived.h‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ enum CollisionBinning {
3535
kMult, //! Bin collision in number of charged tracks for mixing
3636
kMultPercentile, //! Bin collision in multiplicity percentile for mixing
3737
kMultMultPercentile, //! Bin collision in number of charged tracks and multiplicity percentile for mixing
38-
<<<<<<< HEAD
39-
kMultPercentileqn, //! Bin collision in multiplicity percentile an qn value for mixing
40-
=======
41-
kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing
42-
>>>>>>> 79d4db6e4 (fixed as comments)
38+
kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing
4339
kNCollisionBinning
4440
};
4541

@@ -56,13 +52,8 @@ DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit f
5652

5753
DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
5854

59-
<<<<<<< HEAD
60-
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn bins for dividing events
61-
DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! TPC occupancy
62-
=======
63-
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events
55+
DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events
6456
DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! Occupancy of the event
65-
>>>>>>> 79d4db6e4 (fixed as comments)
6657
} // namespace femtodreamcollision
6758

6859
DECLARE_SOA_TABLE_STAGED(FDCollisions, "FDCOLLISION",

‎PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h‎

Lines changed: 7 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,6 @@ class FemtoDreamCollisionSelection
167167
/// \return whether or not the collisions fulfills the specified selections
168168
template <typename C>
169169
bool isPileUpCollisionPbPb(C const& col,
170-
<<<<<<< HEAD
171-
bool noSameBunchPileup, bool isGoodITSLayersAll,
172-
int tpcOccupancyMin, int tpcOccupancyMax)
173-
=======
174170
bool noSameBunchPileup, bool isGoodITSLayersAll)
175171
{
176172
if ((noSameBunchPileup && !col.selection_bit(aod::evsel::kNoSameBunchPileup)) || (isGoodITSLayersAll && !col.selection_bit(aod::evsel::kIsGoodITSLayersAll))) {
@@ -185,21 +181,13 @@ class FemtoDreamCollisionSelection
185181
/// \param col Collision
186182
/// \return whether or not the collisions fulfills the specified selections
187183
template <typename C>
188-
bool occupancySelection(C const& col,
189-
int tpcOccupancyMin, int tpcOccupancyMax)
190-
>>>>>>> 79d4db6e4 (fixed as comments)
184+
bool occupancySelection(C const& col,
185+
int tpcOccupancyMin, int tpcOccupancyMax)
191186
{
192187
const auto occupancy = col.trackOccupancyInTimeRange();
193188
if ((occupancy < tpcOccupancyMin || occupancy > tpcOccupancyMax)) {
194189
return false;
195190
}
196-
<<<<<<< HEAD
197-
if ((noSameBunchPileup && !col.selection_bit(aod::evsel::kNoSameBunchPileup)) || (isGoodITSLayersAll && !col.selection_bit(aod::evsel::kIsGoodITSLayersAll))) {
198-
return false;
199-
}
200-
=======
201-
>>>>>>> 79d4db6e4 (fixed as comments)
202-
203191
return true;
204192
}
205193

@@ -256,12 +244,8 @@ class FemtoDreamCollisionSelection
256244
mHistogramQn = registry;
257245
mHistogramQn->add<TProfile>("Event/profileC22", "; cent; c22", kTProfile, {{10, 0, 100}});
258246
mHistogramQn->add<TProfile>("Event/profileC24", "; cent; c24", kTProfile, {{10, 0, 100}});
259-
<<<<<<< HEAD
260-
if (doQnSeparation) {
261-
=======
262247

263-
if (doQnSeparation) {
264-
>>>>>>> 79d4db6e4 (fixed as comments)
248+
if (doQnSeparation){
265249
for (int iqn(0); iqn < mumQnBins; ++iqn) {
266250
profilesC22.push_back(mHistogramQn->add<TProfile>(("Qn/profileC22_" + std::to_string(iqn)).c_str(), "; cent; c22", kTProfile, {{10, 0, 100}}));
267251
}
@@ -414,48 +398,9 @@ class FemtoDreamCollisionSelection
414398
mHistogramQn->fill(HIST("Event/centVsqn"), centrality, qn);
415399
mHistogramQn->fill(HIST("Event/centVsqnVsSpher"), centrality, qn, fSpher);
416400
mHistogramQn->fill(HIST("Event/qnBin"), qnBin);
417-
<<<<<<< HEAD
418-
if (qnBin >= 0 && qnBin < numQnBins) {
419-
switch (qnBin) {
420-
case 0:
421-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("0"), mult);
422-
break;
423-
case 1:
424-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("1"), mult);
425-
break;
426-
case 2:
427-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("2"), mult);
428-
break;
429-
case 3:
430-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("3"), mult);
431-
break;
432-
case 4:
433-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("4"), mult);
434-
break;
435-
case 5:
436-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("5"), mult);
437-
break;
438-
case 6:
439-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("6"), mult);
440-
break;
441-
case 7:
442-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("7"), mult);
443-
break;
444-
case 8:
445-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("8"), mult);
446-
break;
447-
case 9:
448-
mHistogramQn->fill(HIST("Qn/mult_") + HIST("9"), mult);
449-
break;
450-
default:
451-
return qnBin; // invalid qn bin
452-
}
453-
}
454-
=======
455401
if (qnBin >= 0 && qnBin < numQnBins) {
456402
std::get<std::shared_ptr<TH1>>(qnMults[qnBin])->Fill(mult);
457403
}
458-
>>>>>>> 79d4db6e4 (fixed as comments)
459404
}
460405

461406
return qnBin;
@@ -536,48 +481,9 @@ class FemtoDreamCollisionSelection
536481
TComplex negEtaQ = TComplex(negEtaRe, negEtaIm);
537482
TComplex negEtaQStar = TComplex::Conjugate(negEtaQ);
538483

539-
<<<<<<< HEAD
540-
mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
541-
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins) {
542-
switch (mQnBin) {
543-
case 0:
544-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("0"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
545-
break;
546-
case 1:
547-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("1"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
548-
break;
549-
case 2:
550-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("2"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
551-
break;
552-
case 3:
553-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("3"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
554-
break;
555-
case 4:
556-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("4"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
557-
break;
558-
case 5:
559-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("5"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
560-
break;
561-
case 6:
562-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("6"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
563-
break;
564-
case 7:
565-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("7"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
566-
break;
567-
case 8:
568-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("8"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
569-
break;
570-
case 9:
571-
mHistogramQn->get<TProfile>(HIST("Qn/profileC22_") + HIST("9"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
572-
break;
573-
default:
574-
return; // invalid qn bin
575-
}
576-
=======
577484
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));
580-
>>>>>>> 79d4db6e4 (fixed as comments)
485+
if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins){
486+
std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
581487
}
582488
return;
583489
}
@@ -594,25 +500,15 @@ class FemtoDreamCollisionSelection
594500
float mMinSphericity = 0.f;
595501
float mSphericityPtmin = 0.f;
596502
int mQnBin = -999;
597-
<<<<<<< HEAD
598503
HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output
504+
std::vector<HistPtr> qnMults; /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
505+
std::vector<HistPtr> profilesC22; /// Pofile Histograms of c22 per Qn bin
599506
TH2D* mReQthisEvt = nullptr; ///< For flow cumulant in an event
600507
TH2D* mImQthisEvt = nullptr; ///< For flow cumulant in an event
601508
TH2D* mReQ2thisEvt = nullptr; ///< For flow cumulant in an event
602509
TH2D* mImQ2thisEvt = nullptr; ///< For flow cumulant in an event
603510
TH2D* mMQthisEvt = nullptr; ///< For flow cumulant in an event
604511
TH2D* mMQWeightthisEvt = nullptr; ///< For flow cumulant in an event
605-
=======
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
615-
>>>>>>> 79d4db6e4 (fixed as comments)
616512
};
617513
} // namespace o2::analysis::femtoDream
618514

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx‎

Lines changed: 3 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -767,20 +767,13 @@ struct femtoDreamProducerTask {
767767

768768
// Pileup rejection in PbPb data
769769
if constexpr (analysePbPb) {
770-
<<<<<<< HEAD
771-
if (OptionEvtSpecialSelections.ConfIsUsePileUp &&
772-
!colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll,
773-
OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
774-
return;
775-
=======
776770
if (OptionEvtSpecialSelections.ConfIsUsePileUpPbPb &&
777771
!colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)) {
778772
return;
779773
}
780-
if (OptionEvtSpecialSelections.ConfIsUseOccupancy &&
781-
!colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
774+
if (OptionEvtSpecialSelections.ConfIsUseOccupancy &&
775+
!colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
782776
return;
783-
>>>>>>> 79d4db6e4 (fixed as comments)
784777
}
785778
}
786779

@@ -1150,56 +1143,6 @@ struct femtoDreamProducerTask {
11501143
myqn = colCuts.computeqnVec(col);
11511144
outputExtQnCollision(myqn, col.trackOccupancyInTimeRange());
11521145
}
1153-
1154-
<<<<<<< HEAD
1155-
const auto spher = colCuts.computeSphericity(col, tracks);
1156-
float mult = 0;
1157-
int multNtr = 0;
1158-
if (ConfIsRun3) {
1159-
if constexpr (useCentrality) {
1160-
if constexpr (analysePbPb) {
1161-
mult = col.centFT0C();
1162-
} else {
1163-
mult = col.centFT0M();
1164-
}
1165-
} else {
1166-
mult = 0;
1167-
}
1168-
multNtr = col.multNTracksPV();
1169-
} else {
1170-
mult = 1; // multiplicity percentile is know in Run 2
1171-
multNtr = col.multTracklets();
1172-
}
1173-
1174-
// check whether the basic event selection criteria are fulfilled
1175-
// that included checking if there is at least on usable track or V0
1176-
if (!colCuts.isSelectedCollision(col)) {
1177-
return;
1178-
}
1179-
// bool emptyCollision = false;
1180-
if (colCuts.isEmptyCollision(col, tracks, trackCuts)) {
1181-
return;
1182-
}
1183-
1184-
if (rctCut.requireRCTFlagChecker && !rctChecker(col)) {
1185-
return;
1186-
}
1187-
1188-
// Pileup rejection in PbPb data
1189-
if constexpr (analysePbPb) {
1190-
if (OptionEvtSpecialSelections.ConfIsUsePileUp &&
1191-
!colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll,
1192-
OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
1193-
return;
1194-
}
1195-
}
1196-
1197-
// Calculate and fill qn values
1198-
float myqn = colCuts.computeqnVec(col);
1199-
outputExtQnCollision(myqn, col.trackOccupancyInTimeRange());
1200-
1201-
=======
1202-
>>>>>>> 79d4db6e4 (fixed as comments)
12031146
// Calculate flow via cumulant
12041147
if (qnCal.ConfFlowCalculate) {
12051148
int qnBin = colCuts.myqnBin(mult, qnCal.ConfCentralityMax, qnCal.ConfQnBinSeparator, qnCal.ConfdoFillHisto, spher, myqn, qnCal.ConfNumQnBins, multNtr, qnCal.ConfCentBinWidth);
@@ -1264,15 +1207,9 @@ struct femtoDreamProducerTask {
12641207
auto tracksWithItsPid = soa::Attach<aod::FemtoFullTracks, aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaPi, aod::pidits::ITSNSigmaKa,
12651208
aod::pidits::ITSNSigmaPr, aod::pidits::ITSNSigmaDe, aod::pidits::ITSNSigmaTr, aod::pidits::ITSNSigmaHe>(tracks);
12661209
if (ConfUseItsPid.value) {
1267-
<<<<<<< HEAD
1268-
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
1269-
} else {
1270-
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
1271-
=======
12721210
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
12731211
} else {
12741212
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
1275-
>>>>>>> 79d4db6e4 (fixed as comments)
12761213
}
12771214
}
12781215
PROCESS_SWITCH(femtoDreamProducerTask, processData_CentPbPb,
@@ -1290,19 +1227,9 @@ struct femtoDreamProducerTask {
12901227
auto tracksWithItsPid = soa::Attach<aod::FemtoFullTracks, aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaPi, aod::pidits::ITSNSigmaKa,
12911228
aod::pidits::ITSNSigmaPr, aod::pidits::ITSNSigmaDe, aod::pidits::ITSNSigmaTr, aod::pidits::ITSNSigmaHe>(tracks);
12921229
if (ConfUseItsPid.value) {
1293-
<<<<<<< HEAD
1294-
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
1295-
} else {
1296-
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
1297-
}
1298-
1299-
if (qnCal.ConfQnSeparation) {
1300-
fillCollisionsFlow<false, true, true>(col, tracks);
1301-
=======
13021230
fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, true>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
13031231
} else {
1304-
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
1305-
>>>>>>> 79d4db6e4 (fixed as comments)
1232+
fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
13061233
}
13071234
}
13081235
PROCESS_SWITCH(femtoDreamProducerTask, processData_CentPbPb_qvec,
@@ -1349,11 +1276,7 @@ struct femtoDreamProducerTask {
13491276
// get magnetic field for run
13501277
initCCDB_Mag_Trig(col.bc_as<aod::BCsWithTimestamps>());
13511278
// fill the tables
1352-
<<<<<<< HEAD
1353-
fillCollisionsAndTracksAndV0AndCascade<true, false, true, true>(col, tracks, tracks, fullV0s, fullCascades);
1354-
=======
13551279
fillCollisionsAndTracksAndV0AndCascade<true, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
1356-
>>>>>>> 79d4db6e4 (fixed as comments)
13571280
}
13581281
PROCESS_SWITCH(femtoDreamProducerTask, processMC_CentPbPb, "Provide MC data with centrality information for PbPb collisions", false);
13591282
};

‎PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,13 +752,8 @@ struct femtoDreamPairTaskTrackTrack {
752752
case femtodreamcollision::kMultMultPercentile:
753753
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultMultPercentile);
754754
break;
755-
<<<<<<< HEAD
756-
case femtodreamcollision::kMultPercentileqn:
755+
case femtodreamcollision::kMultPercentileQn:
757756
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
758-
=======
759-
case femtodreamcollision::kMultPercentileQn:
760-
doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
761-
>>>>>>> 79d4db6e4 (fixed as comments)
762757
break;
763758
default:
764759
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";

0 commit comments

Comments
 (0)