Skip to content

Commit b3c4e5c

Browse files
romainschotterromainschotter
committed
Remove commented lines about expression columns and extended tables
1 parent 2546104 commit b3c4e5c

File tree

8 files changed

+3
-137
lines changed

8 files changed

+3
-137
lines changed

‎PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ struct ThreeParticleCorrelations {
6868
Filter mcCollZvtx = nabs(aod::mccollision::posZ) < zvtxMax;
6969
Filter evSelect = aod::evsel::sel8 == true;
7070

71-
// V0 filters
72-
// Filter v0Pt = aod::v0data::pt > v0PtMin&& aod::v0data::pt < v0PtMax;
73-
// Filter v0Eta = nabs(aod::v0data::eta) < v0EtaMax;
74-
7571
// Track filters
7672
Filter trackPt = aod::track::pt > trackPtMin&& aod::track::pt < trackPtMax;
7773
Filter trackEta = nabs(aod::track::eta) < trackEtaMax;
@@ -83,7 +79,6 @@ struct ThreeParticleCorrelations {
8379
// Table aliases - Data
8480
using MyFilteredCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::CentFT0Cs, aod::EvSels>>;
8581
using MyFilteredCollision = MyFilteredCollisions::iterator;
86-
using MyFilteredV0s = aod::V0Datas;
8782
using MyFilteredTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection,
8883
aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr,
8984
aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>>;
@@ -116,7 +111,7 @@ struct ThreeParticleCorrelations {
116111

117112
BinningType collBinning{{confCentBins, confZvtxBins}, true};
118113
BinningTypeMC collBinningMC{{confCentBins, confZvtxBins}, true};
119-
Pair<MyFilteredCollisions, MyFilteredV0s, MyFilteredTracks, BinningType> pairData{collBinning, 5, -1, &cache};
114+
Pair<MyFilteredCollisions, aod::V0Datas, MyFilteredTracks, BinningType> pairData{collBinning, 5, -1, &cache};
120115
SameKindPair<MyFilteredMCGenCollisions, MyFilteredMCParticles, BinningTypeMC> pairMC{collBinningMC, 5, -1, &cache};
121116

122117
// Process configurables
@@ -281,7 +276,7 @@ struct ThreeParticleCorrelations {
281276

282277
//==========================================================================================================================================================================================================================================================================
283278

284-
void processSame(MyFilteredCollision const& collision, MyFilteredV0s const& v0s, MyFilteredTracks const& tracks, aod::BCsWithTimestamps const&)
279+
void processSame(MyFilteredCollision const& collision, aod::V0Datas const& v0s, MyFilteredTracks const& tracks, aod::BCsWithTimestamps const&)
285280
{
286281

287282
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
@@ -389,7 +384,7 @@ struct ThreeParticleCorrelations {
389384
// End of the Same-Event correlations
390385
}
391386

392-
void processMixed(MyFilteredCollisions const&, MyFilteredV0s const&, MyFilteredTracks const&, aod::BCsWithTimestamps const&)
387+
void processMixed(MyFilteredCollisions const&, aod::V0Datas const&, MyFilteredTracks const&, aod::BCsWithTimestamps const&)
393388
{
394389

395390
// Start of the Mixed-Event correlations

‎PWGEM/PhotonMeson/TableProducer/createPCM.cxx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -554,15 +554,8 @@ struct createPCM {
554554
PROCESS_SWITCH(createPCM, processTrkCollAsso, "create V0s with track-to-collision associator", false);
555555
};
556556

557-
// // Extends the v0data table with expression columns
558-
// struct v0Initializer {
559-
// Spawns<aod::V0Cores> v0cores;
560-
// void init(InitContext const&) {}
561-
// };
562-
563557
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
564558
{
565559
return WorkflowSpec{
566560
adaptAnalysisTask<createPCM>(cfgc, TaskName{"v0-finder"})};
567-
// adaptAnalysisTask<v0Initializer>(cfgc, TaskName{"v0-initializer"})};
568561
}

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -618,39 +618,6 @@ DECLARE_SOA_COLUMN(GeneratedK0Short, generatedK0Short, std::vector<uint32_t>);
618618
DECLARE_SOA_COLUMN(GeneratedLambda, generatedLambda, std::vector<uint32_t>); //! Lambda binned generated data
619619
DECLARE_SOA_COLUMN(GeneratedAntiLambda, generatedAntiLambda, std::vector<uint32_t>); //! AntiLambda binned generated data
620620

621-
//______________________________________________________
622-
// EXPRESSION COLUMNS
623-
// DECLARE_SOA_EXPRESSION_COLUMN(Px, px, //! V0 px
624-
// float, 1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg);
625-
// DECLARE_SOA_EXPRESSION_COLUMN(Py, py, //! V0 py
626-
// float, 1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg);
627-
// DECLARE_SOA_EXPRESSION_COLUMN(Pz, pz, //! V0 pz
628-
// float, 1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg);
629-
// DECLARE_SOA_EXPRESSION_COLUMN(Pt, pt, float, //! Transverse momentum in GeV/c
630-
// nsqrt((1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) *
631-
// (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) +
632-
// (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg)));
633-
// DECLARE_SOA_EXPRESSION_COLUMN(P, p, float, //! Total momentum in GeV/c
634-
// nsqrt((1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) *
635-
// (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) +
636-
// (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) +
637-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg) * (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)));
638-
// DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi in the range [0, 2pi)
639-
// o2::constants::math::PI + natan2(-1.0f * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg), -1.0f * (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg)));
640-
// DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //! Pseudorapidity, conditionally defined to avoid FPEs
641-
// ifnode((nsqrt((1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) * (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) +
642-
// (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) +
643-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg) * (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)) -
644-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)) < static_cast<float>(1e-7),
645-
// ifnode((1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg) < 0.f, -100.f, 100.f),
646-
// 0.5f * nlog((nsqrt((1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) * (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) +
647-
// (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) +
648-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg) * (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)) +
649-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)) /
650-
// (nsqrt((1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) * (1.f * aod::v0data::pxpos + 1.f * aod::v0data::pxneg) +
651-
// (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) * (1.f * aod::v0data::pypos + 1.f * aod::v0data::pyneg) +
652-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg) * (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)) -
653-
// (1.f * aod::v0data::pzpos + 1.f * aod::v0data::pzneg)))));
654621

