Skip to content

Please consider the following formatting changes to #7055 #312

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
ddobrigk merged 1 commit into from
Jul 30, 2024
Merged

Please consider the following formatting changes to #7055 #312

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
23 changes: 12 additions & 11 deletions PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,11 @@ struct hstrangecorrelationfilter {
histos.add("h3dMassOmegaMinus", "h3dMassOmegaMinus", kTH3F, {axisPtQA, axisOmegaMass, axisMult});
histos.add("h3dMassOmegaPlus", "h3dMassOmegaPlus", kTH3F, {axisPtQA, axisOmegaMass, axisMult});
}

// reco-level trigger quality checks (N.B.: DCA is filtered, not selected)
template <class TTrack>
bool isValidTrigger(TTrack track){
bool isValidTrigger(TTrack track)
{
if (track.eta() > triggerEtaMax || track.eta() < triggerEtaMin) {
return false;
}
Expand Down Expand Up @@ -207,8 +208,8 @@ struct hstrangecorrelationfilter {
/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if( !isValidTrigger(track) )
continue;
if (!isValidTrigger(track))
continue;
triggerTrack(
track.collisionId(),
false, // if you decide to check real data for primaries, you'll have a hard time
Expand All @@ -231,12 +232,12 @@ struct hstrangecorrelationfilter {
/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if( !isValidTrigger(track) )
continue;
bool physicalPrimary = false;
if( track.has_mcParticle()){
auto mcParticle = track.mcParticle();
physicalPrimary = mcParticle.isPhysicalPrimary();
if (!isValidTrigger(track))
continue;
bool physicalPrimary = false;
if (track.has_mcParticle()) {
auto mcParticle = track.mcParticle();
physicalPrimary = mcParticle.isPhysicalPrimary();
}
triggerTrack(
track.collisionId(),
Expand Down Expand Up @@ -521,7 +522,7 @@ struct hstrangecorrelationfilter {
) {
assocCascades(casc.collisionId(), casc.globalIndex(),
compatibleXiMinus, compatibleXiPlus, compatibleOmegaMinus, compatibleOmegaPlus,
origCascadeEntry.isTrueXiMinus(), origCascadeEntry.isTrueXiPlus(),
origCascadeEntry.isTrueXiMinus(), origCascadeEntry.isTrueXiPlus(),
origCascadeEntry.isTrueOmegaMinus(), origCascadeEntry.isTrueOmegaPlus(),
origCascadeEntry.isPhysicalPrimary(),
massRegXi, massRegOmega);
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,7 @@ struct lambdakzeroPreselector {
}
v0tags(validV0,
bitcheck(selectionMask[ii], bitTrueGamma), bitcheck(selectionMask[ii], bitTrueK0Short), bitcheck(selectionMask[ii], bitTrueLambda),
bitcheck(selectionMask[ii], bitTrueAntiLambda),
bitcheck(selectionMask[ii], bitTrueAntiLambda),
bitcheck(selectionMask[ii], bitTrueHypertriton), bitcheck(selectionMask[ii], bitTrueAntiHypertriton), bitcheck(selectionMask[ii], bitPhysicalPrimary),
bitcheck(selectionMask[ii], bitdEdxGamma), bitcheck(selectionMask[ii], bitdEdxK0Short), bitcheck(selectionMask[ii], bitdEdxLambda),
bitcheck(selectionMask[ii], bitdEdxAntiLambda), bitcheck(selectionMask[ii], bitdEdxHypertriton), bitcheck(selectionMask[ii], bitdEdxAntiHypertriton),
Expand Down
24 changes: 12 additions & 12 deletions PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ struct correlateStrangeness {
void fillCorrelationsV0(aod::TriggerTracks const& triggers, aod::AssocV0s const& assocs, bool mixing, float pvz, float mult)
{
for (auto& triggerTrack : triggers) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto trigg = triggerTrack.track_as<TracksComplete>();
if (!mixing)
histos.fill(HIST("sameEvent/TriggerParticlesV0"), trigg.pt(), mult);
Expand Down Expand Up @@ -229,8 +229,8 @@ struct correlateStrangeness {
void fillCorrelationsCascade(aod::TriggerTracks const& triggers, aod::AssocCascades const& assocs, bool mixing, float pvz, float mult)
{
for (auto& triggerTrack : triggers) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto trigg = triggerTrack.track_as<TracksComplete>();
if (!mixing)
histos.fill(HIST("sameEvent/TriggerParticlesCascade"), trigg.pt(), mult);
Expand Down Expand Up @@ -306,8 +306,8 @@ struct correlateStrangeness {
{

for (auto& triggerTrack : triggers) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto trigg = triggerTrack.track_as<TracksComplete>();
if (!mixing)
histos.fill(HIST("sameEvent/TriggerParticlesPion"), trigg.pt(), mult);
Expand Down Expand Up @@ -731,8 +731,8 @@ struct correlateStrangeness {
}
if (!doprocessSameEventHCascades) {
for (auto const& triggerTrack : triggerTracks) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto track = triggerTrack.track_as<TracksComplete>();
histos.fill(HIST("hTrackEtaVsPtVsPhi"), track.pt(), track.eta(), track.phi());
}
Expand Down Expand Up @@ -798,8 +798,8 @@ struct correlateStrangeness {
});
}
for (auto const& triggerTrack : triggerTracks) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto track = triggerTrack.track_as<TracksComplete>();
histos.fill(HIST("hTrackEtaVsPtVsPhi"), track.pt(), track.eta(), track.phi());
}
Expand Down Expand Up @@ -839,8 +839,8 @@ struct correlateStrangeness {
}
if (!doprocessSameEventHCascades && !doprocessSameEventHV0s) {
for (auto const& triggerTrack : triggerTracks) {
if(doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())
continue;
auto track = triggerTrack.track_as<TracksComplete>();
histos.fill(HIST("hTrackEtaVsPtVsPhi"), track.pt(), track.eta(), track.phi());
}
Expand Down