--- calo/flight/CaloNuclei/src/CaloNuclei.cpp	2007/05/24 07:50:48	1.5
+++ calo/flight/CaloNuclei/src/CaloNuclei.cpp	2007/05/31 10:10:52	1.7
@@ -106,6 +106,7 @@
   if ( debug ) printf(" Processing event at OBT %u PKT %u time %u \n",OBT,PKT,atime);
   //
   Clear();
+  if ( debug ) printf(" Always calculate stdedx1 \n");
   //
   // Always calculate stdedx1
   //
@@ -132,6 +133,8 @@
     //
   };
   //
+  if ( debug ) printf(" find energy released along the strip of maximum on the first plane and on the two neighbour strips \n");
+  //
   // find energy released along the strip of maximum on the first plane and on the two neighbour strips
   //
   if ( indx > 0 ){
@@ -145,6 +148,7 @@
     stdedx1 = 0.;
   };
   //
+  if ( debug ) printf(" if ( !usetrack ) return: usetrack %i ntr %i \n",usetrack,ntr);
   // 
   //
   if ( !usetrack ) return;
@@ -153,7 +157,7 @@
   CaloTrkVar *track = 0;
   if ( ntr >= 0 ){
     ptrack = L2->GetTrack(ntr);
-    track = ptrack->GetCaloTrack();
+    if ( ptrack ) track = ptrack->GetCaloTrack();
   } else {
     track = L2->GetCaloStoredTrack(ntr);
   };
@@ -498,7 +502,16 @@
 	mesethr = mesethr2;
       };
       aldone = true;
-      if ( mesethr > defethr ) goto retry;
+      if ( mesethr > defethr ){
+	interplane = 0;
+	preq = 0.;
+	postq = 0.;
+	qpremean = 0.; 
+	qpremeanN = 0.; 
+	multhit = false;
+	gap = false;
+	goto retry;
+      };
     };
   };
   //