655622
//______________________________________________________
656623
// DYNAMIC COLUMNS
@@ -1397,41 +1364,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(Eta, eta, //! Cascade pseudorapidity
13971364
[](float px, float py, float pz) -> float { return RecoDecay::eta(std::array{px, py, pz}); });
13981365
} // namespace cascdata
13991366

1400-
//______________________________________________________
1401-
// EXPRESSION COLUMNS FOR TRACASCCORES
1402-
namespace cascdataext
1403-
{
1404-
// DECLARE_SOA_EXPRESSION_COLUMN(PxLambda, pxlambda, //!
1405-
// float, 1.f * aod::cascdata::pxpos + 1.f * aod::cascdata::pxneg);
1406-
// DECLARE_SOA_EXPRESSION_COLUMN(PyLambda, pylambda, //!
1407-
// float, 1.f * aod::cascdata::pypos + 1.f * aod::cascdata::pyneg);
1408-
// DECLARE_SOA_EXPRESSION_COLUMN(PzLambda, pzlambda, //!
1409-
// float, 1.f * aod::cascdata::pzpos + 1.f * aod::cascdata::pzneg);
1410-
// DECLARE_SOA_EXPRESSION_COLUMN(Pt, pt, float, //! Transverse momentum in GeV/c
1411-
// nsqrt(aod::cascdata::px* aod::cascdata::px +
1412-
// aod::cascdata::py * aod::cascdata::py));
1413-
// DECLARE_SOA_EXPRESSION_COLUMN(P, p, float, //! Total momentum in GeV/c
1414-
// nsqrt(aod::cascdata::px* aod::cascdata::px +
1415-
// aod::cascdata::py * aod::cascdata::py +
1416-
// aod::cascdata::pz * aod::cascdata::pz));
1417-
// DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi in the range [0, 2pi)
1418-
// o2::constants::math::PI + natan2(-1.0f * aod::cascdata::py, -1.0f * aod::cascdata::px));
1419-
// DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //! Pseudorapidity, conditionally defined to avoid FPEs
1420-
// ifnode((nsqrt(aod::cascdata::px * aod::cascdata::px +
1421-
// aod::cascdata::py * aod::cascdata::py +
1422-
// aod::cascdata::pz * aod::cascdata::pz) -
1423-
// aod::cascdata::pz) < static_cast<float>(1e-7),
1424-
// ifnode(aod::cascdata::pz < 0.f, -100.f, 100.f),
1425-
// 0.5f * nlog((nsqrt(aod::cascdata::px * aod::cascdata::px +
1426-
// aod::cascdata::py * aod::cascdata::py +
1427-
// aod::cascdata::pz * aod::cascdata::pz) +
1428-
// aod::cascdata::pz) /
1429-
// (nsqrt(aod::cascdata::px * aod::cascdata::px +
1430-
// aod::cascdata::py * aod::cascdata::py +
1431-
// aod::cascdata::pz * aod::cascdata::pz) -
1432-
// aod::cascdata::pz))));
1433-
} // namespace cascdataext
1434-
14351367
//______________________________________________________
14361368
// Cascade data model:
14371369
// --- standard, KF version and tracked version
@@ -1652,20 +1584,6 @@ DECLARE_SOA_TABLE(TraCascCovs, "AOD", "TRACASCCOVS", //!
16521584
cascdata::MomentumCovMat<cascdata::CovMat>,
16531585
o2::soa::Marker<2>);
16541586

