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
27 changes: 13 additions & 14 deletions PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ struct ResonanceInitializer {
|| (nabs(aod::mcparticle::pdgCode) == 123314) // Xi(1820)0
|| (nabs(aod::mcparticle::pdgCode) == 123324); // Xi(1820)-0

using ResoEvents = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::CentFV0As, aod::Mults>;
using ResoEvents = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::CentFV0As, aod::Mults>;
using ResoEvents001 = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::CentFV0As, aod::Mults, aod::MultsExtra, aod::PVMults>;
using ResoRun2Events = soa::Join<aod::Collisions, aod::EvSels, aod::CentRun2V0Ms>;
using ResoEventsMC = soa::Join<ResoEvents, aod::McCollisionLabels>;
Expand Down Expand Up @@ -1200,7 +1200,7 @@ struct ResonanceInitializer {

if (std::abs(mcPart.pdgCode()) != GenCuts.pdgTruthMother)
continue;
if((mcPart.y() >= GenCuts.cfgRapidityCutMaxGen) || (mcPart.y() <= GenCuts.cfgRapidityCutMinGen))
if ((mcPart.y() >= GenCuts.cfgRapidityCutMaxGen) || (mcPart.y() <= GenCuts.cfgRapidityCutMinGen))
continue;
std::vector<int> daughterPDGs;
if (mcPart.has_daughters()) {
Expand Down Expand Up @@ -1355,7 +1355,6 @@ struct ResonanceInitializer {
qaRegistry.add("hGoodCascIndices", "hGoodCascIndices", kTH1F, {idxAxis});
qaRegistry.add("hGoodMCCascIndices", "hGoodMCCascIndices", kTH1F, {idxAxis});
qaRegistry.add("Phi", "#phi distribution", kTH1F, {{65, -0.1, 6.4}});

}

TString hNEventsMCLabels[4] = {"All", "z vrtx", "INEL", "INEL>0"};
Expand Down Expand Up @@ -1523,7 +1522,7 @@ struct ResonanceInitializer {
}
resoSpheroCollisions(computeSpherocity(tracks, trackSphMin, trackSphDef));
resoEvtPlCollisions(0, 0, 0, 0);
if(FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() <1)){
if (FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() < 1)) {
return;
}

Expand Down Expand Up @@ -1585,12 +1584,12 @@ struct ResonanceInitializer {
}
resoSpheroCollisions(computeSpherocity(tracks, trackSphMin, trackSphDef));
resoEvtPlCollisions(0, 0, 0, 0);
if(cfgMultName.value == "FV0A")
qaRegistry.fill(HIST("Event/CentFV0A"),centEst(collision));
if(FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() <1)){
if (cfgMultName.value == "FV0A")
qaRegistry.fill(HIST("Event/CentFV0A"), centEst(collision));
if (FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() < 1)) {
return;
}
if(FilterForDerivedTables.cfgBypassNoPairCascades && (Cascades.size() <1)){
if (FilterForDerivedTables.cfgBypassNoPairCascades && (Cascades.size() < 1)) {
return;
}
fillTracks<false>(collision, tracks);
Expand Down Expand Up @@ -1739,7 +1738,7 @@ struct ResonanceInitializer {
fillMCCollision<false>(collision, mcParticles);

// Loop over tracks
if(FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() <1)){
if (FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() < 1)) {
return;
}
fillTracks<true>(collision, tracks);
Expand Down Expand Up @@ -1806,8 +1805,8 @@ struct ResonanceInitializer {
Cent = mcCollision.centFT0M();
else
Cent = centEst(collision);
if(cfgMultName.value == "FV0A")
qaRegistry.fill(HIST("Event/CentFV0A"),centEst(collision));
if (cfgMultName.value == "FV0A")
qaRegistry.fill(HIST("Event/CentFV0A"), centEst(collision));

bool isRecINELgt0 = 0;
if (checkIsRecINELgt0)
Expand All @@ -1828,10 +1827,10 @@ struct ResonanceInitializer {
fillMCCollision<false>(collision, mcParticles, impactpar, mult);

// Loop over tracks
if(FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() <1)){
if (FilterForDerivedTables.cfgBypassNoPairV0s && (V0s.size() < 1)) {
return;
}
if(FilterForDerivedTables.cfgBypassNoPairCascades && (Cascades.size() <1)){
if (FilterForDerivedTables.cfgBypassNoPairCascades && (Cascades.size() < 1)) {
return;
}
fillTracks<true>(collision, tracks);
Expand Down Expand Up @@ -1909,7 +1908,7 @@ struct ResonanceInitializer {
for (const auto& collision : collisions) {
if (EventCuts.cfgEvtUseRCTFlagChecker && !rctChecker(collision))
continue;
if (!colCuts.isSelected(collision,false)) // Bug is appeared in colCuts-> double counting in event QA histo, will be fixed later
if (!colCuts.isSelected(collision, false)) // Bug is appeared in colCuts-> double counting in event QA histo, will be fixed later
continue;
if (biggestNContribs < collision.multPVTotalContributors()) {
biggestNContribs = collision.multPVTotalContributors();
Expand Down
21 changes: 9 additions & 12 deletions PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "Framework/O2DatabasePDGPlugin.h"
#include "Framework/runDataProcessing.h"

#include "Math/Vector4D.h"
#include "Math/RotationZ.h"
#include "Math/Vector4D.h"
#include "TF1.h"
#include "TRandom3.h"

Expand Down Expand Up @@ -180,7 +180,7 @@ struct Xi1530Analysisqa {
Configurable<float> cMasswindowCasccut{"cMasswindowCasccut", 0.008, "Cascade Mass window cut"};
Configurable<float> cMassXiminus{"cMassXiminus", 1.32171, "Mass of Xi baryon"};

Configurable<float> cMaxProperLifetimeCut{"cMaxProperLifetimeCut", 4.7, "Maximum proper lifetime cut for Xi- candidates"};
Configurable<float> cMaxProperLifetimeCut{"cMaxProperLifetimeCut", 4.7, "Maximum proper lifetime cut for Xi- candidates"};

} cascadeConfig;

Expand Down Expand Up @@ -400,7 +400,7 @@ struct Xi1530Analysisqa {
histos.add("h3XiinvmassDSAnti", "Invariant mass of Anti-Xi- differnt sign", kTHnSparseF, {centAxis, ptAxis, invMassAxisCasc, flagAxis});

histos.add("h3Xi1530invmassLSAnti", "Invariant mass of Anti-Xi(1530)0 same sign", kTHnSparseF, {centAxis, ptAxis, invMassAxis, flagAxis});
histos.add("h3Xi1530invmassRotDSAnti", "Invariant mass of Anti-Xi(1530)0 rotated DS", kTHnSparseF, {centAxis, ptAxis, invMassAxis, flagAxis});
histos.add("h3Xi1530invmassRotDSAnti", "Invariant mass of Anti-Xi(1530)0 rotated DS", kTHnSparseF, {centAxis, ptAxis, invMassAxis, flagAxis});

if (doprocessMEDF || doprocessMEMicro) {
histos.add("h3Xi1530invmassME_DS", "Invariant mass of Xi(1530)0 mixed event DS", kTHnSparseF, {centAxis, ptAxis, invMassAxis, flagAxis});
Expand Down Expand Up @@ -449,7 +449,7 @@ struct Xi1530Analysisqa {
histos.add("Xi1530RecAnti", "pT distribution of Reconstructed MC Anti-Xi(1530)0", kTH2F, {ptAxis, centAxis});
histos.add("Xi1530Recinvmass", "Inv mass distribution of Reconstructed MC Xi(1530)0", kTH1F, {invMassAxis});
}
//QA for topological, kinematical cut for cascades
// QA for topological, kinematical cut for cascades
if (histoConfig.additionalQAplots) {
histos.add("QAbefore/V0DCATopPV", "V0s DCA to PV distribution as pt", HistType::kTH2F, {ptAxis, dcaxyAxis});
histos.add("QAbefore/V0DCADoughter", "V0s DCA Doughter distribution as pt", HistType::kTH2F, {ptAxis, dcaDaugAxis});
Expand Down Expand Up @@ -492,8 +492,6 @@ struct Xi1530Analysisqa {
histos.add("QAMCTrue/V0Radius", "V0 Radius distribution as pt", HistType::kTH2F, {ptAxis, transRadiusAxis});
histos.add("QAMCTrue/CascRadius", "Casc Radius distribution as pt", HistType::kTH2F, {ptAxis, transRadiusAxis});
histos.add("QAMCTrue/ProperLifetime", "Proper Lifetime distribution as pt", HistType::kTH2F, {ptAxis, properLifetimeAxis});


}
}

Expand Down Expand Up @@ -1056,7 +1054,7 @@ struct Xi1530Analysisqa {
if (additionalConfig.cfgFillRotBkg) {
for (int i = 0; i < additionalConfig.cfgNrotBkg; i++) {
auto lRotAngle = additionalConfig.cfgMinRot + i * ((additionalConfig.cfgMaxRot - additionalConfig.cfgMinRot) / (additionalConfig.cfgNrotBkg - 1));
histos.fill(HIST("QAevent/hRotBkg"), lRotAngle);
histos.fill(HIST("QAevent/hRotBkg"), lRotAngle);
if (additionalConfig.cfgRotPion) {
lDaughterRot = lDecayDaughter1;
ROOT::Math::RotationZ rot(lRotAngle);
Expand All @@ -1081,7 +1079,7 @@ struct Xi1530Analysisqa {
if (additionalConfig.cfgFillRotBkg) {
for (int i = 0; i < additionalConfig.cfgNrotBkg; i++) {
auto lRotAngle = additionalConfig.cfgMinRot + i * ((additionalConfig.cfgMaxRot - additionalConfig.cfgMinRot) / (additionalConfig.cfgNrotBkg - 1));
histos.fill(HIST("QAevent/hRotBkg"), lRotAngle);
histos.fill(HIST("QAevent/hRotBkg"), lRotAngle);
if (additionalConfig.cfgRotPion) {
lDaughterRot = lDecayDaughter1;
ROOT::Math::RotationZ rot(lRotAngle);
Expand Down Expand Up @@ -1117,8 +1115,8 @@ struct Xi1530Analysisqa {
auto lResonancePtMC = xiCand.motherPt();
if (additionalConfig.cUseTruthRapidity)
continue;
if( (xiCand.motherRap() >= primarytrackConfig.cfgRapidityMaxCut) || (xiCand.motherRap() <= primarytrackConfig.cfgRapidityMinCut) )
continue;
if ((xiCand.motherRap() >= primarytrackConfig.cfgRapidityMaxCut) || (xiCand.motherRap() <= primarytrackConfig.cfgRapidityMinCut))
continue;
if (histoConfig.truthQA) {
float trk1DCAXY = -1.f;
float trk1DCAZ = -1.f;
Expand Down Expand Up @@ -1187,7 +1185,6 @@ struct Xi1530Analysisqa {
histos.fill(HIST("QAMCTrue/V0Mass"), xiCandPt, massLambdaCand);
histos.fill(HIST("QAMCTrue/CascMass"), xiCandPt, massXiCand);
histos.fill(HIST("QAMCTrue/ProperLifetime"), xiCandPt, trk2ProperLifetime);


histos.fill(HIST("QAMCTrue/TPC_Nsigma_pi_first_all"), Cent, pionCandPt, trk1NSigmaPiTPC);
if (hasSubsystemInfo(trk1NSigmaPiTOF)) {
Expand Down Expand Up @@ -1311,7 +1308,7 @@ struct Xi1530Analysisqa {
for (const auto& part : resoParents) { // loop over all pre-filtered MC particles
if (std::abs(part.pdgCode()) != kXiStar)
continue;
if((part.y() <= primarytrackConfig.cfgRapidityMinCut) || (part.y() >= primarytrackConfig.cfgRapidityMaxCut))
if ((part.y() <= primarytrackConfig.cfgRapidityMinCut) || (part.y() >= primarytrackConfig.cfgRapidityMaxCut))
continue;
bool pass1 = std::abs(part.daughterPDG1()) == kPiPlus || std::abs(part.daughterPDG2()) == kPiPlus;
bool pass2 = std::abs(part.daughterPDG1()) == kXiMinus || std::abs(part.daughterPDG2()) == kXiMinus;
Expand Down
Loading