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
2 changes: 1 addition & 1 deletion PWGLF/DataModel/LFStrangenessTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ namespace dautrack
{
//______________________________________________________
// Daughter track declarations for derived data analysis
DECLARE_SOA_COLUMN(DetectorMap, detectorMap, uint8_t); //! detector map for reference
DECLARE_SOA_COLUMN(DetectorMap, detectorMap, uint8_t); //! detector map for reference (see DetectorMapEnum)
DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
DECLARE_SOA_COLUMN(TPCClusters, tpcClusters, uint8_t); //! N TPC clusters
DECLARE_SOA_COLUMN(TPCCrossedRows, tpcCrossedRows, uint8_t); //! N TPC clusters
Expand Down
9 changes: 4 additions & 5 deletions PWGLF/TableProducer/cascademcfinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ struct cascademcfinder {
// For manual sliceBy
Preslice<aod::McParticle> perMcCollision = aod::mcparticle::mcCollisionId;

// declarative filtering for particles of interest
// pre-filter on PDG and on very broad rapidity window
Filter mcParticleFilter = nabs(o2::aod::mcparticle::y) < yPreFilter && (nabs(o2::aod::mcparticle::pdgCode) == 3312 || nabs(o2::aod::mcparticle::pdgCode) == 3334);

std::vector<int> casccollisionId;
std::vector<int> cascv0Index;
std::vector<int> cascbachelorIndex;
Expand Down Expand Up @@ -251,7 +247,7 @@ struct cascademcfinder {
return reconstructed;
}

void process(soa::Join<aod::McCollisions, aod::McCollsExtra> const& mcCollisions, LabeledTracks const& tracks, soa::Filtered<aod::McParticles> const& allMcParticles, LabeledFullV0s const& v0s)
void process(soa::Join<aod::McCollisions, aod::McCollsExtra> const& mcCollisions, LabeledTracks const& tracks, aod::McParticles const& allMcParticles, LabeledFullV0s const& v0s)
{
casccollisionId.clear();
cascbachelorIndex.clear();
Expand All @@ -275,6 +271,9 @@ struct cascademcfinder {
bool bachelorTPCITS = false;
bool reconstructed = false;
for (auto& mcParticle : mcParticles) {
if (fabs(mcParticle.y()) > yPreFilter)
continue; // non-declarative skip necessary

if (mcParticle.pdgCode() == 3312 && findXiMinus) {
reconstructed = ProcessCascade(mcParticle, tracks, v0s, bestCollisionIndex, positiveITS, negativeITS, bachelorITS, positiveTPC, negativeTPC, bachelorTPC, positiveTPCITS, negativeTPCITS, bachelorTPCITS);
if (fabs(mcParticle.y()) < 0.5) {
Expand Down
6 changes: 3 additions & 3 deletions PWGLF/TableProducer/lambdakzeromcfinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ using namespace ROOT::Math;
using LabeledTracks = soa::Join<aod::TracksIU, aod::TracksExtra, aod::McTrackLabels>;

struct lambdakzeromcfinder {
Produces<aod::V0s_001> v0;
Produces<aod::V0s> v0;
Produces<aod::McFullV0Labels> fullv0labels;

HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
Expand Down Expand Up @@ -404,7 +404,7 @@ struct lambdakzeromcfinder {
// V0 list established, populate
for (auto ic : sortedIndices) {
if (v0collisionId[ic] >= 0 || doUnassociatedV0s) {
v0(v0collisionId[ic], v0positiveIndex[ic], v0negativeIndex[ic]);
v0(v0collisionId[ic], v0positiveIndex[ic], v0negativeIndex[ic], 1); // type 1 : standard
fullv0labels(v0mcLabel[ic]);
}
}
Expand Down Expand Up @@ -476,7 +476,7 @@ struct lambdakzeromcfinder {
// V0 list established, populate
for (auto ic : sortedIndices) {
if (v0collisionId[ic] >= 0 || doUnassociatedV0s) {
v0(v0collisionId[ic], v0positiveIndex[ic], v0negativeIndex[ic]);
v0(v0collisionId[ic], v0positiveIndex[ic], v0negativeIndex[ic], 1);
fullv0labels(v0mcLabel[ic]);
}
}
Expand Down
14 changes: 7 additions & 7 deletions PWGLF/TableProducer/lambdakzeropid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ using std::array;

// Cores with references and TOF pid
using dauTracks = soa::Join<aod::DauTrackExtras, aod::DauTrackTPCPIDs>;
using V0FullCores = soa::Join<aod::V0Cores, aod::V0TOFs, aod::V0Extras, aod::V0CollRefs>;
using V0FullCores = soa::Join<aod::V0Cores, aod::V0Extras, aod::V0CollRefs, aod::V0TOFs, aod::V0TOFNSigmas>;

struct lambdakzeropid {
// TOF pid for strangeness (recalculated with topology)
Expand Down Expand Up @@ -418,12 +418,12 @@ struct lambdakzeropid {
float deltaTimePositiveK0ShortPi = -1e+6;
float deltaTimeNegativeK0ShortPi = -1e+6;

float nSigmaPositiveLambdaPi = -1e+6;
float nSigmaPositiveLambdaPr = -1e+6;
float nSigmaNegativeLambdaPi = -1e+6;
float nSigmaNegativeLambdaPr = -1e+6;
float nSigmaPositiveK0ShortPi = -1e+6;
float nSigmaNegativeK0ShortPi = -1e+6;
float nSigmaPositiveLambdaPi = -1e+3;
float nSigmaPositiveLambdaPr = -1e+3;
float nSigmaNegativeLambdaPi = -1e+3;
float nSigmaNegativeLambdaPr = -1e+3;
float nSigmaPositiveK0ShortPi = -1e+3;
float nSigmaNegativeK0ShortPi = -1e+3;

float velocityPositivePr = velocity(posTrack.getP(), o2::constants::physics::MassProton);
float velocityPositivePi = velocity(posTrack.getP(), o2::constants::physics::MassPionCharged);
Expand Down
Loading