Skip to content

Commit cde397e

Browse files
skundu692skundu692
committed
Merge remote-tracking branch 'upstream/master' into f1pnew2
2 parents c111df1 + 3e3a9af commit cde397e

38 files changed

+3240
-1055
lines changed

‎DPG/Tasks/AOTTrack/D0CalibTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ int codeSqrtScaling(float origValue, float sigma0, float sigma1, int clampMin, i
9595
template <typename T>
9696
uint8_t getCompressedDecayLength(T decLen)
9797
{
98-
return getCompressedUint8(decLen * hf_calib::toMicrometers, 0.1);
98+
return getCompressedUint8(decLen * hf_calib::toMicrometers, 10);
9999
}
100100

101101
/// It compresses the normalised decay length (0.5 precision)

‎PWGCF/DataModel/CorrelationsDerived.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ enum ParticleDecay {
140140
JPsiToEE,
141141
JPsiToMuMu,
142142
Generic2Prong,
143-
PhiToKK,
143+
PhiToKKPID1,
144+
PhiToKKPID2,
145+
PhiToKKPID3,
144146
K0stoPiPi,
145147
LambdatoPPi,
146148
AntiLambdatoPiP

‎PWGCF/DataModel/FemtoDerived.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ DECLARE_SOA_COLUMN(Kstar, kstar, float); //! Relative
243243
DECLARE_SOA_COLUMN(KT, kT, float); //! kT distribution of particle pairs
244244
DECLARE_SOA_COLUMN(MT, mT, float); //! Transverse mass distribution
245245
DECLARE_SOA_COLUMN(CharmM, charmM, float); //! Charm hadron mass
246+
DECLARE_SOA_COLUMN(CharmTrkM, charmtrkM, float); //! Charm hadron track mass
246247
DECLARE_SOA_COLUMN(CharmPt, charmPt, float); //! Transverse momentum of charm hadron for result task
247248
DECLARE_SOA_COLUMN(CharmEta, charmEta, float); //! Eta of charm hadron for result task
248249
DECLARE_SOA_COLUMN(CharmPhi, charmPhi, float); //! Phi of charm hadron for result task
@@ -327,6 +328,7 @@ DECLARE_SOA_TABLE(FDHfPairs, "AOD", "FDHFPAIRS", //! table to store results for
327328
fdhf::MultPercentile,
328329
fdhf::Charge,
329330
fdhf::PairSign,
331+
fdhf::CharmTrkM,
330332
fdhf::ProcessType,
331333
fdhf::FlagMc,
332334
fdhf::OriginMcRec);

‎PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,23 @@
2222
#ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
2323
#define PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
2424

25-
#include <iostream>
26-
#include <string>
27-
#include <vector>
28-
29-
#include <TDatabasePDG.h> // FIXME
30-
3125
#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
3226
#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
3327
#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
3428

3529
#include "Common/Core/RecoDecay.h"
30+
3631
#include "Framework/HistogramRegistry.h"
3732
#include "ReconstructionDataFormats/PID.h"
3833

34+
#include <TDatabasePDG.h> // FIXME
35+
36+
#include <iostream>
37+
#include <string>
38+
#include <vector>
39+
3940
using namespace o2::framework;
41+
using namespace o2::analysis::femtoDream::femtoDreamSelection;
4042

4143
namespace o2::analysis::femtoDream
4244
{
@@ -346,8 +348,8 @@ class FemtoDreamCascadeSelection
346348
}; ///< Helper information for the
347349
///< different selections
348350

349-
static constexpr int kNcutStages = 2;
350-
static constexpr std::string_view mCutStage[kNcutStages] = {"BeforeSel", "AfterSel"};
351+
// static constexpr int kNcutStages = 2;
352+
// static constexpr std::string_view mCutStage[kNcutStages] = {"BeforeSel", "AfterSel"};
351353
}; // namespace femtoDream
352354

353355
template <o2::aod::femtodreamparticle::ParticleType part, o2::aod::femtodreamparticle::ParticleType daugh, o2::aod::femtodreamparticle::ParticleType bach, typename cutContainerType>
@@ -663,6 +665,8 @@ void FemtoDreamCascadeSelection::fillQA(Col const& col, Casc const& casc, Track
663665
const float cpaCasc = casc.casccosPA(col.posX(), col.posY(), col.posZ());
664666
const float cpav0 = casc.v0cosPA(col.posX(), col.posY(), col.posZ());
665667
const float v0dcatopv = casc.dcav0topv(col.posX(), col.posY(), col.posZ());
668+
const float invMass = isCascOmega ? casc.mOmega() : casc.mXi();
669+
666670
if (mQAHistogramRegistry) {
667671
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hSign"), casc.sign());
668672
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hPt"), casc.pt());
@@ -674,7 +678,7 @@ void FemtoDreamCascadeSelection::fillQA(Col const& col, Casc const& casc, Track
674678
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hDecVtxX"), decVtx.at(0));
675679
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hDecVtxY"), decVtx.at(1));
676680
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hDecVtxZ"), decVtx.at(2));
677-
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hInvMass"), casc.mXi());
681+
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hInvMass"), invMass);
678682
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hV0DCADaugh"), casc.dcaV0daughters());
679683
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hV0CPA"), cpav0);
680684
mQAHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[part]) + HIST("/") + HIST(mCutStage[cutstage]) + HIST("/hV0TranRad"), casc.v0radius());

‎PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
#ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
1919
#define PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
2020

21-
#include <TMath.h>
22-
#include <string>
2321
#include "PWGCF/DataModel/FemtoDerived.h"
24-
#include "Framework/HistogramRegistry.h"
22+
2523
#include "CommonConstants/PhysicsConstants.h"
24+
#include "Framework/HistogramRegistry.h"
25+
26+
#include <TMath.h>
27+
28+
#include <string>
2629

2730
using namespace o2::framework;
2831

@@ -690,11 +693,13 @@ class FemtoDreamParticleHisto
690693
}
691694

692695
private:
693-
HistogramRegistry* mHistogramRegistry; ///< For QA output
694-
static constexpr o2::aod::femtodreamparticle::ParticleType mParticleType = particleType; ///< Type of the particle under analysis
695-
static constexpr int mFolderSuffixType = suffixType; ///< Counter for the folder suffix specified below
696-
static constexpr std::string_view mFolderSuffix[9] = {"", "_one", "_two", "_pos", "_neg", "_allSelected", "_allSelected_pos", "_allSelected_neg", "_bach"}; ///< Suffix for the folder name in case of analyses of pairs of the same kind (T-T, V-V, C-C)
697-
int mPDG = 0; ///< PDG code of the selected particle
696+
HistogramRegistry* mHistogramRegistry; ///< For QA output
697+
static constexpr o2::aod::femtodreamparticle::ParticleType mParticleType = particleType; ///< Type of the particle under analysis
698+
static constexpr int mFolderSuffixType = suffixType; ///< Counter for the folder suffix specified below
699+
static constexpr std::string_view mFolderSuffix[12] = {"", "_one", "_two", "_pos", "_neg",
700+
"_allSelected", "_allSelected_pos", "_allSelected_neg", "_bach",
701+
"_two_pos", "_two_neg", "_two_bach"}; ///< Suffix for the folder name in case of analyses of pairs of the same kind (T-T, V-V, C-C)
702+
int mPDG = 0; ///< PDG code of the selected particle
698703
};
699704
} // namespace o2::analysis::femtoDream
700705

