@@ -386,23 +386,23 @@ struct HfTaskCorrelationD0Hadrons {
386386 }
387387 }
388388 // check if correlation entry belongs to signal region, sidebands or is outside both, and fill correlation plots
389- if ((massD > signalRegionLeft->at (ptBinD) && massD < signalRegionRight->at (ptBinD)) && (( signalStatus == ParticleTypeData::D0Only) || (signalStatus == ParticleTypeData::D0D0barBoth) )) {
389+ if ((massD > signalRegionLeft->at (ptBinD) && massD < signalRegionRight->at (ptBinD)) && (signalStatus == ParticleTypeData::D0Only)) {
390390 // in signal region
391391 registry.fill (HIST (" hCorrel2DVsPtSignalRegion" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
392392 registry.fill (HIST (" hCorrel2DPtIntSignalRegion" ), deltaPhi, deltaEta, efficiencyWeight);
393393 registry.fill (HIST (" hDeltaEtaPtIntSignalRegion" ), deltaEta, efficiencyWeight);
394394 registry.fill (HIST (" hDeltaPhiPtIntSignalRegion" ), deltaPhi, efficiencyWeight);
395395 }
396396
397- if ((massD > signalRegionLeft->at (ptBinD) && massD < signalRegionRight->at (ptBinD)) && (( signalStatus == ParticleTypeData::D0OnlySoftPi) || (signalStatus >= ParticleTypeData::D0D0barBothSoftPi) )) {
397+ if ((massD > signalRegionLeft->at (ptBinD) && massD < signalRegionRight->at (ptBinD)) && (signalStatus == ParticleTypeData::D0OnlySoftPi)) {
398398 // in signal region, fills for soft pion only in ME
399399 registry.fill (HIST (" hCorrel2DVsPtSignalRegionSoftPi" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
400400 registry.fill (HIST (" hCorrel2DPtIntSignalRegionSoftPi" ), deltaPhi, deltaEta, efficiencyWeight);
401401 registry.fill (HIST (" hDeltaEtaPtIntSignalRegionSoftPi" ), deltaEta, efficiencyWeight);
402402 registry.fill (HIST (" hDeltaPhiPtIntSignalRegionSoftPi" ), deltaPhi, efficiencyWeight);
403403 }
404404
405- if ((massDbar > signalRegionLeft->at (ptBinD) && massDbar < signalRegionRight->at (ptBinD)) && (( signalStatus == ParticleTypeData::D0barOnly) || (signalStatus == ParticleTypeData::D0D0barBoth) )) {
405+ if ((massDbar > signalRegionLeft->at (ptBinD) && massDbar < signalRegionRight->at (ptBinD)) && (signalStatus == ParticleTypeData::D0barOnly)) {
406406 // in signal region
407407 registry.fill (HIST (" hCorrel2DVsPtSignalRegion" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
408408 registry.fill (HIST (" hCorrel2DPtIntSignalRegion" ), deltaPhi, deltaEta, efficiencyWeight);
@@ -420,7 +420,7 @@ struct HfTaskCorrelationD0Hadrons {
420420
421421 if (((massD > sidebandLeftOuter->at (ptBinD) && massD < sidebandLeftInner->at (ptBinD)) ||
422422 (massD > sidebandRightInner->at (ptBinD) && massD < sidebandRightOuter->at (ptBinD))) &&
423- (( signalStatus == ParticleTypeData::D0Only) || (signalStatus == ParticleTypeData::D0D0barBoth) )) {
423+ (signalStatus == ParticleTypeData::D0Only)) {
424424 // in sideband region
425425 registry.fill (HIST (" hCorrel2DVsPtSidebands" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
426426 registry.fill (HIST (" hCorrel2DPtIntSidebands" ), deltaPhi, deltaEta, efficiencyWeight);
@@ -430,7 +430,7 @@ struct HfTaskCorrelationD0Hadrons {
430430
431431 if (((massD > sidebandLeftOuter->at (ptBinD) && massD < sidebandLeftInner->at (ptBinD)) ||
432432 (massD > sidebandRightInner->at (ptBinD) && massD < sidebandRightOuter->at (ptBinD))) &&
433- (( signalStatus == ParticleTypeData::D0OnlySoftPi) || (signalStatus >= ParticleTypeData::D0D0barBothSoftPi) )) {
433+ (signalStatus == ParticleTypeData::D0OnlySoftPi)) {
434434 // in sideband region, fills for soft pion only in ME
435435 registry.fill (HIST (" hCorrel2DVsPtSidebandsSoftPi" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
436436 registry.fill (HIST (" hCorrel2DPtIntSidebandsSoftPi" ), deltaPhi, deltaEta, efficiencyWeight);
@@ -440,7 +440,7 @@ struct HfTaskCorrelationD0Hadrons {
440440
441441 if (((massDbar > sidebandLeftOuter->at (ptBinD) && massDbar < sidebandLeftInner->at (ptBinD)) ||
442442 (massDbar > sidebandRightInner->at (ptBinD) && massDbar < sidebandRightOuter->at (ptBinD))) &&
443- (( signalStatus == ParticleTypeData::D0barOnly) || (signalStatus == ParticleTypeData::D0D0barBoth) )) {
443+ (signalStatus == ParticleTypeData::D0barOnly)) {
444444 // in sideband region
445445 registry.fill (HIST (" hCorrel2DVsPtSidebands" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
446446 registry.fill (HIST (" hCorrel2DPtIntSidebands" ), deltaPhi, deltaEta, efficiencyWeight);
@@ -556,9 +556,9 @@ struct HfTaskCorrelationD0Hadrons {
556556 registry.fill (HIST (" hDeltaPhiPtIntSignalRegionRecSig" ), deltaPhi, efficiencyWeight);
557557 if (isPhysicalPrimary) {
558558 registry.fill (HIST (" hCorrel2DVsPtPhysicalPrimaryRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, statusD0Prompt, poolBin, efficiencyWeight);
559- if (statusD0Prompt == 1 && statusPromptHadron == 1 ) {
559+ if (statusD0Prompt == 1 && statusPromptHadron == RecoDecay::OriginType::Prompt ) {
560560 registry.fill (HIST (" hCorrel2DVsPtSignalRegionPromptD0PromptHadronRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
561- } else if (statusD0Prompt == 0 && statusPromptHadron == 2 ) {
561+ } else if (statusD0Prompt == 0 && statusPromptHadron == RecoDecay::OriginType::NonPrompt ) {
562562 registry.fill (HIST (" hCorrel2DVsPtSignalRegionNonPromptD0NonPromptHadronRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
563563 }
564564 }
@@ -572,9 +572,9 @@ struct HfTaskCorrelationD0Hadrons {
572572 registry.fill (HIST (" hDeltaPhiPtIntSignalRegionRecSig" ), deltaPhi, efficiencyWeight);
573573 if (isPhysicalPrimary) {
574574 registry.fill (HIST (" hCorrel2DVsPtPhysicalPrimaryRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, statusD0Prompt, poolBin, efficiencyWeight);
575- if (statusD0Prompt == 1 && statusPromptHadron == 1 ) {
575+ if (statusD0Prompt == 1 && statusPromptHadron == RecoDecay::OriginType::Prompt ) {
576576 registry.fill (HIST (" hCorrel2DVsPtSignalRegionPromptD0PromptHadronRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
577- } else if (statusD0Prompt == 0 && statusPromptHadron == 2 ) {
577+ } else if (statusD0Prompt == 0 && statusPromptHadron == RecoDecay::OriginType::NonPrompt ) {
578578 registry.fill (HIST (" hCorrel2DVsPtSignalRegionNonPromptD0NonPromptHadronRecSig" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin, efficiencyWeight);
579579 }
580580 }
@@ -772,12 +772,12 @@ struct HfTaskCorrelationD0Hadrons {
772772 }
773773 if (isD0Prompt) {
774774 registry.fill (HIST (" hCorrel2DVsPtGenPrompt" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin);
775- if (statusPromptHadron == 1 ) {
775+ if (statusPromptHadron == RecoDecay::OriginType::Prompt ) {
776776 registry.fill (HIST (" hCorrel2DVsPtGenPromptD0PromptHadron" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin);
777777 }
778778 } else {
779779 registry.fill (HIST (" hCorrel2DVsPtGenNonPrompt" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin);
780- if (statusPromptHadron == 2 ) {
780+ if (statusPromptHadron == RecoDecay::OriginType::NonPrompt ) {
781781 registry.fill (HIST (" hCorrel2DVsPtGenNonPromptD0NonPromptHadron" ), deltaPhi, deltaEta, ptD, ptHadron, poolBin);
782782 }
783783 }
0 commit comments