Merge branch 'develop' into saw_scons

src/THcDC.cxx

@@ -481,14 +481,15 @@ Int_t THcDC::CoarseTrack( TClonesArray& tracks )
     for(Int_t itrack=0;itrack<fNDCTracks;itrack++) {
       THaTrack* theTrack = NULL;
       theTrack = AddTrack(tracks, 0.0, 0.0, 0.0, 0.0); // Leaving off trackID
-      // Should we add stubs with AddCluster?
+      // Should we add stubs with AddCluster?  Could we do this
+      // by having stubs inherit from cluster
 
       THcDCTrack *tr = static_cast<THcDCTrack*>( fDCTracks->At(itrack));
-      theTrack->SetD(tr->GetX(), tr->GetY(), tr->GetXP(), tr->GetYP());
+      theTrack->Set(tr->GetX(), tr->GetY(), tr->GetXP(), tr->GetYP());
       theTrack->SetFlag((UInt_t) 0);
       Int_t nhits=tr->GetNHits();
       // Need to look at how engine does chi2 and track selection.  Reduced?
-      theTrack->SetChi2(tr->GetChisq(),nhits-4); // Nconstraints - Nparameters
+      theTrack->SetChi2(tr->GetChisq(),tr->GetNFree());
       // CalcFocalPlaneCoords.  Aren't our tracks already in focal plane coords
       // We should have some kind of track ID so that the THaTrack can be
       // associate back with the DC track

src/THcHallCSpectrometer.cxx

@@ -68,7 +68,7 @@ THcHallCSpectrometer::THcHallCSpectrometer( const char* name, const char* descri
 
   //sc_ref = static_cast<THaScintillator*>(GetDetector("s1"));
 
-  SetTrSorting(kFALSE);
+  SetTrSorting(kTRUE);
 }
 
 //_____________________________________________________________________________