Skip to content
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

* rename Particle_t enum Unknown to UnknownParticle, to coordinate with #854

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

* rename Particle_t enum Unknown to UnknownParticle, to coordinate with #854

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
10 changes: 5 additions & 5 deletions src/libraries/ANALYSIS/ANALYSIS_init.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jerror_t ANALYSIS_init(JEventLoop *loop)
DHistogramAction_TrackVertexComparison(NULL);
DHistogramAction_ParticleComboKinematics(NULL, false);
DHistogramAction_TruePID(NULL);
DHistogramAction_InvariantMass(NULL, Unknown, false, 0, 0.0, 0.0);
DHistogramAction_InvariantMass(NULL, UnknownParticle, false, 0, 0.0, 0.0);
DHistogramAction_MissingMass(NULL, false, 0, 0.0, 0.0);
DHistogramAction_MissingMassSquared(NULL, false, 0, 0.0, 0.0);
DHistogramAction_KinFitResults(NULL, 0.0);
Expand All @@ -69,19 +69,19 @@ jerror_t ANALYSIS_init(JEventLoop *loop)

DCutAction_MinTrackHits(NULL, 0);
DCutAction_ThrownTopology(NULL, true);
DCutAction_PIDFOM(NULL, Unknown, Unknown, 0.0);
DCutAction_PIDFOM(NULL, UnknownParticle, UnknownParticle, 0.0);
DCutAction_AllTracksHaveDetectorMatch(NULL);
DCutAction_CombinedPIDFOM(NULL, 0.0);
DCutAction_EachPIDFOM(NULL, 0.0);
DCutAction_CombinedTrackingFOM(NULL, 0.0);
DCutAction_MissingMass(NULL, false, 0.0, 0.0);
DCutAction_MissingMassSquared(NULL, false, 0.0, 0.0);
DCutAction_InvariantMass(NULL, Unknown, false, 0.0, 0.0);
DCutAction_InvariantMass(NULL, UnknownParticle, false, 0.0, 0.0);
DCutAction_AllVertexZ(NULL, 0.0, 0.0);
DCutAction_ProductionVertexZ(NULL, 0.0, 0.0);
DCutAction_MaxTrackDOCA(NULL, Unknown, 0.0);
DCutAction_MaxTrackDOCA(NULL, UnknownParticle, 0.0);
DCutAction_KinFitFOM(NULL, 0.0);
DCutAction_TruePID(NULL, Unknown, Unknown, 0.0);
DCutAction_TruePID(NULL, UnknownParticle, UnknownParticle, 0.0);
DCutAction_AllTruePID(NULL, 0.0);
DCutAction_GoodEventRFBunch(NULL, false);
DCutAction_TransverseMomentum(NULL, 0.0);
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/ANALYSIS/DAnalysisUtilities.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ void DAnalysisUtilities::Get_ThrownParticleSteps(JEventLoop* locEventLoop, deque
if(IsResonance(locMCThrowns[loc_i]->PID()))
continue; //don't include resonances in DReaction!!

if(locMCThrowns[loc_i]->PID() == Unknown)
if(locMCThrowns[loc_i]->PID() == UnknownParticle)
continue; //could be some weird pythia "resonance" like a diquark: just ignore them all

//initial checks of parent id
Expand All @@ -690,7 +690,7 @@ void DAnalysisUtilities::Get_ThrownParticleSteps(JEventLoop* locEventLoop, deque
//initial checks of parent pid
Particle_t locParentPID = locIDMap[locParentID]->PID();
bool locDoneFlag = false;
while(((locParentPID == Unknown) || IsResonance(locParentPID)) && (!locDoneFlag))
while(((locParentPID == UnknownParticle) || IsResonance(locParentPID)) && (!locDoneFlag))
{
//intermediate particle, continue towards the source
locParentID = locIDMap[locParentID]->parentid; //parent's parent
Expand Down Expand Up @@ -831,7 +831,7 @@ DLorentzVector DAnalysisUtilities::Calc_MissingP4(const DReaction* locReaction,

//target particle
Particle_t locPID = locReactionStep->Get_TargetPID();
if(locPID != Unknown)
if(locPID != UnknownParticle)
{
double locMass = ParticleMass(locPID);
locMissingP4 += DLorentzVector(DVector3(0.0, 0.0, 0.0), locMass);
Expand Down Expand Up @@ -949,7 +949,7 @@ DLorentzVector DAnalysisUtilities::Calc_FinalStateP4(const DReaction* locReactio
if(locStepIndex != 0)
{
Particle_t locPID = locReactionStep->Get_TargetPID();
if(locPID != Unknown)
if(locPID != UnknownParticle)
locFinalStateP4 -= DLorentzVector(DVector3(0.0, 0.0, 0.0), ParticleMass(locPID));
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/ANALYSIS/DAnalysisUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class DAnalysisUtilities : public JObject
void Get_UnusedTOFPoints(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo, vector<const DTOFPoint*>& locUnusedTOFPoints) const;

void Get_ThrownParticleSteps(JEventLoop* locEventLoop, deque<pair<const DMCThrown*, deque<const DMCThrown*> > >& locThrownSteps) const;
bool Are_ThrownPIDsSameAsDesired(JEventLoop* locEventLoop, const deque<Particle_t>& locDesiredPIDs, Particle_t locMissingPID = Unknown) const;
bool Are_ThrownPIDsSameAsDesired(JEventLoop* locEventLoop, const deque<Particle_t>& locDesiredPIDs, Particle_t locMissingPID = UnknownParticle) const;

double Calc_DOCAVertex(const DVector3 &locUnitDir1, const DVector3 &locUnitDir2, const DVector3 &locVertex1, const DVector3 &locVertex2, DVector3& locDOCAPoint) const;
double Calc_DOCA(const DVector3 &locUnitDir1, const DVector3 &locUnitDir2, const DVector3 &locVertex1, const DVector3 &locVertex2) const;
Expand Down
36 changes: 18 additions & 18 deletions src/libraries/ANALYSIS/DCutActions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ bool DCutAction_PIDFOM::Perform_Action(JEventLoop* locEventLoop, const DParticle
auto locSteps = locParticleCombo->Get_ParticleComboSteps();
for(size_t loc_i = 0; loc_i < locSteps.size(); ++loc_i)
{
if((dStepPID != Unknown) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dStepPID))
if((dStepPID != UnknownParticle) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dStepPID))
continue;
auto locParticles = locSteps[loc_i]->Get_FinalParticles_Measured(Get_Reaction()->Get_ReactionStep(loc_i), d_AllCharges);
for(size_t loc_j = 0; loc_j < locParticles.size(); ++loc_j)
{
if((locParticles[loc_j]->PID() != dParticleID) && (dParticleID != Unknown))
if((locParticles[loc_j]->PID() != dParticleID) && (dParticleID != UnknownParticle))
continue;
if(ParticleCharge(dParticleID) == 0)
{
Expand Down Expand Up @@ -304,7 +304,7 @@ bool DCutAction_InvariantMass::Perform_Action(JEventLoop* locEventLoop, const DP
for(size_t loc_i = 0; loc_i < locParticleCombo->Get_NumParticleComboSteps(); ++loc_i)
{
const DReactionStep* locReactionStep = Get_Reaction()->Get_ReactionStep(loc_i);
if((dInitialPID != Unknown) && (locReactionStep->Get_InitialPID() != dInitialPID))
if((dInitialPID != UnknownParticle) && (locReactionStep->Get_InitialPID() != dInitialPID))
continue;
if((dStepIndex != -1) && (int(loc_i) != dStepIndex))
continue;
Expand Down Expand Up @@ -388,7 +388,7 @@ bool DCutAction_MaxTrackDOCA::Perform_Action(JEventLoop* locEventLoop, const DPa
auto locSteps = locParticleCombo->Get_ParticleComboSteps();
for(size_t loc_i = 0; loc_i < locSteps.size(); ++loc_i)
{
if((dInitialPID != Unknown) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dInitialPID))
if((dInitialPID != UnknownParticle) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dInitialPID))
continue;
auto locParticles = locSteps[loc_i]->Get_FinalParticles_Measured(Get_Reaction()->Get_ReactionStep(loc_i), d_Charged);
for(size_t loc_j = 0; loc_j < locParticles.size(); ++loc_j)
Expand Down Expand Up @@ -540,7 +540,7 @@ bool DCutAction_BDTSignalCombo::Perform_Action(JEventLoop* locEventLoop, const D

const DMCThrown* locMCThrownParent = locMCThrownMyIDMap[locParentID];
Particle_t locPID = locMCThrownParent->PID();
if((locPID == Unknown) || IsResonance(locPID) || (locPID == omega) || (locPID == phiMeson))
if((locPID == UnknownParticle) || IsResonance(locPID) || (locPID == omega) || (locPID == phiMeson))
{
//intermediate (unknown, resonance, phi, or omega) particle: go to its parent
locParentID = locMCThrownParent->parentid;
Expand Down Expand Up @@ -676,7 +676,7 @@ bool DCutAction_TrueCombo::Perform_Action(JEventLoop* locEventLoop, const DParti

const DMCThrown* locMCThrownParent = locMCThrownMyIDMap[locParentID];
Particle_t locPID = locMCThrownParent->PID();
if((locPID == Unknown) || IsResonance(locPID))
if((locPID == UnknownParticle) || IsResonance(locPID))
{
//intermediate (unknown or resonance) particle: go to its parent
locParentID = locMCThrownParent->parentid;
Expand Down Expand Up @@ -741,12 +741,12 @@ bool DCutAction_TruePID::Perform_Action(JEventLoop* locEventLoop, const DParticl
auto locSteps = locParticleCombo->Get_ParticleComboSteps();
for(size_t loc_i = 0; loc_i < locSteps.size(); ++loc_i)
{
if((dInitialPID != Unknown) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dInitialPID))
if((dInitialPID != UnknownParticle) && (Get_Reaction()->Get_ReactionStep(loc_i)->Get_InitialPID() != dInitialPID))
continue;
auto locParticles = locSteps[loc_i]->Get_FinalParticles_Measured(Get_Reaction()->Get_ReactionStep(loc_i), d_AllCharges);
for(size_t loc_j = 0; loc_j < locParticles.size(); ++loc_j)
{
if((locParticles[loc_j]->PID() != dTruePID) && (dTruePID != Unknown))
if((locParticles[loc_j]->PID() != dTruePID) && (dTruePID != UnknownParticle))
continue;

for(size_t loc_i = 0; loc_i < locParticles.size(); ++loc_i)
Expand Down Expand Up @@ -1120,13 +1120,13 @@ string DCutAction_PIDDeltaT::Get_ActionName(void) const

bool DCutAction_PIDDeltaT::Perform_Action(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo)
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
//if dSystem = SYS_NULL, apply cut to all systems

auto locParticles = Get_UseKinFitResultsFlag() ? locParticleCombo->Get_FinalParticles(Get_Reaction(), false, false, d_AllCharges) : locParticleCombo->Get_FinalParticles_Measured(Get_Reaction(), d_AllCharges);
for(size_t loc_i = 0; loc_i < locParticles.size(); ++loc_i)
{
if((dPID != Unknown) && (locParticles[loc_i]->PID() != dPID))
if((dPID != UnknownParticle) && (locParticles[loc_i]->PID() != dPID))
continue;

auto locChargedHypo = dynamic_cast<const DChargedTrackHypothesis*>(locParticles[loc_i]);
Expand Down Expand Up @@ -1164,13 +1164,13 @@ string DCutAction_PIDTimingBeta::Get_ActionName(void) const

bool DCutAction_PIDTimingBeta::Perform_Action(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo)
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
//if dSystem = SYS_NULL, apply cut to all systems

auto locParticles = locParticleCombo->Get_FinalParticles_Measured(Get_Reaction(), d_AllCharges);
for(size_t loc_i = 0; loc_i < locParticles.size(); ++loc_i)
{
if((dPID != Unknown) && (locParticles[loc_i]->PID() != dPID))
if((dPID != UnknownParticle) && (locParticles[loc_i]->PID() != dPID))
continue;

auto locChargedHypo = dynamic_cast<const DChargedTrackHypothesis*>(locParticles[loc_i]);
Expand Down Expand Up @@ -1207,12 +1207,12 @@ string DCutAction_NoPIDHit::Get_ActionName(void) const

bool DCutAction_NoPIDHit::Perform_Action(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo)
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs

auto locParticles = locParticleCombo->Get_FinalParticles_Measured(Get_Reaction(), d_Charged);
for(size_t loc_i = 0; loc_i < locParticles.size(); ++loc_i)
{
if((dPID != Unknown) && (locParticles[loc_i]->PID() != dPID))
if((dPID != UnknownParticle) && (locParticles[loc_i]->PID() != dPID))
continue;
auto locChargedHypo = static_cast<const DChargedTrackHypothesis*>(locParticles[loc_i]);
if(locChargedHypo->t1_detector() == SYS_NULL)
Expand All @@ -1231,7 +1231,7 @@ string DCutAction_FlightDistance::Get_ActionName(void) const

bool DCutAction_FlightDistance::Perform_Action(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo)
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
// unused variable DKinFitType locKinFitType = Get_Reaction()->Get_KinFitType();

// for now, require a kinematic fit to make these selections, assuming that the common decay vertex
Expand All @@ -1258,7 +1258,7 @@ bool DCutAction_FlightDistance::Perform_Action(JEventLoop* locEventLoop, const D
const DParticleComboStep* locParticleComboStep = locParticleCombo->Get_ParticleComboStep(loc_i);
//auto locParticles = Get_UseKinFitResultsFlag() ? locParticleComboStep->Get_FinalParticles(Get_Reaction()->Get_ReactionStep(loc_i), false, false, d_AllCharges) : locParticleComboStep->Get_FinalParticles_Measured(Get_Reaction()->Get_ReactionStep(loc_i), d_AllCharges);

if((dPID != Unknown) && (locParticleComboStep->Get_InitialParticle()->PID() != dPID))
if((dPID != UnknownParticle) && (locParticleComboStep->Get_InitialParticle()->PID() != dPID))
continue;

// fill info on decaying particles, which is on the particle combo step level
Expand Down Expand Up @@ -1298,7 +1298,7 @@ string DCutAction_FlightSignificance::Get_ActionName(void) const

bool DCutAction_FlightSignificance::Perform_Action(JEventLoop* locEventLoop, const DParticleCombo* locParticleCombo)
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
// unused variable DKinFitType locKinFitType = Get_Reaction()->Get_KinFitType();

// for now, require a kinematic fit to make these selections, assuming that the common decay vertex
Expand All @@ -1325,7 +1325,7 @@ bool DCutAction_FlightSignificance::Perform_Action(JEventLoop* locEventLoop, con
const DParticleComboStep* locParticleComboStep = locParticleCombo->Get_ParticleComboStep(loc_i);
//auto locParticles = Get_UseKinFitResultsFlag() ? locParticleComboStep->Get_FinalParticles(Get_Reaction()->Get_ReactionStep(loc_i), false, false, d_AllCharges) : locParticleComboStep->Get_FinalParticles_Measured(Get_Reaction()->Get_ReactionStep(loc_i), d_AllCharges);

if((dPID != Unknown) && (locParticleComboStep->Get_InitialParticle()->PID() != dPID))
if((dPID != UnknownParticle) && (locParticleComboStep->Get_InitialParticle()->PID() != dPID))
continue;

// fill info on decaying particles, which is on the particle combo step level
Expand Down
22 changes: 11 additions & 11 deletions src/libraries/ANALYSIS/DCutActions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class DCutAction_InvariantMass : public DAnalysisAction
//call with step = 0, PIDs = pi+, pi-, and will histogram rho mass
DCutAction_InvariantMass(const DReaction* locReaction, size_t locStepIndex, deque<Particle_t> locToIncludePIDs, bool locUseKinFitResultsFlag, double locMinMass, double locMaxMass, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_InvariantMass", locUseKinFitResultsFlag, locActionUniqueString),
dInitialPID(Unknown), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}
dInitialPID(UnknownParticle), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}

string Get_ActionName(void) const;
void Initialize(JEventLoop* locEventLoop);
Expand Down Expand Up @@ -650,12 +650,12 @@ class DCutAction_TrackShowerEOverP : public DAnalysisAction

class DCutAction_PIDDeltaT : public DAnalysisAction
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
//if dSystem = SYS_NULL, apply cut to all systems

public:

DCutAction_PIDDeltaT(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locDeltaTCut, Particle_t locPID = Unknown, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
DCutAction_PIDDeltaT(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locDeltaTCut, Particle_t locPID = UnknownParticle, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_PIDDeltaT", locUseKinFitResultsFlag, locActionUniqueString),
dDeltaTCut(locDeltaTCut), dPID(locPID), dSystem(locSystem){}

Expand All @@ -674,13 +674,13 @@ class DCutAction_PIDDeltaT : public DAnalysisAction

class DCutAction_PIDTimingBeta : public DAnalysisAction
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs
//if dSystem = SYS_NULL, apply cut to all systems
//RECOMMENDED ONLY FOR CUTTING ON NEUTRALS (e.g. separating photons and neutrons)

public:

DCutAction_PIDTimingBeta(const DReaction* locReaction, double locMinBeta, double locMaxBeta, Particle_t locPID = Unknown, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
DCutAction_PIDTimingBeta(const DReaction* locReaction, double locMinBeta, double locMaxBeta, Particle_t locPID = UnknownParticle, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_PIDTimingBeta", false, locActionUniqueString),
dMinBeta(locMinBeta), dMaxBeta(locMaxBeta), dPID(locPID), dSystem(locSystem){}

Expand All @@ -700,11 +700,11 @@ class DCutAction_PIDTimingBeta : public DAnalysisAction

class DCutAction_NoPIDHit : public DAnalysisAction
{
//if dPID = Unknown, apply cut to all PIDs
//if dPID = UnknownParticle, apply cut to all PIDs

public:

DCutAction_NoPIDHit(const DReaction* locReaction, Particle_t locPID = Unknown, string locActionUniqueString = "") :
DCutAction_NoPIDHit(const DReaction* locReaction, Particle_t locPID = UnknownParticle, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_NoPIDHit", false, locActionUniqueString),
dPID(locPID){}

Expand Down Expand Up @@ -752,11 +752,11 @@ class DCutAction_OneVertexKinFit : public DAnalysisAction

class DCutAction_FlightDistance : public DAnalysisAction
{
//if dPID = Unknown, apply cut to all relevant PIDs
//if dPID = UnknownParticle, apply cut to all relevant PIDs

public:

DCutAction_FlightDistance(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locMinFlightDistance, Particle_t locPID = Unknown, string locActionUniqueString = "") :
DCutAction_FlightDistance(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locMinFlightDistance, Particle_t locPID = UnknownParticle, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_FlightDistance", locUseKinFitResultsFlag, locActionUniqueString),
dMinFlightDistance(locMinFlightDistance), dPID(locPID) {}

Expand All @@ -775,11 +775,11 @@ class DCutAction_FlightDistance : public DAnalysisAction

class DCutAction_FlightSignificance : public DAnalysisAction
{
//if dPID = Unknown, apply cut to all relevant PIDs
//if dPID = UnknownParticle, apply cut to all relevant PIDs

public:

DCutAction_FlightSignificance(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locMinFlightSignificance, Particle_t locPID = Unknown, string locActionUniqueString = "") :
DCutAction_FlightSignificance(const DReaction* locReaction, bool locUseKinFitResultsFlag, double locMinFlightSignificance, Particle_t locPID = UnknownParticle, string locActionUniqueString = "") :
DAnalysisAction(locReaction, "Cut_FlightSignificance", locUseKinFitResultsFlag, locActionUniqueString),
dMinFlightSignificance(locMinFlightSignificance), dPID(locPID) {}

Expand Down
8 changes: 4 additions & 4 deletions src/libraries/ANALYSIS/DEventWriterROOT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ TMap* DEventWriterROOT::Create_UserInfoMaps(DTreeBranchRegister& locBranchRegist
auto locFinalParticleIDs = locReactionStep->Get_FinalPIDs();

auto locTargetPID = locReactionStep->Get_TargetPID();
if(locTargetPID != Unknown)
if(locTargetPID != UnknownParticle)
{
if(locTargetParticleNumberMap.find(locTargetPID) == locTargetParticleNumberMap.end())
locTargetParticleNumberMap[locTargetPID] = 1;
Expand Down Expand Up @@ -351,7 +351,7 @@ TMap* DEventWriterROOT::Create_UserInfoMaps(DTreeBranchRegister& locBranchRegist

//Create map objects
map<Particle_t, unsigned int> locParticleNumberMap_Current, locDecayingParticleNumberMap_Current, locTargetParticleNumberMap_Current;
Particle_t locTargetPID = Unknown;
Particle_t locTargetPID = UnknownParticle;
TObjString *locObjString_PID, *locObjString_Position, *locObjString_ParticleName;
map<int, string> locDecayingParticleNames; //key is step index where they decay
for(size_t loc_i = 0; loc_i < locReaction->Get_NumReactionSteps(); ++loc_i)
Expand Down Expand Up @@ -395,7 +395,7 @@ TMap* DEventWriterROOT::Create_UserInfoMaps(DTreeBranchRegister& locBranchRegist

//target particle
Particle_t locTempTargetPID = locReactionStep->Get_TargetPID();
if(locTempTargetPID != Unknown)
if(locTempTargetPID != UnknownParticle)
{
locTargetPID = locTempTargetPID;

Expand Down Expand Up @@ -861,7 +861,7 @@ void DEventWriterROOT::Create_Branches_Combo(DTreeBranchRegister& locBranchRegis
//initial particle
Particle_t locInitialPID = locReactionStep->Get_InitialPID();
//should check to make sure the beam particle isn't missing...
if((loc_i == 0) && (locReactionStep->Get_InitialPID() != Unknown))
if((loc_i == 0) && (locReactionStep->Get_InitialPID() != UnknownParticle))
Create_Branches_BeamComboParticle(locBranchRegister, locInitialPID, locKinFitType);
else //decaying
{
Expand Down
Loading