diff --git a/src/THcDC.cxx b/src/THcDC.cxx
index cb5c1284b54ca48e69edad2755d48ec36bc400c1..2651bb7f0f37e4c6fc07b1683c5946281d903348 100644
--- a/src/THcDC.cxx
+++ b/src/THcDC.cxx
@@ -688,7 +688,9 @@ void THcDC::SetFocalPlaneBestTrack(Int_t golden_track_index)
       for (UInt_t ihit = 0; ihit < UInt_t (tr1->GetNHits()); ihit++) {
         THcDCHit *hit = tr1->GetHit(ihit);
         Int_t plane = hit->GetPlaneNum() - 1;
+        _basic_data._Residuals[plane] = tr1->GetResidual(plane);
         fResiduals[plane] = tr1->GetResidual(plane);
+        _basic_data._ResidualsExclPlane[plane] = tr1->GetResidualExclPlane(plane);
         fResidualsExclPlane[plane] = tr1->GetResidualExclPlane(plane);
       } 
       EfficiencyPerWire(golden_track_index);
diff --git a/src/THcDC.h b/src/THcDC.h
index 92759740e469da2bcb2e85abdacc5823a70b9d53..df5c89f35c733335a3646e82048b5d7d5ce1214a 100644
--- a/src/THcDC.h
+++ b/src/THcDC.h
@@ -15,6 +15,7 @@
 #include "THcDriftChamber.h"
 #include "TMath.h"
 
+#include <map>
 #include "hcana/Logger.h"
 
 #define NUM_FPRAY 4
@@ -27,10 +28,11 @@ namespace hallc {
      */
     struct DriftChamber {
 
-      std::vector<double> _Residuals;
-      std::vector<double> _ResidualsExclPlane;
-      std::vector<double> _Wire_hit_did;      
-      std::vector<double> _Wire_hit_should;   
+      // Plane number  
+      std::map<int,double> _Residuals;
+      std::map<int,double> _ResidualsExclPlane;
+      std::map<int,double> _Wire_hit_did;      
+      std::map<int,double> _Wire_hit_should;   
 
       ClassDef(DriftChamber,1)
     };
diff --git a/src/THcDriftChamberPlane.cxx b/src/THcDriftChamberPlane.cxx
index e6f97ebb86546569cfa06838f0acb678b76e7bff..0948adb1b02a33458a33557a41f7969104db3b4c 100644
--- a/src/THcDriftChamberPlane.cxx
+++ b/src/THcDriftChamberPlane.cxx
@@ -257,8 +257,7 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date )
   // For HMS, wire numbers start with one, but arrays start with zero.
   // So wire number is index+1
   for (int i=0; i<nWires; i++) {
-    Double_t pos = fPitch*( (fWireOrder==0?(i+1):fNWires-i)
-			    - fCentralWire) - fCenter;
+    Double_t pos = fPitch * ((fWireOrder == 0 ? (i + 1) : fNWires - i) - fCentralWire) - fCenter;
     Int_t readoutside = GetReadoutSide(i+1);
     new((*fWires)[i]) THcDCWire( i+1, pos , fTzeroWire[i], fSigmaWire[i], readoutside, fTTDConv);    //added fTzeroWire/fSigmaWire to be read in as fTOffset --Carlos
   }
diff --git a/src/THcDriftChamberPlane.h b/src/THcDriftChamberPlane.h
index 204e4e3f281227e0657034e82834bc163dc69fe5..0a65b240b7f8e766509f78089eb135ff3f754f39 100644
--- a/src/THcDriftChamberPlane.h
+++ b/src/THcDriftChamberPlane.h
@@ -52,6 +52,8 @@ public:
   { assert( i>=1 && i<=GetNWires() );
     return (THcDCWire*)fWires->UncheckedAt(i-1); }
 
+  TClonesArray*  GetWires() { return fWires; }
+
   Int_t         GetNHits() const { return fHits->GetLast()+1; }
   Int_t         GetNRawhits() const {return fNRawhits; }
   TClonesArray* GetHits()  const { return fHits; }
diff --git a/src/include/HallC_LinkDef.h b/src/include/HallC_LinkDef.h
index 76b06d24370095833352e1d1715ae3e801ba3625..aae86159850b50087293a930fe2d4fc6326aea25 100644
--- a/src/include/HallC_LinkDef.h
+++ b/src/include/HallC_LinkDef.h
@@ -21,6 +21,7 @@
 #pragma link C++ global gHcParms;
 #pragma link C++ global gHcDetectorMap;
  
+
 #pragma link C++ class Decoder::Scaler9001+;
 #pragma link C++ class Decoder::Scaler9250+;
 #pragma link C++ class THcAerogel+;