From 787f3e17ef931c739f86af59c0501c9fe4648f93 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <zviwood@gmail.com>
Date: Sun, 22 Feb 2015 23:06:49 -0500
Subject: [PATCH] Declare some TClonesArrays local. Neg-Pos typo fix.
---
src/THcHodoscope.cxx | 15 +++++++--------
src/THcHodoscope.h | 5 -----
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index a9ee3ff..c98b230 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -806,6 +806,10 @@ Int_t THcHodoscope::FineProcess( TClonesArray& tracks )
for(Int_t ip = 0; ip < fNPlanes; ip++ ) {
fNScinHits[ip] = fPlanes[ip]->GetNScinHits();
+ TClonesArray* scinPosADC = fPlanes[ip]->GetPosADC();
+ TClonesArray* scinNegADC = fPlanes[ip]->GetNegADC();
+ TClonesArray* scinPosTDC = fPlanes[ip]->GetPosTDC();
+ TClonesArray* scinNegTDC = fPlanes[ip]->GetNegTDC();
// first loop over hits with in a single plane
fTOFPInfo.clear();
@@ -821,11 +825,6 @@ Int_t THcHodoscope::FineProcess( TClonesArray& tracks )
fTOFPInfo[iphit].scin_pos_time = 0.0;
fTOFPInfo[iphit].scin_neg_time = 0.0;
- scinPosADC = fPlanes[ip]->GetPosADC();
- scinNegADC = fPlanes[ip]->GetNegADC();
- scinPosTDC = fPlanes[ip]->GetPosTDC();
- scinNegTDC = fPlanes[ip]->GetNegTDC();
-
Int_t paddle = ((THcSignalHit*)scinPosTDC->At(iphit))->GetPaddleNumber()-1;
Double_t xHitCoord = theTrack->GetX() + theTrack->GetTheta() *
@@ -1273,13 +1272,13 @@ Int_t THcHodoscope::FineProcess( TClonesArray& tracks )
if (!fPlanes[ip])
return -1;
- scinPosTDC = fPlanes[ip]->GetPosTDC();
- scinNegTDC = fPlanes[ip]->GetNegTDC();
+ TClonesArray* scinPosTDC = fPlanes[ip]->GetPosTDC();
+ TClonesArray* scinNegTDC = fPlanes[ip]->GetNegTDC();
fNScinHits[ip] = fPlanes[ip]->GetNScinHits();
for (Int_t iphit = 0; iphit < fNScinHits[ip]; iphit++ ){
Int_t paddlePos = ((THcSignalHit*)scinPosTDC->At(iphit))->GetPaddleNumber()-1;
- Int_t paddleNeg = ((THcSignalHit*)scinPosTDC->At(iphit))->GetPaddleNumber()-1;
+ Int_t paddleNeg = ((THcSignalHit*)scinNegTDC->At(iphit))->GetPaddleNumber()-1;
if ( paddlePos != paddleNeg )
return -1;
diff --git a/src/THcHodoscope.h b/src/THcHodoscope.h
index 2c2f0ee..03de4a3 100644
--- a/src/THcHodoscope.h
+++ b/src/THcHodoscope.h
@@ -200,11 +200,6 @@ protected:
Bool_t* fGoodPlaneTime; // [fNPlanes]
- TClonesArray* scinPosADC;
- TClonesArray* scinNegADC;
- TClonesArray* scinPosTDC;
- TClonesArray* scinNegTDC;
-
//----------------------------------------------------------------
// Useful derived quantities
--
GitLab