Skip to content

Commit 186bdb0

Browse files
amatyjaamatyja
committed
Clear comments added
1 parent da1001b commit 186bdb0

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

‎PWGUD/Core/SGSelector.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ struct SelectionResult {
3838
namespace o2::aod::sgselector
3939
{
4040
enum TrueGap : int {
41-
NoGap = -1,
42-
SingleGapA = 0,
43-
SingleGapC = 1,
44-
DoubleGap = 2,
45-
NoUpc = 3,
46-
TrkOutOfRange = 4,
47-
BadDoubleGap = 5
41+
NoGap = -1, // no gap due to change of threshold(s) in any of FV0, FT0A, ZNA, FT0C, ZNC
42+
SingleGapA = 0, // initially single gap at A side event
43+
SingleGapC = 1, // initially single gap at C side event
44+
DoubleGap = 2, // initially double gap event
45+
NoUpc = 3, // initially no UPC event with default thresholds (FT0A=150, FT0C=50)
46+
TrkOutOfRange = 4, // to many tracks (>100 default)
47+
BadDoubleGap = 5 // unknows status of double gap check with changed thresholds
4848
};
4949
} // namespace o2::aod::sgselector
5050

‎PWGUD/Tasks/upcTauTau13topo.cxx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float);
8484
DECLARE_SOA_COLUMN(TrkPx, trkPx, float[4]);
8585
DECLARE_SOA_COLUMN(TrkPy, trkPy, float[4]);
8686
DECLARE_SOA_COLUMN(TrkPz, trkPz, float[4]);
87-
// DECLARE_SOA_COLUMN(TrkSign, trkSign, int[4]);
87+
DECLARE_SOA_COLUMN(TrkSign, trkSign, int8_t[4]);
8888
DECLARE_SOA_COLUMN(TrkDCAxy, trkDCAxy, float[4]);
8989
DECLARE_SOA_COLUMN(TrkDCAz, trkDCAz, float[4]);
9090
DECLARE_SOA_COLUMN(TrkTPCcr, trkTPCcr, int[4]);
@@ -95,14 +95,12 @@ DECLARE_SOA_COLUMN(TrkITScl, trkITScl, int[4]);
9595

