refactor(Stack): Use more GetParticle

ChristianTackeGSI · ChristianTackeGSI · commit 5769b5af6587 · 2024-09-30T22:04:42.000+02:00
GetParticle is thin wrapper. Let's use it more.
diff --git a/examples/common/mcstack/FairStack.cxx b/examples/common/mcstack/FairStack.cxx
@@ -167,7 +167,7 @@ TParticle* FairStack::PopPrimaryForTracking(Int_t iPrim)
 
     // Return the iPrim-th TParticle from the fParticle array. This should be
     // a primary.
-    TParticle* part = static_cast<TParticle*>(fParticles->At(iPrim));
+    TParticle* part = GetParticle(iPrim);
     if (!(part->GetMother(0) < 0)) {
         LOG(fatal) << "Not a primary track!" << iPrim;
     }
diff --git a/templates/project_root_containers/MyProjData/MyProjStack.cxx b/templates/project_root_containers/MyProjData/MyProjStack.cxx
@@ -207,7 +207,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)
 
     // Return the iPrim-th TParticle from the fParticle array. This should be
     // a primary.
-    TParticle* part = (TParticle*)fParticles->At(iPrim);
+    TParticle* part = GetParticle(iPrim);
     if (!(part->GetMother(0) < 0)) {
         LOG(fatal) << "MyProjStack:: Not a primary track! " << iPrim;
     }
@@ -425,7 +425,7 @@ TParticle* MyProjStack::GetParticle(Int_t trackID) const
     if (trackID < 0 || trackID >= fNParticles) {
         LOG(fatal) << "MyProjStack: Particle index " << trackID << " out of range.";
     }
-    return (TParticle*)fParticles->At(trackID);
+    return static_cast<TParticle*>(fParticles->At(trackID));
 }
 // -------------------------------------------------------------------------
 
diff --git a/templates/project_stl_containers/MyProjData/MyProjStack.cxx b/templates/project_stl_containers/MyProjData/MyProjStack.cxx
@@ -207,7 +207,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)
 
     // Return the iPrim-th TParticle from the fParticle array. This should be
     // a primary.
-    TParticle* part = (TParticle*)fParticles->At(iPrim);
+    TParticle* part = GetParticle(iPrim);
     if (!(part->GetMother(0) < 0)) {
         LOG(fatal) << "MyProjStack:: Not a primary track! " << iPrim;
     }
@@ -430,7 +430,7 @@ TParticle* MyProjStack::GetParticle(Int_t trackID) const
     if (trackID < 0 || trackID >= fNParticles) {
         LOG(fatal) << "MyProjStack: Particle index " << trackID << " out of range.";
     }
-    return (TParticle*)fParticles->At(trackID);
+    return static_cast<TParticle*>(fParticles->At(trackID));
 }
 // -------------------------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ TParticle* FairStack::PopPrimaryForTracking(Int_t iPrim)`
`167`	`167`
`168`	`168`	`// Return the iPrim-th TParticle from the fParticle array. This should be`
`169`	`169`	`// a primary.`
`170`		`- TParticle* part = static_cast<TParticle*>(fParticles->At(iPrim));`
	`170`	`+ TParticle* part = GetParticle(iPrim);`
`171`	`171`	`if (!(part->GetMother(0) < 0)) {`
`172`	`172`	`LOG(fatal) << "Not a primary track!" << iPrim;`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)`
`207`	`207`
`208`	`208`	`// Return the iPrim-th TParticle from the fParticle array. This should be`
`209`	`209`	`// a primary.`
`210`		`- TParticle* part = (TParticle*)fParticles->At(iPrim);`
	`210`	`+ TParticle* part = GetParticle(iPrim);`
`211`	`211`	`if (!(part->GetMother(0) < 0)) {`
`212`	`212`	`LOG(fatal) << "MyProjStack:: Not a primary track! " << iPrim;`
`213`	`213`	`}`
`@@ -425,7 +425,7 @@ TParticle* MyProjStack::GetParticle(Int_t trackID) const`
`425`	`425`	`if (trackID < 0 \|\| trackID >= fNParticles) {`
`426`	`426`	`LOG(fatal) << "MyProjStack: Particle index " << trackID << " out of range.";`
`427`	`427`	`}`
`428`		`- return (TParticle*)fParticles->At(trackID);`
	`428`	`+ return static_cast<TParticle*>(fParticles->At(trackID));`
`429`	`429`	`}`
`430`	`430`	`// -------------------------------------------------------------------------`
`431`	`431`