Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions PWGLF/DataModel/LFhe3HadronTables.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -12,7 +12,7 @@
///
/// \file LFhe3HadronTables.h
/// \brief Slim tables for he3Hadron
///

Check failure on line 15 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
Expand All @@ -32,11 +32,11 @@
DECLARE_SOA_COLUMN(EtaHad, etaHad, float);
DECLARE_SOA_COLUMN(PhiHad, phiHad, float);

DECLARE_SOA_COLUMN(DCAxyHe3, dcaxyHe3, float);

Check failure on line 35 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DCAzHe3, dcazHe3, float);

Check failure on line 36 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DCAxyHad, dcaxyHad, float);

Check failure on line 37 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DCAzHad, dcazHad, float);

Check failure on line 38 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DCApair, dcapair, float);

Check failure on line 39 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_COLUMN(SignalTPCHe3, signalTPCHe3, float);
DECLARE_SOA_COLUMN(InnerParamTPCHe3, innerParamTPCHe3, float);
Expand All @@ -44,13 +44,18 @@
DECLARE_SOA_COLUMN(InnerParamTPCHad, innerParamTPCHad, float);
DECLARE_SOA_COLUMN(NClsTPCHe3, nClsTPCHe3, uint8_t);
DECLARE_SOA_COLUMN(NSigmaTPCHe3, nSigmaTPCHe3, float);
DECLARE_SOA_COLUMN(NSigmaTPCHad, nSigmaTOFHad, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadPi, nSigmaTPCHadPi, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadKa, nSigmaTPCHadKa, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadPr, nSigmaTPCHadPr, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadPi, nSigmaTOFHadPi, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadKa, nSigmaTOFHadKa, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadPr, nSigmaTOFHadPr, float);
DECLARE_SOA_COLUMN(Chi2TPCHe3, chi2TPCHe3, float);
DECLARE_SOA_COLUMN(Chi2TPCHad, chi2TPCHad, float);
DECLARE_SOA_COLUMN(MassTOFHe3, massTOFHe3, float);
DECLARE_SOA_COLUMN(MassTOFHad, massTOFHad, float);
DECLARE_SOA_COLUMN(PIDtrkHe3, pidTrkHe3, uint32_t);

Check failure on line 57 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(PIDtrkHad, pidTrkHad, uint32_t);

Check failure on line 58 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TrackIDHe3, trackIDHe3, int);
DECLARE_SOA_COLUMN(TrackIDHad, trackIDHad, int);

Expand All @@ -75,7 +80,7 @@
DECLARE_SOA_COLUMN(CollisionId, collisionId, int64_t);
DECLARE_SOA_COLUMN(ZVertex, zVertex, float);
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, uint16_t);
DECLARE_SOA_COLUMN(CentralityFT0C, centFT0C, float);

Check failure on line 83 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(MultiplicityFT0C, multiplicityFT0C, float);

/* Flags: 0 - both primary,
Expand Down Expand Up @@ -105,7 +110,12 @@
he3HadronTablesNS::InnerParamTPCHad,
he3HadronTablesNS::NClsTPCHe3,
he3HadronTablesNS::NSigmaTPCHe3,
he3HadronTablesNS::NSigmaTPCHad,
he3HadronTablesNS::NSigmaTPCHadPi,
he3HadronTablesNS::NSigmaTPCHadKa,
he3HadronTablesNS::NSigmaTPCHadPr,
he3HadronTablesNS::NSigmaTOFHadPi,
he3HadronTablesNS::NSigmaTOFHadKa,
he3HadronTablesNS::NSigmaTOFHadPr,
he3HadronTablesNS::Chi2TPCHe3,
he3HadronTablesNS::Chi2TPCHad,
he3HadronTablesNS::MassTOFHe3,
Expand Down
25 changes: 20 additions & 5 deletions PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ using McIter = aod::McParticles::iterator;
using CollBracket = o2::math_utils::Bracket<int>;
using CollisionsFull = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0As, aod::CentFT0Cs, aod::FT0Mults>;
using CollisionsFullMC = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0As, aod::CentFT0Cs, aod::FT0Mults>;
using TrackCandidates = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::TOFSignal, aod::TOFEvTime>;
using TrackCandidatesMC = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::TOFSignal, aod::TOFEvTime, aod::McTrackLabels>;
using TrackCandidates = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::TOFSignal, aod::TOFEvTime>;
using TrackCandidatesMC = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::TOFSignal, aod::TOFEvTime, aod::McTrackLabels>;

namespace
{
Expand Down Expand Up @@ -147,7 +147,12 @@ struct He3HadCandidate {
float chi2TPCHe3 = -10.f;
float chi2TPCHad = -10.f;
float nSigmaHe3 = -10.f;
float nSigmaHad = -10.f;
float nSigmaTPCHadPi = -10.f;
float nSigmaTPCHadKa = -10.f;
float nSigmaTPCHadPr = -10.f;
float nSigmaTOFHadPi = -10.f;
float nSigmaTOFHadKa = -10.f;
float nSigmaTOFHadPr = -10.f;
uint32_t pidtrkHe3 = 0xFFFFF; // PID in tracking
uint32_t pidtrkHad = 0xFFFFF;
float massTOFHe3 = -10;
Expand Down Expand Up @@ -637,7 +642,12 @@ struct he3HadronFemto {

he3Hadcand.nTPCClustersHe3 = trackHe3.tpcNClsFound();
he3Hadcand.nSigmaHe3 = computeNSigmaHe3(trackHe3);
he3Hadcand.nSigmaHad = computeTPCNSigmaHadron(trackHad);
he3Hadcand.nSigmaTPCHadPi = trackHad.tpcNSigmaPi();
he3Hadcand.nSigmaTPCHadKa = trackHad.tpcNSigmaKa();
he3Hadcand.nSigmaTPCHadPr = trackHad.tpcNSigmaPr();
he3Hadcand.nSigmaTOFHadPi = trackHad.tofNSigmaPi();
he3Hadcand.nSigmaTOFHadKa = trackHad.tofNSigmaKa();
he3Hadcand.nSigmaTOFHadPr = trackHad.tofNSigmaPr();

he3Hadcand.chi2TPCHe3 = trackHe3.tpcChi2NCl();
he3Hadcand.chi2TPCHad = trackHad.tpcChi2NCl();
Expand Down Expand Up @@ -790,7 +800,12 @@ struct he3HadronFemto {
he3Hadcand.momHadTPC,
he3Hadcand.nTPCClustersHe3,
he3Hadcand.nSigmaHe3,
he3Hadcand.nSigmaHad,
he3Hadcand.nSigmaTPCHadPi,
he3Hadcand.nSigmaTPCHadKa,
he3Hadcand.nSigmaTPCHadPr,
he3Hadcand.nSigmaTOFHadPi,
he3Hadcand.nSigmaTOFHadKa,
he3Hadcand.nSigmaTOFHadPr,
he3Hadcand.chi2TPCHe3,
he3Hadcand.chi2TPCHad,
he3Hadcand.massTOFHe3,
Expand Down
Loading