Skip to content

Commit bee446f

Browse files
aaustaaust
authored
Merge pull request #178 from JeffersonLab/aaust_UnknownParticle
Replaced Unknown with UnknownParticle to be consistent with hddm v5
2 parents 63d841b + 5709899 commit bee446f

16 files changed

+63
-63
lines changed

‎libraries/DSelector/DAnalysisUtilities.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TLorentzVector DAnalysisUtilities::Calc_MissingP4(const DParticleCombo* locParti
3131
{
3232
//initial particle
3333
DKinematicData* locKinematicData = locParticleComboStepWrapper->Get_InitialParticle();
34-
locSourceObjects[Unknown].insert(locKinematicData->Get_ID()); //Unknown for beam: don't mix with final-state photons //not ideal, but easy
34+
locSourceObjects[UnknownParticle].insert(locKinematicData->Get_ID()); //UnknownParticle for beam: don't mix with final-state photons //not ideal, but easy
3535
if(!locUseKinFitDataFlag) //measured
3636
locMissingP4 += locKinematicData->Get_P4_Measured();
3737
else
@@ -40,7 +40,7 @@ TLorentzVector DAnalysisUtilities::Calc_MissingP4(const DParticleCombo* locParti
4040

4141
//target particle
4242
Particle_t locTargetPID = locParticleComboStepWrapper->Get_TargetPID();
43-
if(locTargetPID != Unknown)
43+
if(locTargetPID != UnknownParticle)
4444
{
4545
double locMass = ParticleMass(locTargetPID);
4646
locMissingP4 += TLorentzVector(TVector3(0.0, 0.0, 0.0), locMass);
@@ -105,7 +105,7 @@ TLorentzVector DAnalysisUtilities::Calc_FinalStateP4(const DParticleCombo* locPa
105105
if(locStepIndex != 0)
106106
{
107107
Particle_t locPID = locParticleComboStepWrapper->Get_TargetPID();
108-
if(locPID != Unknown)
108+
if(locPID != UnknownParticle)
109109
locFinalStateP4 -= TLorentzVector(TVector3(0.0, 0.0, 0.0), ParticleMass(locPID));
110110
}
111111

‎libraries/DSelector/DBeamParticle.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DBeamParticle : public DKinematicData
2424

2525
public:
2626

27-
DBeamParticle(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = Unknown);
27+
DBeamParticle(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = UnknownParticle);
2828
~DBeamParticle(void){}
2929

3030
Bool_t Get_IsGenerator(void) const;

‎libraries/DSelector/DChargedTrackHypothesis.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DChargedTrackHypothesis : public DKinematicData
2424

2525
public:
2626

27-
DChargedTrackHypothesis(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = Unknown);
27+
DChargedTrackHypothesis(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = UnknownParticle);
2828
~DChargedTrackHypothesis(void){}
2929

3030
//IDENTIFIERS / MATCHING

‎libraries/DSelector/DCutActions.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ bool DCutAction_PIDDeltaT::Perform_Action(void)
217217
if(locDecayStepIndex != -2)
218218
continue; //not measured
219219

220-
if((dPID != Unknown) && (locKinematicData->Get_PID() != dPID))
220+
if((dPID != UnknownParticle) && (locKinematicData->Get_PID() != dPID))
221221
continue;
222222

223223
// determine detector system
@@ -292,7 +292,7 @@ bool DCutAction_PIDBeta::Perform_Action(void)
292292
if(locDecayStepIndex != -2)
293293
continue; //not measured
294294

295-
if((dPID != Unknown) && (locKinematicData->Get_PID() != dPID))
295+
if((dPID != UnknownParticle) && (locKinematicData->Get_PID() != dPID))
296296
continue;
297297

298298
// determine detector system
@@ -355,7 +355,7 @@ bool DCutAction_NoPIDHit::Perform_Action(void)
355355
if(locDecayStepIndex != -2)
356356
continue; //not measured
357357

358-
if((dPID != Unknown) && (locKinematicData->Get_PID() != dPID))
358+
if((dPID != UnknownParticle) && (locKinematicData->Get_PID() != dPID))
359359
continue;
360360

361361
// determine detector system
@@ -407,7 +407,7 @@ bool DCutAction_PIDFOM::Perform_Action(void)
407407
if(locDecayStepIndex != -2)
408408
continue; //not measured
409409

410-
if((locKinematicData->Get_PID() != dParticleID) && (dParticleID != Unknown))
410+
if((locKinematicData->Get_PID() != dParticleID) && (dParticleID != UnknownParticle))
411411
continue;
412412
if(locKinematicData->Get_PID() != 0 && ParticleCharge(locKinematicData->Get_PID()) != 0)
413413
{
@@ -536,7 +536,7 @@ bool DCutAction_dEdx::Perform_Action(void)
536536
continue; //not measured
537537

538538
Particle_t locPID = locKinematicData->Get_PID();
539-
if((dPID != Unknown) && (locPID != dPID))
539+
if((dPID != UnknownParticle) && (locPID != dPID))
540540
continue;
541541

542542
const DChargedTrackHypothesis* locChargedTrackHypothesis = dynamic_cast<const DChargedTrackHypothesis*>(locKinematicData);
@@ -662,7 +662,7 @@ bool DCutAction_InvariantMass::Perform_Action(void)
662662
for(size_t loc_i = 0; loc_i < dParticleComboWrapper->Get_NumParticleComboSteps(); ++loc_i)
663663
{
664664
const DParticleComboStep* locComboWrapperStep = dParticleComboWrapper->Get_ParticleComboStep(loc_i);
665-
if((dInitialPID != Unknown) && (locComboWrapperStep->Get_InitialPID() != dInitialPID))
665+
if((dInitialPID != UnknownParticle) && (locComboWrapperStep->Get_InitialPID() != dInitialPID))
666666
continue;
667667
if((dStepIndex != -1) && (int(loc_i) != dStepIndex))
668668
continue;
@@ -701,7 +701,7 @@ bool DCutAction_InvariantMassVeto::Perform_Action(void)
701701
for(size_t loc_i = 0; loc_i < dParticleComboWrapper->Get_NumParticleComboSteps(); ++loc_i)
702702
{
703703
const DParticleComboStep* locComboWrapperStep = dParticleComboWrapper->Get_ParticleComboStep(loc_i);
704-
if((dInitialPID != Unknown) && (locComboWrapperStep->Get_InitialPID() != dInitialPID))
704+
if((dInitialPID != UnknownParticle) && (locComboWrapperStep->Get_InitialPID() != dInitialPID))
705705
continue;
706706
if((dStepIndex != -1) && (int(loc_i) != dStepIndex))
707707
continue;
@@ -941,7 +941,7 @@ bool DCutAction_Kinematics::Perform_Action(void)
941941
continue; //e.g. a decaying or missing particle whose params aren't set yet
942942

943943
Particle_t locPID = locKinematicData->Get_PID();
944-
if((locPID != dPID) && (dPID != Unknown))
944+
if((locPID != dPID) && (dPID != UnknownParticle))
945945
continue;
946946

947947
TLorentzVector locP4 = dUseKinFitFlag ? locKinematicData->Get_P4() : locKinematicData->Get_P4_Measured();

‎libraries/DSelector/DCutActions.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class DCutAction_ChiSqOrCL : public DAnalysisAction
8080
class DCutAction_PIDDeltaT : public DAnalysisAction
8181
{
8282
public:
83-
DCutAction_PIDDeltaT(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, double locDeltaTCut, Particle_t locPID = Unknown, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
83+
DCutAction_PIDDeltaT(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, double locDeltaTCut, Particle_t locPID = UnknownParticle, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
8484
DAnalysisAction(locParticleComboWrapper, "Cut_PIDDeltaT", locUseKinFitFlag, locActionUniqueString),
8585
dFunc_PIDCut_SelectPositive(nullptr), dFunc_PIDCut_SelectNegative(nullptr), dDeltaTCut(locDeltaTCut), dPID(locPID), dSystem(locSystem) {}
8686

@@ -102,7 +102,7 @@ class DCutAction_PIDDeltaT : public DAnalysisAction
102102
class DCutAction_PIDBeta : public DAnalysisAction
103103
{
104104
public:
105-
DCutAction_PIDBeta(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, double locMinBetaCut, double locMaxBetaCut, Particle_t locPID = Unknown, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
105+
DCutAction_PIDBeta(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, double locMinBetaCut, double locMaxBetaCut, Particle_t locPID = UnknownParticle, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
106106
DAnalysisAction(locParticleComboWrapper, "Cut_PIDBeta", locUseKinFitFlag, locActionUniqueString),
107107
dFunc_BetaCut_SelectPositive(nullptr), dFunc_BetaCut_SelectNegative(nullptr), dMinBetaCut(locMinBetaCut), dMaxBetaCut(locMaxBetaCut), dPID(locPID), dSystem(locSystem) {}
108108

@@ -123,7 +123,7 @@ class DCutAction_PIDBeta : public DAnalysisAction
123123
class DCutAction_NoPIDHit : public DAnalysisAction
124124
{
125125
public:
126-
DCutAction_NoPIDHit(const DParticleCombo* locParticleComboWrapper, Particle_t locPID = Unknown, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
126+
DCutAction_NoPIDHit(const DParticleCombo* locParticleComboWrapper, Particle_t locPID = UnknownParticle, DetectorSystem_t locSystem = SYS_NULL, string locActionUniqueString = "") :
127127
DAnalysisAction(locParticleComboWrapper, "Cut_NoPIDHit", false, locActionUniqueString),
128128
dPID(locPID), dSystem(locSystem) {}
129129

@@ -379,7 +379,7 @@ class DCutAction_InvariantMass : public DAnalysisAction
379379
//call with step = 0, PIDs = pi+, pi-, and will histogram rho mass
380380
DCutAction_InvariantMass(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, size_t locStepIndex, deque<Particle_t> locToIncludePIDs, double locMinMass, double locMaxMass, string locActionUniqueString = "") :
381381
DAnalysisAction(locParticleComboWrapper, "Cut_InvariantMass", locUseKinFitFlag, locActionUniqueString),
382-
dInitialPID(Unknown), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}
382+
dInitialPID(UnknownParticle), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}
383383

384384
string Get_ActionName(void) const;
385385
void Initialize(void){};
@@ -407,7 +407,7 @@ class DCutAction_InvariantMassVeto : public DAnalysisAction
407407
//call with step = 0, PIDs = pi+, pi-, and will histogram rho mass
408408
DCutAction_InvariantMassVeto(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, size_t locStepIndex, deque<Particle_t> locToIncludePIDs, double locMinMass, double locMaxMass, string locActionUniqueString = "") :
409409
DAnalysisAction(locParticleComboWrapper, "Cut_InvariantMassVeto", locUseKinFitFlag, locActionUniqueString),
410-
dInitialPID(Unknown), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}
410+
dInitialPID(UnknownParticle), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs), dMinMass(locMinMass), dMaxMass(locMaxMass){}
411411

412412
string Get_ActionName(void) const;
413413
void Initialize(void){};
@@ -491,7 +491,7 @@ class DCutAction_Kinematics : public DAnalysisAction
491491
{
492492
//input range is what is cut: cut is ignored if min > max
493493
//if step index == -1: all steps
494-
//if PID == Unknown: all particles
494+
//if PID == UnknownParticle: all particles
495495
//particle must be detected
496496
//angles in degrees
497497
public:

‎libraries/DSelector/DHistogramActions.cc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void DHistogramAction_AnalyzeCutActions::Initialize(void)
1111
string locHistName = "InvariantMass";
1212
string locParticleNamesForHist = "";
1313

14-
if(dInitialPID != Unknown)
14+
if(dInitialPID != UnknownParticle)
1515
locParticleNamesForHist = dParticleComboWrapper->Get_DecayChainFinalParticlesROOTNames(dInitialPID, dUseKinFitFlag);
1616
else
1717
{
@@ -224,7 +224,7 @@ void DHistogramAction_ParticleComboKinematics::Create_Hists(int locStepIndex, st
224224
{
225225
string locParticleROOTName = ParticleName_ROOT(locPID);
226226
string locHistName, locHistTitle;
227-
Particle_t locFillPID = locIsBeamFlag ? Unknown : locPID;
227+
Particle_t locFillPID = locIsBeamFlag ? UnknownParticle : locPID;
228228

229229
// Momentum
230230
double locMaxP = locIsBeamFlag ? dMaxBeamE : dMaxP;
@@ -311,7 +311,7 @@ bool DHistogramAction_ParticleComboKinematics::Perform_Action(void)
311311
if(locInitialPID == Gamma)
312312
{
313313
//check if will be duplicate
314-
set<Int_t>& locParticleSet = dPreviouslyHistogrammed[loc_i][Unknown];
314+
set<Int_t>& locParticleSet = dPreviouslyHistogrammed[loc_i][UnknownParticle];
315315
if(locParticleSet.find(locKinematicData->Get_ID()) == locParticleSet.end())
316316
{
317317
double locRFTime = dUseKinFitFlag ? dParticleComboWrapper->Get_RFTime() : dParticleComboWrapper->Get_RFTime_Measured();
@@ -431,10 +431,10 @@ void DHistogramAction_ParticleComboKinematics::Fill_BeamHists(const DKinematicDa
431431
double locP = locP4.P();
432432
double locDeltaTRF = locX4.T() - (locRFTime + (locX4.Z() - dTargetCenterZ)/29.9792458);
433433

434-
dHistMap_P[0][Unknown]->Fill(locP);
435-
dHistMap_VertexZ[0][Unknown]->Fill(locX4.Z());
436-
dHistMap_VertexYVsX[0][Unknown]->Fill(locX4.X(), locX4.Y());
437-
dHistMap_VertexT[0][Unknown]->Fill(locX4.T());
434+
dHistMap_P[0][UnknownParticle]->Fill(locP);
435+
dHistMap_VertexZ[0][UnknownParticle]->Fill(locX4.Z());
436+
dHistMap_VertexYVsX[0][UnknownParticle]->Fill(locX4.X(), locX4.Y());
437+
dHistMap_VertexT[0][UnknownParticle]->Fill(locX4.T());
438438
dBeamParticleHist_DeltaTRF->Fill(locDeltaTRF);
439439
dBeamParticleHist_DeltaTRFVsBeamE->Fill(locP4.E(), locDeltaTRF);
440440
}
@@ -961,7 +961,7 @@ void DHistogramAction_InvariantMass::Initialize(void)
961961
double locMassPerBin = 1000.0*(dMaxMass - dMinMass)/((double)dNumMassBins);
962962

963963
string locParticleNamesForHist = "";
964-
if(dInitialPID != Unknown)
964+
if(dInitialPID != UnknownParticle)
965965
locParticleNamesForHist = dParticleComboWrapper->Get_DecayChainFinalParticlesROOTNames(dInitialPID, dUseKinFitFlag);
966966
else
967967
{
@@ -1005,7 +1005,7 @@ bool DHistogramAction_InvariantMass::Perform_Action(void)
10051005
for(size_t loc_i = 0; loc_i < dParticleComboWrapper->Get_NumParticleComboSteps(); ++loc_i)
10061006
{
10071007
const DParticleComboStep* locParticleComboStepWrapper = dParticleComboWrapper->Get_ParticleComboStep(loc_i);
1008-
if((dInitialPID != Unknown) && (locParticleComboStepWrapper->Get_InitialPID() != dInitialPID))
1008+
if((dInitialPID != UnknownParticle) && (locParticleComboStepWrapper->Get_InitialPID() != dInitialPID))
10091009
continue;
10101010
if((dStepIndex != -1) && (int(loc_i) != dStepIndex))
10111011
continue;
@@ -1582,7 +1582,7 @@ bool DHistogramAction_vanHove::Perform_Action(void)
15821582
DKinematicData* locBeamParticle = locParticleComboStepWrapper->Get_InitialParticle();
15831583
Int_t locBeamID = locBeamParticle->Get_ID();
15841584
map<unsigned int, set<Int_t> > locBeamObject;
1585-
locBeamObject[Unknown].insert(locBeamID);
1585+
locBeamObject[UnknownParticle].insert(locBeamID);
15861586

15871587
TLorentzVector locBeam_P4;
15881588
if(dUseKinFitFlag){
@@ -1662,7 +1662,7 @@ bool DHistogramAction_vanHoveFour::Perform_Action(void)
16621662
DKinematicData* locBeamParticle = locParticleComboStepWrapper->Get_InitialParticle();
16631663
Int_t locBeamID = locBeamParticle->Get_ID();
16641664
map<unsigned int, set<Int_t> > locBeamObject;
1665-
locBeamObject[Unknown].insert(locBeamID);
1665+
locBeamObject[UnknownParticle].insert(locBeamID);
16661666

16671667
TLorentzVector locBeam_P4;
16681668
if(dUseKinFitFlag){

‎libraries/DSelector/DHistogramActions.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DHistogramAction_AnalyzeCutActions : public DAnalysisAction
3333
public:
3434
DHistogramAction_AnalyzeCutActions(vector<DAnalysisAction*> locAllAnalysisActions, const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, size_t locStepIndex, deque<Particle_t> locToIncludePIDs, unsigned int locNumMassBins, double locMinMass, double locMaxMass, string locActionUniqueString = "") :
3535
DAnalysisAction(locParticleComboWrapper, "Hist_AnalyzeCutActions", locUseKinFitFlag, locActionUniqueString),
36-
dAllAnalysisActions(locAllAnalysisActions), dInitialPID(Unknown), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs),
36+
dAllAnalysisActions(locAllAnalysisActions), dInitialPID(UnknownParticle), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs),
3737
dNumMassBins(locNumMassBins), dMinMass(locMinMass), dMaxMass(locMaxMass) {}
3838

3939
void Reset_NewEvent(void){dPreviouslyHistogrammed.clear();}; //reset uniqueness tracking
@@ -94,7 +94,7 @@ class DHistogramAction_ParticleComboKinematics : public DAnalysisAction
9494
TH1I* dBeamParticleHist_DeltaTRF;
9595
TH2I* dBeamParticleHist_DeltaTRFVsBeamE;
9696

97-
//keys are step index, PID //beam has PID Unknown
97+
//keys are step index, PID //beam has PID UnknownParticle
9898
map<size_t, map<Particle_t, TH2I*> > dHistMap_PVsTheta;
9999
map<size_t, map<Particle_t, TH2I*> > dHistMap_BetaVsP;
100100
map<size_t, map<Particle_t, TH2I*> > dHistMap_DeltaBetaVsP;
@@ -198,7 +198,7 @@ class DHistogramAction_ParticleID : public DAnalysisAction
198198
void Fill_Hists(const DKinematicData* locKinematicData, size_t locStepIndex);
199199
void Fill_BackgroundHists(size_t locStepIndex, Particle_t locFinalStatePID);
200200

201-
//keys are step index, PID //beam has PID Unknown
201+
//keys are step index, PID //beam has PID UnknownParticle
202202
map<size_t, map<Particle_t, TH2I*> > dHistMap_dEdxVsP_CDC;
203203
map<size_t, map<Particle_t, TH2I*> > dHistMap_dEdxVsP_CDC_integral;
204204
map<size_t, map<Particle_t, TH2I*> > dHistMap_dEdxVsP_FDC;
@@ -264,7 +264,7 @@ class DHistogramAction_PIDFOM : public DAnalysisAction
264264
void Create_Hists(int locStepIndex, Particle_t locPID, string locStepROOTName);
265265
void Fill_Hists(const DKinematicData* locKinematicData, size_t locStepIndex);
266266

267-
//keys are step index, PID //beam has PID Unknown
267+
//keys are step index, PID //beam has PID UnknownParticle
268268
map<size_t, map<Particle_t, TH1I*> > dHistMap_PIDFOM;
269269

270270
map<size_t, map<Particle_t, set<Int_t> > > dPreviouslyHistogrammed; //step index, PID, particle indices
@@ -284,7 +284,7 @@ class DHistogramAction_InvariantMass : public DAnalysisAction
284284
//call with step = 0, PIDs = pi+, pi-, and will histogram rho mass
285285
DHistogramAction_InvariantMass(const DParticleCombo* locParticleComboWrapper, bool locUseKinFitFlag, size_t locStepIndex, deque<Particle_t> locToIncludePIDs, unsigned int locNumMassBins, double locMinMass, double locMaxMass, string locActionUniqueString = "") :
286286
DAnalysisAction(locParticleComboWrapper, "Hist_InvariantMass", locUseKinFitFlag, locActionUniqueString),
287-
dInitialPID(Unknown), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs),
287+
dInitialPID(UnknownParticle), dStepIndex(locStepIndex), dToIncludePIDs(locToIncludePIDs),
288288
dNumMassBins(locNumMassBins), dNum2DMassBins(locNumMassBins/2), dMinMass(locMinMass), dMaxMass(locMaxMass),
289289
dNum2DBeamEBins(500), dMinBeamE(2.0), dMaxBeamE(12.0),
290290
dNumConLevBins(1000), dNumBinsPerConLevPower(18), dConLevLowest10Power(-50) {}

‎libraries/DSelector/DKinematicData.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void DKinematicData::Setup_Branches(void)
1515
dX4_Measured = nullptr;
1616

1717
//PID
18-
if(dPID == Unknown)
18+
if(dPID == UnknownParticle)
1919
{
2020
locBranchName = dBranchNamePrefix + string("__PID");
2121
dBranch_PID = dTreeInterface->Get_Branch(locBranchName);

‎libraries/DSelector/DKinematicData.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class DKinematicData
2626

2727
public:
2828

29-
//locPID should be set for combo particles, and Unknown otherwise
30-
DKinematicData(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = Unknown);
29+
//locPID should be set for combo particles, and UnknownParticle otherwise
30+
DKinematicData(DTreeInterface* locTreeInterface, string locBranchNamePrefix, Particle_t locPID = UnknownParticle);
3131
virtual ~DKinematicData(void){}
3232

3333
//GET PID & KINEMATIC DATA
@@ -94,8 +94,8 @@ class DKinematicData
9494
TBranch* dBranch_MeasuredIndex;
9595

9696
// Particle ID
97-
// If fixed, get from dPID //else is Unknown
98-
Particle_t dPID; //if Unknown, get from dBranch_PID
97+
// If fixed, get from dPID //else is UnknownParticle
98+
Particle_t dPID; //if UnknownParticle, get from dBranch_PID
9999
// If not fixed: ChargedHypo, Thrown: varies from particle to particle: must get from branch
100100
TBranch* dBranch_PID;
101101

@@ -121,7 +121,7 @@ dTreeInterface(locTreeInterface), dBranchNamePrefix(locBranchNamePrefix), dMeasu
121121
dArraySize(NULL), dArrayIndex(0), dMeasuredArrayIndex(0), dBranch_MeasuredIndex(NULL), dPID(locPID), dBranch_PID(NULL),
122122
dP4_KinFit(NULL), dP4_Measured(NULL), dFixedP4(TLorentzVector()), dThrownBeamP4(NULL), dX4_KinFit(NULL), dX4_Measured(NULL), dThrownBeamX4(NULL), dBranch_PathLengthSigma(NULL)
123123
{
124-
//locPID should be set for combo particles, and Unknown otherwise
124+
//locPID should be set for combo particles, and UnknownParticle otherwise
125125
Setup_Branches();
126126
}
127127

@@ -164,7 +164,7 @@ inline bool DKinematicData::Get_IsDetectedComboNeutralParticle(void) const
164164
//PID
165165
inline Particle_t DKinematicData::Get_PID(void) const
166166
{
167-
if(dPID != Unknown)
167+
if(dPID != UnknownParticle)
168168
return dPID;
169169
Int_t locPID_PDG = ((Int_t*)dBranch_PID->GetAddress())[dArrayIndex];
170170
return PDGtoPType(locPID_PDG);

‎libraries/DSelector/DMCThrown.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class DMCThrown : public DKinematicData
5454
/******************************************************************** CONSTRUCTOR *********************************************************************/
5555

5656
inline DMCThrown::DMCThrown(DTreeInterface* locTreeInterface) :
57-
DKinematicData(locTreeInterface, "Thrown", Unknown)
57+
DKinematicData(locTreeInterface, "Thrown", UnknownParticle)
5858
{
5959
Setup_Branches();
6060
}

0 commit comments

Comments
 (0)