1655-
// extended table with expression columns that can be used as arguments of dynamic columns
1656-
// DECLARE_SOA_EXTENDED_TABLE_USER(CascCores, StoredCascCores, "CascDATAEXT", //!
1657-
// cascdataext::PxLambda, cascdataext::PyLambda, cascdataext::PzLambda, cascdataext::Pt, cascdataext::P, cascdataext::Eta, cascdataext::Phi);
1658-
1659-
// extended table with expression columns that can be used as arguments of dynamic columns
1660-
// DECLARE_SOA_EXTENDED_TABLE_USER(KFCascCores, StoredKFCascCores, "KFCascDATAEXT", //!
1661-
// cascdataext::PxLambda, cascdataext::PyLambda, cascdataext::PzLambda,
1662-
// cascdataext::Pt, cascdataext::P, cascdataext::Eta, cascdataext::Phi);
1663-
1664-
// extended table with expression columns that can be used as arguments of dynamic columns
1665-
// DECLARE_SOA_EXTENDED_TABLE_USER(TraCascCores, StoredTraCascCores, "TraCascDATAEXT", //!
1666-
// cascdataext::PxLambda, cascdataext::PyLambda, cascdataext::PzLambda,
1667-
// cascdataext::Pt, cascdataext::P, cascdataext::Eta, cascdataext::Phi);
1668-
16691587
using CascCores = StoredCascCores;
16701588
using KFCascCores = StoredKFCascCores;
16711589
using TraCascCores = StoredTraCascCores;

‎PWGLF/TableProducer/Strangeness/cascadebuilder.cxx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,14 +2388,6 @@ struct cascadePreselector {
23882388
//*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*
23892389
};
23902390

2391-
/// Extends the cascdata table with expression columns
2392-
// struct cascadeInitializer {
2393-
// Spawns<aod::CascCores> cascdataext;
2394-
// Spawns<aod::KFCascCores> kfcascdataext;
2395-
// Spawns<aod::TraCascCores> tracascdataext;
2396-
// void init(InitContext const&) {}
2397-
// };
2398-
23992391
struct cascadeLinkBuilder {
24002392
Produces<aod::CascDataLink> cascdataLink;
24012393

@@ -2482,7 +2474,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
24822474
return WorkflowSpec{
24832475
adaptAnalysisTask<cascadeBuilder>(cfgc),
24842476
adaptAnalysisTask<cascadePreselector>(cfgc),
2485-
// adaptAnalysisTask<cascadeInitializer>(cfgc),
24862477
adaptAnalysisTask<cascadeLinkBuilder>(cfgc),
24872478
adaptAnalysisTask<kfcascadeLinkBuilder>(cfgc),
24882479
adaptAnalysisTask<tracascadeLinkBuilder>(cfgc)};

‎PWGLF/TableProducer/Strangeness/cascadefinder.cxx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -430,17 +430,10 @@ struct cascadefinderQA {
430430
}
431431
};
432432

