Skip to content

Commit 348c4fd

Browse files
iarseneiarsene
authored
Merge pull request #37 from alibuild/alibot-cleanup-18673
Please consider the following formatting changes to #18673
2 parents 25becd9 + 337e666 commit 348c4fd

2 files changed

Lines changed: 28 additions & 26 deletions

File tree

‎PWGDQ/Core/VarManager.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ class VarManager : public TObject
156156

157157
enum PairCandidateType {
158158
// TODO: need to agree on a scheme to incorporate all various hypotheses (e.g. e - mu, jpsi - K+, Jpsi - pipi,...)
159-
kDecayToEE = 0, // e.g. J/psi -> e+ e-
160-
kDecayToMuMu, // e.g. J/psi -> mu+ mu-
161-
kDecayToPiPi, // decay channel to pi+ pi-
162-
kDecayToKchKch, // decay channel to K+ K-
163-
kDecayToPrAPr, // decay channel to p+ p-
159+
kDecayToEE = 0, // e.g. J/psi -> e+ e-
160+
kDecayToMuMu, // e.g. J/psi -> mu+ mu-
161+
kDecayToPiPi, // decay channel to pi+ pi-
162+
kDecayToKchKch, // decay channel to K+ K-
163+
kDecayToPrAPr, // decay channel to p+ p-
164164
kElectronMuon, // e.g. Electron - muon correlations
165165
kBcToThreeMuons, // e.g. Bc -> mu+ mu- mu+
166166
kBtoJpsiEEK, // e.g. B+ -> e+ e- K+
@@ -3843,7 +3843,7 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
38433843
m1 = o2::constants::physics::MassPionCharged;
38443844
m2 = o2::constants::physics::MassPionCharged;
38453845
}
3846-
3846+
38473847
if constexpr (pairType == kDecayToKchKch) {
38483848
m1 = o2::constants::physics::MassKaonCharged;
38493849
m2 = o2::constants::physics::MassKaonCharged;

‎PWGDQ/Tasks/tableReader_withAssoc.h‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2581,7 +2581,7 @@ struct AnalysisSameEventPairing {
25812581
fAmbiguousPairs[iPair] = static_cast<uint32_t>(1) << icut;
25822582
}
25832583
}
2584-
2584+
25852585
if (sign1 * sign2 < 0) {
25862586
if (fConfigNRotations.value == 1) {
25872587
VarManager::FillPairRotation<TPairType, TTrackFillMap>(t1, t2, fConfigNRotations.value);
@@ -3250,13 +3250,15 @@ struct AnalysisSameEventPairing {
32503250

32513251
void processBarrelOnlyDiKaons(MyEventsVtxCovSelected const& events,
32523252
o2::soa::Join<o2::aod::ReducedTracksAssoc, o2::aod::BarrelTrackCuts, o2::aod::Prefilter> const& barrelAssocs,
3253-
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) {
3253+
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
3254+
{
32543255
runSameEventPairing<true, VarManager::kDecayToKchKch, gkEventFillMapWithCov, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
32553256
}
32563257

32573258
void processBarrelOnlyDiProtons(MyEventsVtxCovSelected const& events,
32583259
o2::soa::Join<o2::aod::ReducedTracksAssoc, o2::aod::BarrelTrackCuts, o2::aod::Prefilter> const& barrelAssocs,
3259-
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) {
3260+
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
3261+
{
32603262
runSameEventPairing<true, VarManager::kDecayToPrAPr, gkEventFillMapWithCov, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
32613263
}
32623264

@@ -4900,12 +4902,12 @@ struct AnalysisDileptonTrackTrack {
49004902
uint32_t fNDoubletCuts = 0; // number of doublet track cuts
49014903
std::vector<TString> fDoubletCutNames;
49024904
std::vector<std::pair<uint32_t, uint32_t>> fDoubletCutMasks;
4903-
4905+
49044906
AnalysisCompositeCut fDileptonCut{};
49054907
bool fApplyDileptonCut = false;
49064908
std::vector<TString> fQuadrupletCutNames;
49074909
std::vector<AnalysisCompositeCut> fQuadrupletCuts;
4908-
uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts
4910+
uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts
49094911

49104912
o2::framework::Service<o2::ccdb::BasicCCDBManager> fCCDB{};
49114913

@@ -4967,7 +4969,7 @@ struct AnalysisDileptonTrackTrack {
49674969
}
49684970
}
49694971
std::unique_ptr<TObjArray> trackSelectionsUpstream(tempCutsStr.Tokenize(","));
4970-
4972+
49714973
// interpret the list of track cuts and build the filter mask for each of the two prongs
49724974
TString trackCutsStr = fConfigTrackCuts.value;
49734975
std::unique_ptr<TObjArray> doubletTrackSelections(trackCutsStr.Tokenize(","));
@@ -4988,7 +4990,7 @@ struct AnalysisDileptonTrackTrack {
49884990
}
49894991
uint32_t mask2 = (static_cast<uint32_t>(1) << trackSelectionsUpstream->IndexOf(obj));
49904992

4991-
fTrackCutMask1 |= mask1;
4993+
fTrackCutMask1 |= mask1;
49924994
fTrackCutMask2 |= mask2;
49934995
fDoubletCutMasks.push_back(std::make_pair(mask1, mask2));
49944996
fDoubletCutNames.push_back(cutName);
@@ -5008,7 +5010,7 @@ struct AnalysisDileptonTrackTrack {
50085010
fApplyDileptonCut = true;
50095011
fDileptonCut = *o2::aod::dqcuts::GetCompositeCut(configDileptonCutNamesStr.Data());
50105012
}
5011-
5013+
50125014
TString configQuadruletCutNamesStr = fConfigQuadrupletCuts.value;
50135015
std::unique_ptr<TObjArray> objArray(configQuadruletCutNamesStr.Tokenize(","));
50145016
for (Int_t icut = 0; icut < objArray->GetEntries(); ++icut) {
@@ -5038,7 +5040,7 @@ struct AnalysisDileptonTrackTrack {
50385040
if (fNQuadrupletCuts == 0) {
50395041
DefineHistograms(fHistMan, Form("QuadrupletSEPM_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
50405042
if (fDoubletCutMasks[idcut].first != fDoubletCutMasks[idcut].second) {
5041-
DefineHistograms(fHistMan, Form("QuadrupletSEMP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
5043+
DefineHistograms(fHistMan, Form("QuadrupletSEMP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
50425044
}
50435045
DefineHistograms(fHistMan, Form("QuadrupletSEPP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
50445046
DefineHistograms(fHistMan, Form("QuadrupletSEMM_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
@@ -5087,7 +5089,7 @@ struct AnalysisDileptonTrackTrack {
50875089
continue;
50885090
}
50895091
VarManager::FillTrack<fgDileptonFillMap>(dilepton, fValuesQuadruplet);
5090-
5092+
50915093
// apply the dilepton cut
50925094
if (fApplyDileptonCut && !fDileptonCut.IsSelected(fValuesQuadruplet)) {
50935095
continue;
@@ -5161,34 +5163,34 @@ struct AnalysisDileptonTrackTrack {
51615163
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
51625164
}
51635165
} else {
5164-
if ((track1.sign() < 0) && (track2.sign() > 0)) {
5166+
if ((track1.sign() < 0) && (track2.sign() > 0)) {
51655167
fHistMan->FillHistClass(Form("QuadrupletSEMP_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
5166-
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
5168+
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
51675169
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
51685170
}
51695171
}
5170-
if ((track1.sign() > 0) && (track2.sign() > 0)) {
5172+
if ((track1.sign() > 0) && (track2.sign() > 0)) {
51715173
fHistMan->FillHistClass(Form("QuadrupletSEPP_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
5172-
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
5174+
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
51735175
fHistMan->FillHistClass(Form("QuadrupletSEMM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
51745176
}
51755177
}
5176-
} // end of loop over quadruplet cuts
5178+
} // end of loop over quadruplet cuts
51775179
// in case there are no quadruplet cuts specified by the user
51785180
if (isSameTrackCut) {
5179-
if (track1.sign() * track2.sign() < 0) {
5181+
if (track1.sign() * track2.sign() < 0) {
51805182
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
51815183
}
51825184
} else {
5183-
if ((track1.sign() < 0) && (track2.sign() > 0)) {
5185+
if ((track1.sign() < 0) && (track2.sign() > 0)) {
51845186
fHistMan->FillHistClass(Form("QuadrupletSEMP_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
5185-
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
5187+
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
51865188
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
51875189
}
51885190
}
5189-
if ((track1.sign() > 0) && (track2.sign() > 0)) {
5191+
if ((track1.sign() > 0) && (track2.sign() > 0)) {
51905192
fHistMan->FillHistClass(Form("QuadrupletSEPP_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
5191-
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
5193+
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
51925194
fHistMan->FillHistClass(Form("QuadrupletSEMM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
51935195
}
51945196
} // end of loop over doublet cuts

0 commit comments

Comments
 (0)