diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index b9ea0ad92b43cdab869143635b543b7d62741cf7..7c5b9b005239770d96971aabfb5f7ef104db8823 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -994,8 +994,8 @@ Float_t THcShower::GetShEnergy(THaTrack* Track) {
// Track coordinates at front of the calorimeter, initialize out of
// acceptance.
- Double_t Xtr = -75.;
- Double_t Ytr = -40.;
+ Double_t Xtr = -100.;
+ Double_t Ytr = -100.;
// Associate a cluster to the track.
diff --git a/src/THcShowerArray.cxx b/src/THcShowerArray.cxx
index 5f8d8484af0dafffe782921601e5398ef5369e96..6cd59e667dbd97a5507a33c5f77c1e4ca2ff9985 100644
--- a/src/THcShowerArray.cxx
+++ b/src/THcShowerArray.cxx
@@ -90,7 +90,7 @@ Int_t THcShowerArray::ReadDatabase( const TDatime& date )
cout << "Parent name: " << GetParent()->GetPrefix() << endl;
fNRows=fNColumns=0;
fXFront=fYFront=fZFront=0.;
- fXStep=fYStep=0.;
+ fXStep=fYStep=fZSize=0.;
fUsingFADC=0;
fPedSampLow=0;
fPedSampHigh=9;
@@ -104,6 +104,7 @@ Int_t THcShowerArray::ReadDatabase( const TDatime& date )
{"cal_arr_front_z", &fZFront, kDouble},
{"cal_arr_xstep", &fXStep, kDouble},
{"cal_arr_ystep", &fYStep, kDouble},
+ {"cal_arr_zsize", &fZSize, kDouble},
{"cal_using_fadc", &fUsingFADC, kInt, 0, 1},
{"cal_ped_sample_low", &fPedSampLow, kInt, 0, 1},
{"cal_ped_sample_high", &fPedSampHigh, kInt, 0, 1},
@@ -151,6 +152,8 @@ Int_t THcShowerArray::ReadDatabase( const TDatime& date )
cout << " Block to block X and Y distances: " << fXStep << ", " << fYStep
<< " cm" << endl;
+ cout << " Block size along Z: " << fZSize << " cm" << endl;
+
cout << "Block X coordinates:" << endl;
for (UInt_t i=0; i<fNRows; i++) {
for (UInt_t j=0; j<fNColumns; j++) {
@@ -420,6 +423,114 @@ Int_t THcShowerArray::CoarseProcess( TClonesArray& tracks )
return 0;
}
+//-----------------------------------------------------------------------------
+
+Int_t THcShowerArray::MatchCluster(THaTrack* Track,
+ Double_t& XTrFront, Double_t& YTrFront)
+{
+ // Match an Array cluster to a given track. Return the cluster number,
+ // and track coordinates at the front of Array.
+
+ XTrFront = kBig;
+ YTrFront = kBig;
+ Double_t pathl = kBig;
+
+ // Track interception with face of Array. The coordinates are
+ // in the Array's local system.
+
+ fOrigin = this->GetOrigin();
+
+ THcShower* fParent = (THcShower*) GetParent();
+
+ fParent->CalcTrackIntercept(Track, pathl, XTrFront, YTrFront);
+
+ // Transform coordiantes to the spectrometer's coordinate system.
+
+ XTrFront += GetOrigin().X();
+ YTrFront += GetOrigin().Y();
+
+ Bool_t inFidVol = true; // In Fiducial Volume flag
+
+ // Re-evaluate Fid. Volume Flag if fid. volume test is requested
+
+ if (fParent->fvTest) {
+
+ // Track coordinates at the back of the detector.
+
+ // Origin at the back of counter.
+ fOrigin.SetXYZ(GetOrigin().X(), GetOrigin().Y(), GetOrigin().Z() + fZSize);
+
+ Double_t XTrBack = kBig;
+ Double_t YTrBack = kBig;
+
+ fParent->CalcTrackIntercept(Track, pathl, XTrBack, YTrBack);
+
+ XTrBack += GetOrigin().X(); // from local coord. system
+ YTrBack += GetOrigin().Y(); // to the spectrometer system
+
+ inFidVol = (XTrFront <= fParent->fvXmax) && (XTrFront >= fParent->fvXmin) &&
+ (YTrFront <= fParent->fvYmax) && (YTrFront >= fParent->fvYmin) &&
+ (XTrBack <= fParent->fvXmax) && (XTrBack >= fParent->fvXmin) &&
+ (YTrBack <= fParent->fvYmax) && (YTrBack >= fParent->fvYmin);
+
+ }
+
+ // Match a cluster to the track.
+
+ Int_t mclust = -1; // The match cluster #, initialize with a bogus value.
+ Double_t Delta = kBig; // Track to cluster distance
+
+ if (inFidVol) {
+
+ // Since hits and clusters are in reverse order (with respect to Engine),
+ // search backwards to be consistent with Engine.
+ //
+ for (Int_t i=fNclust-1; i>-1; i--) {
+
+ THcShowerCluster* cluster = *(fClusterList->begin()+i);
+
+ Double_t dx = TMath::Abs( clX(cluster) - XTrFront );
+ Double_t dy = TMath::Abs( clZ(cluster) - YTrFront );
+ Double_t distance = TMath::Sqrt(dx*dx+dy*dy);
+
+ if (distance <= (0.5*(fXStep + fYStep) + fParent->fSlop)) {
+ fNtracks++;
+ if (distance < Delta) {
+ mclust = i;
+ Delta = distance;
+ }
+ }
+ }
+ }
+
+ //Debug output.
+
+ if (fParent->fdbg_tracks_cal) {
+ cout << "---------------------------------------------------------------\n";
+ cout << "Debug output from THcShowerArray::MatchCluster for " << GetName()
+ << endl;
+
+ cout << " Track at DC:"
+ << " X = " << Track->GetX()
+ << " Y = " << Track->GetY()
+ << " Theta = " << Track->GetTheta()
+ << " Phi = " << Track->GetPhi()
+ << endl;
+ cout << " Track at the front of Array:"
+ << " X = " << XTrFront
+ << " Y = " << YTrFront
+ << " Pathl = " << pathl
+ << endl;
+ if (fParent->fvTest)
+ cout << " Fiducial volume test: inFidVol = " << inFidVol << endl;
+
+ cout << " Matched cluster #" << mclust << ", Delta = " << Delta << endl;
+ cout << "---------------------------------------------------------------\n";
+ }
+
+ return mclust;
+}
+
//_____________________________________________________________________________
Int_t THcShowerArray::FineProcess( TClonesArray& tracks )
{
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index 42dc71d5c9b0cfcac1b4d96d445faa1780591bc7..7260c2fb33fbddefc97790b110dee1c98cb1f260 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -17,6 +17,7 @@
//////////////////////////////////////////////////////////////////////////////
#include "THaSubDetector.h"
+#include "THaTrack.h"
#include "TClonesArray.h"
#include "THcShowerHitCluster.h"
@@ -48,6 +49,9 @@ public:
virtual void CalculatePedestals( );
virtual void InitializePedestals( );
+ // Cluster to track association method.
+ Int_t MatchCluster(THaTrack*, Double_t&, Double_t&);
+
// Double_t fSpacing; not used
TClonesArray* fParentHitList;
@@ -85,6 +89,7 @@ protected:
Double_t fZFront; // Front position Z, from FP
Double_t fXStep; // distance btw centers of blocks along X
Double_t fYStep; // distance btw centers of blocks along Y
+ Double_t fZSize; // Block size along Z
Double_t** fXPos; // block X coordinates
Double_t** fYPos; // block Y coordinates