--- calo/flight/CaloNuclei/src/CaloNuclei.cpp	2007/05/31 10:10:52	1.7
+++ calo/flight/CaloNuclei/src/CaloNuclei.cpp	2007/09/28 12:34:42	1.10
@@ -34,6 +34,8 @@
   interplane = 0;
   preq = 0.;
   postq = 0.;
+  stdedx1 = 0.;
+  ethr = 0.;
   dedx1 = 0.;
   dedx3 = 0.;
   qpremean = 0.; 
@@ -151,21 +153,30 @@
   if ( debug ) printf(" if ( !usetrack ) return: usetrack %i ntr %i \n",usetrack,ntr);
   // 
   //
-  if ( !usetrack ) return;
+  //  if ( !usetrack ) return;
   //
   PamTrack *ptrack = 0;
   CaloTrkVar *track = 0;
-  if ( ntr >= 0 ){
-    ptrack = L2->GetTrack(ntr);
-    if ( ptrack ) track = ptrack->GetCaloTrack();
-  } else {
-    track = L2->GetCaloStoredTrack(ntr);
-  };
   //
-  if ( !track && ntr >= 0 ){
-    printf(" ERROR: cannot find any track!\n");
-    printf(" ERROR: CaloNuclei variables not completely filled \n");
-    return;   
+  if ( usetrack ){
+    if ( ntr >= 0 ){
+      ptrack = L2->GetTrack(ntr);
+      if ( ptrack ) track = ptrack->GetCaloTrack();
+    } else {
+      track = L2->GetCaloStoredTrack(ntr);
+    };
+    //
+    if ( !track && ntr >= 0 ){
+      printf(" ERROR: cannot find any track!\n");
+      printf(" ERROR: CaloNuclei variables not completely filled \n");
+      return;   
+    };
+  } else {
+    if ( ntr >= 0 ){
+      if ( debug ) printf(" ERROR: you asked not to use a track but you are looking for track number %i !\n",ntr);
+      if ( debug ) printf(" ERROR: CaloNuclei variables not completely filled \n");
+      return;       
+    };
   };
   //
   //  Float_t defethr = 6. * 0.90;