From 8f82fa8885572276dadec8996a40f08285df3862 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 28 Aug 2024 14:59:17 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGLF/DataModel/LFStrangenessTables.h | 4 +- .../Strangeness/strangederivedbuilder.cxx | 6 +- PWGLF/Utils/upcStrangeness.h | 4 +- PWGUD/Tasks/upcStrangeness.cxx | 90 +++++++++++-------- 4 files changed, 61 insertions(+), 43 deletions(-) diff --git a/PWGLF/DataModel/LFStrangenessTables.h b/PWGLF/DataModel/LFStrangenessTables.h index dae7774f608..02e3357e738 100644 --- a/PWGLF/DataModel/LFStrangenessTables.h +++ b/PWGLF/DataModel/LFStrangenessTables.h @@ -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 } //______________________________________________________ @@ -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, diff --git a/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx index 5b442a27cb0..cc8e9e05a6f 100644 --- a/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx +++ b/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx @@ -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 diff --git a/PWGLF/Utils/upcStrangeness.h b/PWGLF/Utils/upcStrangeness.h index b56d05e67f9..23e99776211 100644 --- a/PWGLF/Utils/upcStrangeness.h +++ b/PWGLF/Utils/upcStrangeness.h @@ -109,7 +109,7 @@ enum selectionsCombined : int { selV0CosPA = 0, selTOFDeltaTNegativePionLambdaXi, selTOFDeltaTNegativePionLambdaOmega, selTOFDeltaTBachPionXi, - selTOFDeltaTBachKaonOmega, + selTOFDeltaTBachKaonOmega, selBachEta, selLambdaMassWin, selCount, @@ -129,7 +129,7 @@ std::bitset maskKinematicV0; std::bitset maskKinematicCasc; std::bitset maskTrackPropertiesV0; -std::bitset maskTrackPropertiesCasc; +std::bitset maskTrackPropertiesCasc; std::bitset maskK0ShortSpecific; std::bitset maskLambdaSpecific; diff --git a/PWGUD/Tasks/upcStrangeness.cxx b/PWGUD/Tasks/upcStrangeness.cxx index 0e35d3297eb..0df86bdc89c 100644 --- a/PWGUD/Tasks/upcStrangeness.cxx +++ b/PWGUD/Tasks/upcStrangeness.cxx @@ -132,7 +132,7 @@ struct upcStrangeness { Configurable FT0Acut{"FT0Acut", 200., "FT0A threshold"}; Configurable FT0Ccut{"FT0Ccut", 100., "FT0C threshold"}; Configurable ZDCcut{"ZDCcut", 10., "ZDC threshold"}; - //Configurable gapSel{"gapSel", 2, "Gap selection"}; + // Configurable gapSel{"gapSel", 2, "Gap selection"}; } upcCuts; // Track quality @@ -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 @@ -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); @@ -396,14 +418,14 @@ struct upcStrangeness { } // Primary particle selection, central to analysis - maskSelectionK0Short = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskK0ShortSpecific | (std::bitset(1) << selPhysPrimK0Short); - maskSelectionLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskLambdaSpecific | (std::bitset(1) << selPhysPrimLambda); + maskSelectionK0Short = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskK0ShortSpecific | (std::bitset(1) << selPhysPrimK0Short); + maskSelectionLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskLambdaSpecific | (std::bitset(1) << selPhysPrimLambda); maskSelectionAntiLambda = maskTopologicalV0 | maskKinematicV0 | maskTrackPropertiesV0 | maskAntiLambdaSpecific | (std::bitset(1) << selPhysPrimAntiLambda); - maskSelectionXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskXiSpecific | (std::bitset(1) << selPhysPrimXi); - maskSelectionAntiXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiXiSpecific | (std::bitset(1) << selPhysPrimAntiXi); - maskSelectionOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskOmegaSpecific | (std::bitset(1) << selPhysPrimOmega); - maskSelectionAntiOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiOmegaSpecific | (std::bitset(1) << selPhysPrimAntiOmega); - + maskSelectionXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskXiSpecific | (std::bitset(1) << selPhysPrimXi); + maskSelectionAntiXi = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiXiSpecific | (std::bitset(1) << selPhysPrimAntiXi); + maskSelectionOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskOmegaSpecific | (std::bitset(1) << selPhysPrimOmega); + maskSelectionAntiOmega = maskTopologicalCasc | maskKinematicCasc | maskTrackPropertiesCasc | maskAntiOmegaSpecific | (std::bitset(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}); @@ -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}); @@ -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}); @@ -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}}); } - } } @@ -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); @@ -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) @@ -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(); auto negTrackExtra = v0.template negTrackExtra_as(); @@ -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()); @@ -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 @@ -1280,7 +1299,6 @@ struct upcStrangeness { analyseCascCandidate(casc, collision, selGapSide, selMap); } // end casc loop - } PROCESS_SWITCH(upcStrangeness, processV0s, "Process V0s in UPC", true);