Skip to content

Please consider the following formatting changes to #7478 #4

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

Merged
nepeivodaRS merged 1 commit into from
Aug 28, 2024
Merged

Please consider the following formatting changes to #7478 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace o2::aod

namespace stracolls
{
DECLARE_SOA_COLUMN(IsUPC, isUPC, bool); //! is event upc-like
DECLARE_SOA_COLUMN(IsUPC, isUPC, bool); //! is event upc-like
}

//______________________________________________________
Expand Down Expand Up @@ -94,7 +94,7 @@ DECLARE_SOA_TABLE(StraFT0CQVsEv, "AOD", "STRAFT0CQVSEv", //! events used to comp
DECLARE_SOA_TABLE(StraStamps, "AOD", "STRASTAMPS", //! information for ID-ing mag field if needed
bc::RunNumber, timestamp::Timestamp);
DECLARE_SOA_TABLE(StraUpcSels, "AOD", "STRAUPCSELS", //! information for UPC analysis
udcollision::TotalFV0AmplitudeA,
udcollision::TotalFV0AmplitudeA,
udcollision::TotalFT0AmplitudeA, udcollision::TotalFT0AmplitudeC,
udzdc::EnergyCommonZNA, udzdc::EnergyCommonZNC,
udcollision::TotalFDDAmplitudeA, udcollision::TotalFDDAmplitudeC,
Expand Down
6 changes: 3 additions & 3 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,9 +841,9 @@ struct strangederivedbuilder {
auto udCollision = udCollisions.sliceBy(udCollisionsPerCollision, collision.globalIndex());
if (udCollision.size() == 1) {
for (auto& udColl : udCollision) {
strangeUpcSels(udColl.totalFV0AmplitudeA(), udColl.totalFT0AmplitudeA(), udColl.totalFT0AmplitudeC(),
udColl.energyCommonZNA(), udColl.energyCommonZNC(),
udColl.totalFDDAmplitudeA(), udColl.totalFDDAmplitudeC(),
strangeUpcSels(udColl.totalFV0AmplitudeA(), udColl.totalFT0AmplitudeA(), udColl.totalFT0AmplitudeC(),
udColl.energyCommonZNA(), udColl.energyCommonZNC(),
udColl.totalFDDAmplitudeA(), udColl.totalFDDAmplitudeC(),
udColl.gapSide(), 1.);
}
} else { // in principle, udCollision.size() should be 0 in this case
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/Utils/upcStrangeness.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ enum selectionsCombined : int { selV0CosPA = 0,
selTOFDeltaTNegativePionLambdaXi,
selTOFDeltaTNegativePionLambdaOmega,
selTOFDeltaTBachPionXi,
selTOFDeltaTBachKaonOmega,
selTOFDeltaTBachKaonOmega,
selBachEta,
selLambdaMassWin,
selCount,
Expand All @@ -129,7 +129,7 @@ std::bitset<selNum> maskKinematicV0;
std::bitset<selNum> maskKinematicCasc;

std::bitset<selNum> maskTrackPropertiesV0;
std::bitset<selNum> maskTrackPropertiesCasc;
std::bitset<selNum> maskTrackPropertiesCasc;

std::bitset<selNum> maskK0ShortSpecific;
std::bitset<selNum> maskLambdaSpecific;
Expand Down
90 changes: 54 additions & 36 deletions PWGUD/Tasks/upcStrangeness.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct upcStrangeness {
Configurable<float> FT0Acut{"FT0Acut", 200., "FT0A threshold"};
Configurable<float> FT0Ccut{"FT0Ccut", 100., "FT0C threshold"};
Configurable<float> ZDCcut{"ZDCcut", 10., "ZDC threshold"};
//Configurable<float> gapSel{"gapSel", 2, "Gap selection"};
// Configurable<float> gapSel{"gapSel", 2, "Gap selection"};
} upcCuts;

// Track quality
Expand Down Expand Up @@ -220,39 +220,61 @@ struct upcStrangeness {
{
// initialise bit masks
int selTopoV0[] = {selV0CosPA, selDCANegToPV, selDCAPosToPV, selDCAV0Dau, selV0Radius, selV0RadiusMax};
for (int sel : selTopoV0) { maskTopologicalV0.set(sel);}
for (int sel : selTopoV0) {
maskTopologicalV0.set(sel);
}

int selTopoCasc[] = {selCascCosPA, selDCACascDau, selCascRadius, selCascRadiusMax, selBachToPV, selMesonToPV, selBaryonToPV, selDCAV0ToPV,
selV0CosPA, selDCAV0Dau, selV0Radius, selV0RadiusMax, selLambdaMassWin};
for (int sel : selTopoCasc) { maskTopologicalCasc.set(sel);}
for (int sel : selTopoCasc) {
maskTopologicalCasc.set(sel);
}

if (doBachelorBaryonCut)
maskTopologicalCasc.set(selBachBaryon);

int selKinematicV0[] = {selPosEta, selNegEta};
for (int sel : selKinematicV0) { maskKinematicV0.set(sel);}
for (int sel : selKinematicV0) {
maskKinematicV0.set(sel);
}

int selKinematicCasc[] = {selPosEta, selNegEta, selBachEta};
for (int sel : selKinematicCasc) { maskKinematicCasc.set(sel);}
for (int sel : selKinematicCasc) {
maskKinematicCasc.set(sel);
}

// K0s
int selK0ShortSpecific[] = {selK0ShortRapidity, selK0ShortCTau, selK0ShortArmenteros, selConsiderK0Short};
for (int sel : selK0ShortSpecific) { maskK0ShortSpecific.set(sel);}
for (int sel : selK0ShortSpecific) {
maskK0ShortSpecific.set(sel);
}
// Lambda
int selLambdaSpecific[] = {selLambdaRapidity, selLambdaCTau, selConsiderLambda};
for (int sel : selLambdaSpecific) { maskLambdaSpecific.set(sel);}
for (int sel : selLambdaSpecific) {
maskLambdaSpecific.set(sel);
}
int selAntiLambdaSpecific[] = {selLambdaRapidity, selLambdaCTau, selConsiderAntiLambda};
for (int sel : selAntiLambdaSpecific) { maskAntiLambdaSpecific.set(sel);}
for (int sel : selAntiLambdaSpecific) {
maskAntiLambdaSpecific.set(sel);
}
// Xi
int selXiSpecific[] = {selXiRapidity, selXiCTau, selRejCompXi, selMassWinXi, selConsiderXi};
for (int sel : selXiSpecific) { maskXiSpecific.set(sel);}
for (int sel : selXiSpecific) {
maskXiSpecific.set(sel);
}
int selAntiXiSpecific[] = {selXiRapidity, selXiCTau, selRejCompXi, selMassWinXi, selConsiderAntiXi};
for (int sel : selAntiXiSpecific) { maskAntiXiSpecific.set(sel);}
for (int sel : selAntiXiSpecific) {
maskAntiXiSpecific.set(sel);
}
// Omega
int selOmegaSpecific[] = {selOmegaRapidity, selOmegaCTau, selRejCompOmega, selMassWinOmega, selConsiderOmega};
for (int sel : selOmegaSpecific) { maskOmegaSpecific.set(sel);}
for (int sel : selOmegaSpecific) {
maskOmegaSpecific.set(sel);
}
int selAntiOmegaSpecific[] = {selOmegaRapidity, selOmegaCTau, selRejCompOmega, selMassWinOmega, selConsiderAntiOmega};
for (int sel : selAntiOmegaSpecific) { maskAntiOmegaSpecific.set(sel);}
for (int sel : selAntiOmegaSpecific) {
maskAntiOmegaSpecific.set(sel);
}

// ask for specific TPC/TOF PID selections of V0 tracks
// positive track
Expand All @@ -276,7 +298,7 @@ struct upcStrangeness {
// TOF PID
if (PIDConfigurations.TofPidNsigmaCutK0Pi < 1e+5) { // safeguard for no cut
maskK0ShortSpecific.set(selTOFNSigmaPositivePionK0Short);
maskK0ShortSpecific.set(selTOFDeltaTPositivePionK0Short);
maskK0ShortSpecific.set(selTOFDeltaTPositivePionK0Short);
}
if (PIDConfigurations.TofPidNsigmaCutLaPr < 1e+5) { // safeguard for no cut
maskLambdaSpecific.set(selTOFNSigmaPositiveProtonLambda);
Expand Down Expand Up @@ -396,14 +418,14 @@ struct upcStrangeness {
}

// Primary particle selection, central to analysis
maskSelectionK0Short = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskK0ShortSpecific | (std::bitset<selNum>(1) << selPhysPrimK0Short);
maskSelectionLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskLambdaSpecific | (std::bitset<selNum>(1) << selPhysPrimLambda);
maskSelectionK0Short = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskK0ShortSpecific | (std::bitset<selNum>(1) << selPhysPrimK0Short);
maskSelectionLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskLambdaSpecific | (std::bitset<selNum>(1) << selPhysPrimLambda);
maskSelectionAntiLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskAntiLambdaSpecific | (std::bitset<selNum>(1) << selPhysPrimAntiLambda);
maskSelectionXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskXiSpecific | (std::bitset<selNum>(1) << selPhysPrimXi);
maskSelectionAntiXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiXiSpecific | (std::bitset<selNum>(1) << selPhysPrimAntiXi);
maskSelectionOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskOmegaSpecific | (std::bitset<selNum>(1) << selPhysPrimOmega);
maskSelectionAntiOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiOmegaSpecific | (std::bitset<selNum>(1) << selPhysPrimAntiOmega);
maskSelectionXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskXiSpecific | (std::bitset<selNum>(1) << selPhysPrimXi);
maskSelectionAntiXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiXiSpecific | (std::bitset<selNum>(1) << selPhysPrimAntiXi);
maskSelectionOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskOmegaSpecific | (std::bitset<selNum>(1) << selPhysPrimOmega);
maskSelectionAntiOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiOmegaSpecific | (std::bitset<selNum>(1) << selPhysPrimAntiOmega);

// Check if doing the right thing in AP space please
histos.add("GeneralQA/h2dArmenterosAll", "h2dArmenterosAll", kTH2F, {axisAPAlpha, axisAPQt});
histos.add("GeneralQA/h2dArmenterosSelected", "h2dArmenterosSelected", kTH2F, {axisAPAlpha, axisAPQt});
Expand Down Expand Up @@ -512,7 +534,7 @@ struct upcStrangeness {
histos.add("Lambda/hPointingAngle", "hPointingAngle", kTH1F, {axisPointingAngle});
histos.add("Lambda/hV0Radius", "hV0Radius", kTH1F, {axisV0Radius});
histos.add("Lambda/h2dPositiveITSvsTPCpts", "h2dPositiveITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
histos.add("Lambda/h2dNegativeITSvsTPCpts", "h2dNegativeITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
histos.add("Lambda/h2dNegativeITSvsTPCpts", "h2dNegativeITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
}
if (doCollisionAssociationQA) {
histos.add("Lambda/h2dPtVsNch", "h2dPtVsNch", kTH2F, {axisMonteCarloNch, axisPt});
Expand Down Expand Up @@ -553,7 +575,7 @@ struct upcStrangeness {
histos.add("AntiLambda/hPointingAngle", "hPointingAngle", kTH1F, {axisPointingAngle});
histos.add("AntiLambda/hV0Radius", "hV0Radius", kTH1F, {axisV0Radius});
histos.add("AntiLambda/h2dPositiveITSvsTPCpts", "h2dPositiveITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
histos.add("AntiLambda/h2dNegativeITSvsTPCpts", "h2dNegativeITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
histos.add("AntiLambda/h2dNegativeITSvsTPCpts", "h2dNegativeITSvsTPCpts", kTH2F, {axisTPCrows, axisITSclus});
}
if (doCollisionAssociationQA) {
histos.add("AntiLambda/h2dPtVsNch", "h2dPtVsNch", kTH2F, {axisMonteCarloNch, axisPt});
Expand Down Expand Up @@ -590,9 +612,8 @@ struct upcStrangeness {
histos.add("Xi/hMassLambdaDau", "hMassLambdaDau", kTH2F, {axisPtCoarse, axisLambdaMass});
if (doBachelorBaryonCut) {
histos.add("Xi/hBachBaryonCosPA", "hBachBaryonCosPA", kTH2F, {axisPtCoarse, {100, 0.0f, 1.0f}});
histos.add("Xi/hBachBaryonDCAxyToPV", "hBachBaryonDCAxyToPV", kTH2F, {axisPtCoarse, {300, -3.0f, 3.0f}});
histos.add("Xi/hBachBaryonDCAxyToPV", "hBachBaryonDCAxyToPV", kTH2F, {axisPtCoarse, {300, -3.0f, 3.0f}});
}

}
}

Expand Down Expand Up @@ -785,7 +806,6 @@ struct upcStrangeness {
bitMap.set(selMassWinOmega);
if (fabs(casc.mLambda() - pdgDB->Mass(3122)) < lambdamasswin)
bitMap.set(selLambdaMassWin);


if (fabs(casc.dcav0topv(coll.posX(), coll.posY(), coll.posZ())) > dcav0topv)
bitMap.set(selDCAV0ToPV);
Expand Down Expand Up @@ -814,11 +834,11 @@ struct upcStrangeness {
if (fabs(rapidityOmega) < rapidityCut)
bitMap.set(selOmegaRapidity);
if (fabs(poseta) < daughterEtaCut)
bitMap.set(selNegEta);
bitMap.set(selNegEta);
if (fabs(negeta) < daughterEtaCut)
bitMap.set(selPosEta);
bitMap.set(selPosEta);
if (fabs(bacheta) < daughterEtaCut)
bitMap.set(selBachEta);
bitMap.set(selBachEta);

// ITS quality flags
if (posTrackExtra.itsNCls() >= TrackConfigurations.minITSclusters)
Expand Down Expand Up @@ -958,9 +978,9 @@ struct upcStrangeness {
if (fabs(rapidityK0Short) < rapidityCut)
bitMap.set(selK0ShortRapidity);
if (fabs(v0.negativeeta()) < daughterEtaCut)
bitMap.set(selNegEta);
bitMap.set(selNegEta);
if (fabs(v0.positiveeta()) < daughterEtaCut)
bitMap.set(selPosEta);
bitMap.set(selPosEta);

auto posTrackExtra = v0.template posTrackExtra_as<dauTracks>();
auto negTrackExtra = v0.template negTrackExtra_as<dauTracks>();
Expand Down Expand Up @@ -1051,7 +1071,7 @@ struct upcStrangeness {
histos.fill(HIST("GeneralQA/hPt"), casc.pt());
}
// Xi
if (verifyMask(selMap, maskSelectionXi) && analyseXi) {
if (verifyMask(selMap, maskSelectionXi) && analyseXi) {
histos.fill(HIST("Xi/h2dMassXi"), casc.mXi(), gap);
if (PIDConfigurations.doPlainTopoQA) {
histos.fill(HIST("Xi/hDCANegToPV"), casc.pt(), casc.dcanegtopv());
Expand All @@ -1069,20 +1089,19 @@ struct upcStrangeness {
}

// Anti-Xi
if (verifyMask(selMap, maskSelectionAntiXi) && analyseAntiXi) {
if (verifyMask(selMap, maskSelectionAntiXi) && analyseAntiXi) {
histos.fill(HIST("AntiXi/h2dMassAntiXi"), casc.mXi(), gap);
}

// Omega
if (verifyMask(selMap, maskSelectionOmega) && analyseOmega) {
if (verifyMask(selMap, maskSelectionOmega) && analyseOmega) {
histos.fill(HIST("Omega/h2dMassOmega"), casc.mOmega(), gap);
}

// Anti-Omega
if (verifyMask(selMap, maskSelectionAntiOmega) && analyseAntiOmega) {
if (verifyMask(selMap, maskSelectionAntiOmega) && analyseAntiOmega) {
histos.fill(HIST("AntiOmega/h2dMassAntiOmega"), casc.mOmega(), gap);
}

}

template <typename TV0>
Expand Down Expand Up @@ -1280,7 +1299,6 @@ struct upcStrangeness {

analyseCascCandidate(casc, collision, selGapSide, selMap);
} // end casc loop

}

PROCESS_SWITCH(upcStrangeness, processV0s, "Process V0s in UPC", true);
Expand Down