Skip to content

[PWGLF] reduced no. of columns in DD table #17401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prottayCMT wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −24
Open

[PWGLF] reduced no. of columns in DD table #17401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb7681a
reduced no. of columns in DD table
Aug 10, 2026
b477a14
updated
Aug 10, 2026
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
16 changes: 8 additions & 8 deletions PWGLF/DataModel/LFCKSSpinalignmentTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
DECLARE_SOA_COLUMN(Cent, cent, float);
DECLARE_SOA_COLUMN(Posz, posz, float);
DECLARE_SOA_COLUMN(PsiFT0C, psiFT0C, float);
DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float);
DECLARE_SOA_COLUMN(PsiTPC, psiTPC, float);
// DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float);
// DECLARE_SOA_COLUMN(PsiTPC, psiTPC, float);
} // namespace kshortpionevent

DECLARE_SOA_TABLE(KShortpionEvents, "AOD", "KSHORTPIONEVENT",
o2::soa::Index<>,
kshortpionevent::Cent,
kshortpionevent::Posz,
kshortpionevent::PsiFT0C,
kshortpionevent::PsiFT0A,
kshortpionevent::PsiTPC);
kshortpionevent::PsiFT0C);
// kshortpionevent::PsiFT0A,
// kshortpionevent::PsiTPC);

using KShortpionEvent = KShortpionEvents::iterator;

Expand All @@ -48,13 +48,13 @@
// ------------------------------------------------------------
namespace kshorttrack
{
DECLARE_SOA_INDEX_COLUMN(KShortpionEvent, kshortpionevent);

Check failure on line 51 in PWGLF/DataModel/LFCKSSpinalignmentTables.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(V0Cospa, v0Cospa, float);
DECLARE_SOA_COLUMN(V0Radius, v0Radius, float);
DECLARE_SOA_COLUMN(DcaPositive, dcaPositive, float);
DECLARE_SOA_COLUMN(DcaNegative, dcaNegative, float);
DECLARE_SOA_COLUMN(DcaBetweenDaughter, dcaBetweenDaughter, float);
// DECLARE_SOA_COLUMN(DcaBetweenDaughter, dcaBetweenDaughter, float);
// DECLARE_SOA_COLUMN(V0Lifetime, v0Lifetime, float);

DECLARE_SOA_COLUMN(KShortPx, kShortPx, float);
Expand All @@ -73,8 +73,8 @@
kshorttrack::V0Radius,
kshorttrack::DcaPositive,
kshorttrack::DcaNegative,
kshorttrack::DcaBetweenDaughter,
// kshorttrack::V0Lifetime,
// kshorttrack::DcaBetweenDaughter,
// kshorttrack::V0Lifetime,
kshorttrack::KShortPx,
kshorttrack::KShortPy,
kshorttrack::KShortPz,
Expand All @@ -89,7 +89,7 @@
// ------------------------------------------------------------
namespace piontrack
{
DECLARE_SOA_INDEX_COLUMN(KShortpionEvent, kshortpionevent);

Check failure on line 92 in PWGLF/DataModel/LFCKSSpinalignmentTables.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(PionBachPx, pionBachPx, float);
DECLARE_SOA_COLUMN(PionBachPy, pionBachPy, float);
Expand Down
22 changes: 11 additions & 11 deletions PWGLF/TableProducer/Resonances/cksspinalignment.cxx
View file
Open in desktop
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/TableProducer/Resonances/cksspinalignment.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -222,8 +222,8 @@
float radius;
float dcaPositive;
float dcaNegative;
float dcaBetweenDaughters;
// float lifetime;
// float dcaBetweenDaughters;
// float lifetime;
int64_t positiveIndex;
int64_t negativeIndex;
};
Expand Down Expand Up @@ -361,8 +361,8 @@
const int occupancy = collision.trackOccupancyInTimeRange();

const float psiFT0C = collision.psiFT0C();
const float psiFT0A = collision.psiFT0A();
const float psiTPC = collision.psiTPC();
// const float psiFT0A = collision.psiFT0A();
// const float psiTPC = collision.psiTPC();

histos.fill(HIST("hEvtSelInfo"), 0.5);

Expand Down Expand Up @@ -462,8 +462,8 @@
static_cast<float>(v0.v0radius()),
static_cast<float>(std::abs(v0.dcapostopv())),
static_cast<float>(std::abs(v0.dcanegtopv())),
static_cast<float>(std::abs(v0.dcaV0daughters())),
// lifetime,
// static_cast<float>(std::abs(v0.dcaV0daughters())),
// lifetime,
posId,
negId});

Expand All @@ -483,9 +483,9 @@

kshortpionEvent(centrality,
vz,
psiFT0C,
psiFT0A,
psiTPC);
psiFT0C);
// psiFT0A,
// psiTPC);

const int64_t indexEvent = kshortpionEvent.lastIndex();

Expand All @@ -495,8 +495,8 @@
k0s.radius,
k0s.dcaPositive,
k0s.dcaNegative,
k0s.dcaBetweenDaughters,
// k0s.lifetime,
// k0s.dcaBetweenDaughters,
// k0s.lifetime,
k0s.px,
k0s.py,
k0s.pz,
Expand Down
10 changes: 5 additions & 5 deletions PWGLF/Tasks/Resonances/cksspinalignder.cxx
View file
Open in desktop
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/Tasks/Resonances/cksspinalignder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -57,7 +57,7 @@
Configurable<float> radiusMin{"radiusMin", 1.2f, "Minimum V0 radius"};
Configurable<float> radiusMax{"radiusMax", 100.0f, "Maximum V0 radius"};
Configurable<float> dcaPion{"dcaPion", 0.1f, "Minimum V0 daughter DCA to PV"};
Configurable<float> dcaDaughters{"dcaDaughters", 1.0f, "Maximum DCA between V0 daughters"};
// Configurable<float> dcaDaughters{"dcaDaughters", 1.0f, "Maximum DCA between V0 daughters"};
Configurable<float> k0sPtMin{"k0sPtMin", 0.0f, "Minimum K0s pT"};
Configurable<float> k0sPtMax{"k0sPtMax", 10.0f, "Maximum K0s pT"};
Configurable<float> k0sEtaMax{"k0sEtaMax", 0.8f, "Maximum K0s eta"};
Expand Down Expand Up @@ -193,11 +193,11 @@
candidate.v0Radius() > radiusMax.value) {
return false;
}

/*
if (candidate.dcaBetweenDaughter() > dcaDaughters.value) {
return false;
}

*/
if (candidate.dcaPositive() < dcaPion.value ||
candidate.dcaNegative() < dcaPion.value) {
return false;
Expand Down Expand Up @@ -230,9 +230,9 @@
case 0:
return collision.psiFT0C();
case 1:
return collision.psiFT0A();
return collision.psiFT0C();
case 2:
return collision.psiTPC();
return collision.psiFT0C();
default:
LOGF(warn, "epChoice=%d is invalid. Using FT0C.", epChoice.value);
return collision.psiFT0C();
Expand Down
Loading