433-
/// Extends the cascdata table with expression columns
434-
// struct cascadeinitializer {
435-
// Spawns<aod::CascCores> cascdataext;
436-
// void init(InitContext const&) {}
437-
// };
438-
439433
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
440434
{
441435
return WorkflowSpec{
442436
adaptAnalysisTask<cascadeprefilter>(cfgc, TaskName{"lf-cascadeprefilter"}),
443437
adaptAnalysisTask<cascadefinder>(cfgc, TaskName{"lf-cascadefinder"}),
444438
adaptAnalysisTask<cascadefinderQA>(cfgc, TaskName{"lf-cascadefinderQA"})};
445-
// adaptAnalysisTask<cascadeinitializer>(cfgc, TaskName{"lf-cascadeinitializer"})};
446439
}

‎PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,18 +1808,11 @@ struct lambdakzeroV0DataLinkBuilder {
18081808
PROCESS_SWITCH(lambdakzeroV0DataLinkBuilder, processFindable, "process findable V0s", false);
18091809
};
18101810

1811-
// Extends the v0data table with expression columns
1812-
// struct lambdakzeroInitializer {
1813-
// Spawns<aod::V0Cores> v0cores;
1814-
// Spawns<aod::V0fCCores> v0fccores;
1815-
// void init(InitContext const&) {}
1816-
// };
18171811

18181812
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
18191813
{
18201814
return WorkflowSpec{
18211815
adaptAnalysisTask<lambdakzeroBuilder>(cfgc),
18221816
adaptAnalysisTask<lambdakzeroPreselector>(cfgc),
18231817
adaptAnalysisTask<lambdakzeroV0DataLinkBuilder>(cfgc)};
1824-
// adaptAnalysisTask<lambdakzeroInitializer>(cfgc)};
18251818
}

‎PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,17 +429,10 @@ struct lambdakzerofinderQa {
429429
PROCESS_SWITCH(lambdakzerofinderQa, processRun2, "Process Run 2 data", false);
430430
};
431431

432-
/// Extends the v0data table with expression columns
433-
// struct lambdakzeroinitializer {
434-
// Spawns<aod::V0Cores> v0cores;
435-
// void init(InitContext const&) {}
436-
// };
437-
438432
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
439433
{
440434
return WorkflowSpec{
441435
adaptAnalysisTask<lambdakzeroprefilter>(cfgc, TaskName{"lf-lambdakzeroprefilter"}),
442436
adaptAnalysisTask<lambdakzerofinder>(cfgc, TaskName{"lf-lambdakzerofinder"}),
443437
adaptAnalysisTask<lambdakzerofinderQa>(cfgc, TaskName{"lf-lambdakzerofinderQA"})};
444-
// adaptAnalysisTask<lambdakzeroinitializer>(cfgc, TaskName{"lf-lambdakzeroinitializer"})};
445438
}

‎PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,18 +2495,8 @@ struct StrangenessBuilder {
24952495
PROCESS_SWITCH(StrangenessBuilder, processMonteCarloRun2WithPID, "process monte carlo (Run 2)", false);
24962496
};
24972497

2498-
// Extends the v0data table with expression columns
2499-
// struct strangenessbuilderInitializer {
2500-
// Spawns<aod::V0Cores> v0cores;
2501-
// Spawns<aod::CascCores> cascdataext;
2502-
// Spawns<aod::KFCascCores> kfcascdataext;
2503-
// Spawns<aod::TraCascCores> tracascdataext;
2504-
// void init(InitContext const&) {}
2505-
// };
2506-
25072498
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
25082499
{
25092500
return WorkflowSpec{
25102501
adaptAnalysisTask<StrangenessBuilder>(cfgc)};
2511-
// adaptAnalysisTask<strangenessbuilderInitializer>(cfgc)};
25122502
}

0 commit comments

Comments
 (0)