Skip to content

Commit 74a1725

Browse files
committed
Please consider the following formatting changes
1 parent 573ccd4 commit 74a1725

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

PWGDQ/Core/VarManager.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3304,35 +3304,36 @@ void VarManager::FillTrackCollisionMC(T1 const& track, T2 const& MotherTrack, C
33043304
}
33053305

33063306
template <int candidateType, typename T1>
3307-
void VarManager::FillTrackCollisionMC(T1 const& track, const std::array<double, 3>& collPos, float massHyp, float* values){
3307+
void VarManager::FillTrackCollisionMC(T1 const& track, const std::array<double, 3>& collPos, float massHyp, float* values)
3308+
{
33083309

3309-
if (!values) {
3310+
if (!values) {
33103311
values = fgValues;
33113312
}
33123313

33133314
float m = o2::constants::physics::MassJPsi;
3314-
if(massHyp) m = massHyp;
3315+
if (massHyp)
3316+
m = massHyp;
33153317

33163318
// displaced vertex is computed with decay product (track) and vertex collPos
3317-
values[kMCVertexingLxy] = (collPos[0]-track.vx()) * (collPos[0]-track.vx()) +
3318-
(collPos[1]-track.vy()) * (collPos[1]-track.vy());
3319-
values[kMCVertexingLz] = (collPos[2]-track.vz()) * (collPos[2]-track.vz());
3319+
values[kMCVertexingLxy] = (collPos[0] - track.vx()) * (collPos[0] - track.vx()) +
3320+
(collPos[1] - track.vy()) * (collPos[1] - track.vy());
3321+
values[kMCVertexingLz] = (collPos[2] - track.vz()) * (collPos[2] - track.vz());
33203322
values[kMCVertexingLxyz] = values[kMCVertexingLxy] + values[kMCVertexingLz];
33213323
values[kMCVertexingLxy] = std::sqrt(values[kMCVertexingLxy]);
33223324
values[kMCVertexingLz] = std::sqrt(values[kMCVertexingLz]);
33233325
values[kMCVertexingLxyz] = std::sqrt(values[kMCVertexingLxyz]);
3324-
values[kMCVertexingTauz] = (collPos[2]-track.vz()) * m / (TMath::Abs(track.pz()) * o2::constants::physics::LightSpeedCm2NS);
3326+
values[kMCVertexingTauz] = (collPos[2] - track.vz()) * m / (TMath::Abs(track.pz()) * o2::constants::physics::LightSpeedCm2NS);
33253327
values[kMCVertexingTauxy] = values[kMCVertexingLxy] * m / (track.pt() * o2::constants::physics::LightSpeedCm2NS);
33263328

3327-
values[kMCVertexingLzProjected] = ((track.vz()-collPos[2]) * track.pz()) / TMath::Abs(track.pz());
3328-
values[kMCVertexingLxyProjected] = (((track.vx()-collPos[0]) * track.px()) + ((track.vy()-collPos[1]) * track.py())) / TMath::Abs(track.pt());
3329-
values[kMCVertexingLxyzProjected] = (((track.vx()-collPos[0]) * track.px()) + ((track.vy()-collPos[1]) * track.py()) + ((track.vz()-collPos[2]) * track.pz())) / track.p();
3329+
values[kMCVertexingLzProjected] = ((track.vz() - collPos[2]) * track.pz()) / TMath::Abs(track.pz());
3330+
values[kMCVertexingLxyProjected] = (((track.vx() - collPos[0]) * track.px()) + ((track.vy() - collPos[1]) * track.py())) / TMath::Abs(track.pt());
3331+
values[kMCVertexingLxyzProjected] = (((track.vx() - collPos[0]) * track.px()) + ((track.vy() - collPos[1]) * track.py()) + ((track.vz() - collPos[2]) * track.pz())) / track.p();
33303332
values[kMCVertexingTauxyProjected] = values[kMCVertexingLxyProjected] * m / (track.pt());
33313333
values[kMCVertexingTauzProjected] = values[kMCVertexingLzProjected] * m / TMath::Abs(track.pz());
33323334
values[kMCVertexingTauxyzProjected] = values[kMCVertexingLxyzProjected] * m / (track.p());
33333335
}
33343336

3335-
33363337
template <int pairType, typename T, typename T1>
33373338
void VarManager::FillEnergyCorrelatorsMC(T const& track, T1 const& t1, float* values, float Translow, float Transhigh)
33383339
{

PWGDQ/Tasks/dqEfficiency_withAssoc.cxx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include <Framework/BinningPolicy.h>
4040
#include <Framework/Configurable.h>
4141
#include <Framework/InitContext.h>
42-
#include <Framework/runDataProcessing.h>
4342
#include <Framework/O2DatabasePDGPlugin.h>
43+
#include <Framework/runDataProcessing.h>
4444

4545
#include <THashList.h>
4646
#include <TList.h>
@@ -2279,16 +2279,16 @@ struct AnalysisSameEventPairing {
22792279
// cout << " Signal matched!" << endl;
22802280
mcDecision |= (static_cast<uint32_t>(1) << isig);
22812281
VarManager::FillPairMC<TPairType>(t1_raw, t2_raw);
2282-
// check if t1_raw and t2_raw have same mother to compute decay length related variables
2283-
if(t1_raw.has_mothers() && t2_raw.has_mothers()){
2284-
auto motherMCParticle_t1 = t1_raw.template mothers_first_as<ReducedMCTracks>();
2285-
auto motherMCParticle_t2 = t2_raw.template mothers_first_as<ReducedMCTracks>();
2286-
if(motherMCParticle_t1 == motherMCParticle_t2){
2287-
auto mcEvent = mcEvents.rawIteratorAt(motherMCParticle_t1.reducedMCeventId());
2288-
std::array<double, 3> collVtxPos = {mcEvent.mcPosX(), mcEvent.mcPosY(), mcEvent.mcPosZ()};
2289-
VarManager::FillTrackCollisionMC<TPairType>(motherMCParticle_t1,collVtxPos,pdgDB->Mass(motherMCParticle_t1.pdgCode()));
2290-
}
2291-
}
2282+
// check if t1_raw and t2_raw have same mother to compute decay length related variables
2283+
if (t1_raw.has_mothers() && t2_raw.has_mothers()) {
2284+
auto motherMCParticle_t1 = t1_raw.template mothers_first_as<ReducedMCTracks>();
2285+
auto motherMCParticle_t2 = t2_raw.template mothers_first_as<ReducedMCTracks>();
2286+
if (motherMCParticle_t1 == motherMCParticle_t2) {
2287+
auto mcEvent = mcEvents.rawIteratorAt(motherMCParticle_t1.reducedMCeventId());
2288+
std::array<double, 3> collVtxPos = {mcEvent.mcPosX(), mcEvent.mcPosY(), mcEvent.mcPosZ()};
2289+
VarManager::FillTrackCollisionMC<TPairType>(motherMCParticle_t1, collVtxPos, pdgDB->Mass(motherMCParticle_t1.pdgCode()));
2290+
}
2291+
}
22922292
// cout << " Filled VarManager for the pair." << endl;
22932293
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues);
22942294
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s", sig->GetName()), VarManager::fgValues);

0 commit comments

Comments
 (0)