9696
DECLARE_SOA_COLUMN(TrkTPCsignal, trkTPCsignal, float[4]);
9797
DECLARE_SOA_COLUMN(TrkTPCnSigmaEl, trkTPCnSigmaEl, float[4]);
98-
// DECLARE_SOA_COLUMN(TrkTPCnSigmaMu, trkTPCnSigmaMu, float[4]);
9998
DECLARE_SOA_COLUMN(TrkTPCnSigmaPi, trkTPCnSigmaPi, float[4]);
10099
DECLARE_SOA_COLUMN(TrkTPCnSigmaKa, trkTPCnSigmaKa, float[4]);
101100
DECLARE_SOA_COLUMN(TrkTPCnSigmaPr, trkTPCnSigmaPr, float[4]);
102101
DECLARE_SOA_COLUMN(TrkTPCnSigmaMu, trkTPCnSigmaMu, float[4]);
103102
DECLARE_SOA_COLUMN(TrkTOFbeta, trkTOFbeta, float[4]);
104103
DECLARE_SOA_COLUMN(TrkTOFnSigmaEl, trkTOFnSigmaEl, float[4]);
105-
// DECLARE_SOA_COLUMN(TrkTOFnSigmaMu, trkTOFnSigmaMu, float[4]);
106104
DECLARE_SOA_COLUMN(TrkTOFnSigmaPi, trkTOFnSigmaPi, float[4]);
107105
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[4]);
108106
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[4]);
@@ -123,7 +121,7 @@ DECLARE_SOA_TABLE(TauFourTracks, "AOD", "TAUFOURTRACK",
123121
tau_tree::TotalFT0AmplitudeA, tau_tree::TotalFT0AmplitudeC, tau_tree::TotalFV0AmplitudeA,
124122
// tau_tree::TimeFT0A, tau_tree::TimeFT0C, tau_tree::TimeFV0A,
125123
tau_tree::TrkPx, tau_tree::TrkPy, tau_tree::TrkPz,
126-
// tau_tree::TrkSign,
124+
tau_tree::TrkSign,
127125
tau_tree::TrkDCAxy, tau_tree::TrkDCAz,
128126
tau_tree::TrkTPCcr,
129127
tau_tree::TrkTPCfind, tau_tree::TrkTPCchi2, tau_tree::TrkITSchi2, tau_tree::TrkITScl,
@@ -3347,7 +3345,9 @@ struct TauTau13topo {
33473345

33483346
// loop over MC particles
33493347
for (const auto& mcParticle : mcParticles) {
3350-
// LOGF(info, "<processSimpleMCSG> mcParticle pdg %d", mcParticle.pdgCode());
3348+
if (verbose) {
3349+
LOGF(info, "<processSimpleMCSG> mcParticle pdg %d, gen %d, prim %d", mcParticle.pdgCode(), mcParticle.producedByGenerator(), mcParticle.isPhysicalPrimary() );
3350+
}
33513351
// primaries
33523352
// if (mcParticle.isPhysicalPrimary()) {
33533353
// countPrim++;
@@ -3358,7 +3358,7 @@ struct TauTau13topo {
33583358
if (mcParticle.producedByGenerator()) {
33593359
countGen++;
33603360
if (mcParticle.isPhysicalPrimary()) {
3361-
countBoth++;
3361+
countBoth++;
33623362
// if (mcParticle.pdgCode() != 22 && std::abs(mcParticle.pdgCode()) != 12 && std::abs(mcParticle.pdgCode()) != 14 && std::abs(mcParticle.pdgCode()) != 16 && mcParticle.pdgCode() != 130 && mcParticle.pdgCode() != 111) {
33633363
if (mcParticle.pdgCode() != kGamma && std::abs(mcParticle.pdgCode()) != kNuE && std::abs(mcParticle.pdgCode()) != kNuMu && std::abs(mcParticle.pdgCode()) != kNuTau && mcParticle.pdgCode() != kK0Long && mcParticle.pdgCode() != kPi0) {
33643364
countCharged++;
@@ -3376,7 +3376,7 @@ struct TauTau13topo {
33763376
} // mother is tau
33773377
} // mc particle has mother
33783378
} // veto neutral particles
3379-
} // physicsl primary
3379+
} // physics primary
33803380
} // generator produced by
33813381

33823382
//
@@ -3549,7 +3549,8 @@ struct TauTau13topo {
35493549
{
35503550
// LOGF(info, "<tautau13topo_MC> Per DF: UDMcParticles size %d, UDMcCollisions size %d, FullMcUdCollisions size %d", mcParts.size(), mcCollisions.size(), collisionsFull.size());
35513551
// LOGF(info, "<tautau13topo_MC> Per DF: UDMcParticles size %d, UDMcCollisions size %d, FullMcUdCollisions size %d", mcParts.size(), mcCollisions.size(), collisions.size());
3552-
3552+
LOGF(info, "<tautau13topo_MCSG> UDMcCollision size %d, SmallGroups FullMcUdCollisions size %d, UDtracks %d, UDMcParticles %d", mcCollision.size(), collisions.size(), tracks.size(), mcParticles.size());
3553+
35533554
// loop over generated collisions
35543555
// for (const auto &mcCollision : mcCollisions) {
35553556
// LOGF(info, "<tautau13topo_MC> Per mcCollision not sliced: UDMcParticles size %d, FullMcUdCollisions size %d", mcParts.size(), collisionsFull.size());
@@ -5089,7 +5090,7 @@ struct TauTau13topo {
50895090
//
50905091
int counterTmp = 0;
50915092
float px[4], py[4], pz[4];
5092-
// int sign[4];
5093+
int8_t sign[4];
50935094
float dcaZ[4];
50945095
float dcaXY[4];
50955096

@@ -5105,8 +5106,6 @@ struct TauTau13topo {
51055106
float nSigmaPr[4];
51065107
float nSigmaKa[4];
51075108
float nSigmaMu[4];
5108-
// float chi2TPC[4];
5109-
// float chi2ITS[4];
51105109
float chi2TOF[4] = {-1., -1., -1., -1.};
51115110
int nclTPCcrossedRows[4];
51125111
int nclTPCfind[4];
@@ -5123,7 +5122,7 @@ struct TauTau13topo {
51235122
px[counterTmp] = trk.px();
51245123
py[counterTmp] = trk.py();
51255124
pz[counterTmp] = trk.pz();
5126-
// sign[counterTmp] = trk.sign();
5125+
sign[counterTmp] = trk.sign();
51275126
dcaZ[counterTmp] = trk.dcaZ();
51285127
dcaXY[counterTmp] = trk.dcaXY();
51295128

@@ -5141,8 +5140,6 @@ struct TauTau13topo {
51415140
tmpTofNsigmaPr[counterTmp] = trk.tofNSigmaPr();
51425141
tmpTofNsigmaMu[counterTmp] = trk.tofNSigmaMu();
51435142

5144-
// chi2TPC[counterTmp] = trk.tpcChi2NCl();
5145-
// chi2ITS[counterTmp] = trk.itsChi2NCl();
51465143
if (trk.hasTOF())
51475144
chi2TOF[counterTmp] = trk.tofChi2();
51485145
// nclTPCfind[counterTmp] = trk.tpcNClsFindable();
@@ -5174,7 +5171,7 @@ struct TauTau13topo {
51745171
dgcand.tfb(), dgcand.itsROFb(), dgcand.sbp(), dgcand.zVtxFT0vPV(), dgcand.vtxITSTPC(),
51755172
dgcand.totalFT0AmplitudeA(), dgcand.totalFT0AmplitudeC(), dgcand.totalFV0AmplitudeA(),
51765173
// dgcand.timeFT0A(), dgcand.timeFT0C(), dgcand.timeFV0A(),
5177-
px, py, pz, // sign,
5174+
px, py, pz, sign,
51785175
dcaXY, dcaZ,
51795176
nclTPCcrossedRows, nclTPCfind, nclTPCchi2, trkITSchi2, trkITScl,
51805177
tmpDedx, nSigmaEl, nSigmaPi, nSigmaKa, nSigmaPr, nSigmaMu,

0 commit comments

Comments
 (0)