‎PWGCF/FemtoDream/Core/femtoDreamSelection.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
#ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
1717
#define PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
1818

19-
#include <cmath>
20-
#include "Framework/HistogramRegistry.h"
2119
#include "PWGCF/DataModel/FemtoDerived.h"
2220

21+
#include "Framework/HistogramRegistry.h"
22+
23+
#include <cmath>
24+
2325
using namespace o2;
2426
using namespace o2::framework;
2527

@@ -36,6 +38,9 @@ enum SelectionType { kUpperLimit, ///< simple upper limit for the value, e.g.
3638
kEqual ///< values need to be equal, e.g. sign = 1
3739
};
3840

41+
static constexpr int kNcutStages = 2;
42+
static constexpr std::string_view mCutStage[kNcutStages] = {"BeforeSel", "AfterSel"};
43+
3944
} // namespace femtoDreamSelection
4045

4146
/// Simple class taking care of individual selections

‎PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@
1717
#ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
1818
#define PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
1919

20-
#include <string>
21-
#include <vector>
22-
#include <cmath>
23-
#include <iostream>
24-
2520
#include "PWGCF/DataModel/FemtoDerived.h"
26-
#include "Common/DataModel/TrackSelectionTables.h"
27-
#include "Common/DataModel/PIDResponse.h"
28-
#include "Common/DataModel/PIDResponseITS.h"
21+
#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
22+
2923
#include "Common/Core/TrackSelection.h"
3024
#include "Common/Core/TrackSelectionDefaults.h"
31-
#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
32-
#include "ReconstructionDataFormats/PID.h"
25+
#include "Common/DataModel/PIDResponse.h"
26+
#include "Common/DataModel/PIDResponseITS.h"
27+
#include "Common/DataModel/TrackSelectionTables.h"
28+
3329
#include "Framework/HistogramRegistry.h"
30+
#include "ReconstructionDataFormats/PID.h"
31+
32+
#include <cmath>
33+
#include <iostream>
34+
#include <string>
35+
#include <vector>
3436

3537
using namespace o2::framework;
38+
using namespace o2::analysis::femtoDream::femtoDreamSelection;
3639

3740
namespace o2::analysis::femtoDream
3841
{
@@ -301,8 +304,6 @@ class FemtoDreamTrackSelection : public FemtoDreamObjectSelection<float, femtoDr
301304
"Maximal DCA_z (cm)",
302305
"Minimal DCA (cm)",
303306
"Maximal PID (nSigma)"}; ///< Helper information for the different selections
304-
static constexpr int kNcutStages = 2;
305-
static constexpr std::string_view mCutStage[kNcutStages] = {"BeforeSel", "AfterSel"};
306307
}; // namespace femtoDream
307308

308309
template <o2::aod::femtodreamparticle::ParticleType part, o2::aod::femtodreamparticle::TrackType tracktype, typename cutContainerType>

‎PWGCF/FemtoDream/Core/femtoDreamUtils.h‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
#ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
1717
#define PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
1818

19-
#include <vector>
20-
#include <string>
21-
#include "CommonConstants/PhysicsConstants.h"
2219
#include "PWGCF/DataModel/FemtoDerived.h"
2320

21+
#include "CommonConstants/PhysicsConstants.h"
22+
23+
#include <string>
24+
#include <vector>
25+
2426
namespace o2::analysis::femtoDream
2527
{
2628

@@ -67,8 +69,12 @@ inline float getMass(int pdgCode)
6769
case o2::constants::physics::Pdg::kHelium3:
6870
mass = o2::constants::physics::MassHelium3;
6971
break;
72+
// case o2::constants::physics::Pdg::kOmegaMinus:
73+
case kOmegaMinus:
74+
mass = o2::constants::physics::MassOmegaMinus;
75+
break;
7076
default:
71-
LOG(fatal) << "PDG code is not suppored";
77+
LOG(fatal) << "PDG code is not supported";
7278
}
7379
return mass;
7480
}

0 commit comments

Comments
 (0)