--- PamCut/CollectionActions/RefitTrackAction/RefitTrackAction.cpp	2010/05/11 15:32:09	1.1.2.2
+++ PamCut/CollectionActions/RefitTrackAction/RefitTrackAction.cpp	2010/06/03 14:14:15	1.1.2.3
@@ -13,13 +13,19 @@
 
 void RefitTrackAction::OnGood(PamLevel2 *event) {
 
+  // Do something only if at least one track exists
+  if (event->GetTrkLevel2()->GetNTracks() == 0)
+    return;
+
   // Reload the TRK parameters only if they have been changed (ie., if another instance of
-  // this class used a different set of parameters.
+  // this class used a different set of parameters).
   if (_trkParamsFile != _currTrkParamsFile) {
     TrkParams::Set(_trkParamsFile, 5);
     _currTrkParamsFile = _trkParamsFile;
   }
 
+  if (_sortingMethod)
+    event->SetSortingMethod(_sortingMethod);
   TrkTrack *trkTrack = event->GetTrack(0)->GetTrkTrack();
   if (!trkTrack)
     return;
@@ -88,4 +94,10 @@
   trkTrack->FitReset();
   int fail = 0;
   trkTrack->Fit(0, fail, 0);
+
+  if (fail) {
+    // Set a flag for the badly-refitted tracks: chi2 < 0
+    if (trkTrack->chi2 >= 0.)
+      trkTrack->chi2 = -1.;
+  }
 }