--- calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2007/07/20 08:27:45	1.1
+++ calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2007/08/10 09:55:42	1.3
@@ -84,8 +84,10 @@
   printf(" pre-sampler planes               :.. %i\n",N);
   printf(" pcalo->qtot                      :.. %f\n",pcalo->qtot);
   printf(" pcalo->nstrip                    :.. %i\n",pcalo->nstrip);  
-  printf(" pcalo->track0->qtrack            :.. %f\n",pcalo->GetCaloTrkVar(0)->qtrack);  
-  printf(" pcalo->track0->dX0l              :.. %f\n",pcalo->GetCaloTrkVar(0)->dX0l);  
+  if ( pcalo->ntrk() > 0 ){
+    printf(" pcalo->track0->qtrack            :.. %f\n",pcalo->GetCaloTrkVar(0)->qtrack);  
+    printf(" pcalo->track0->dX0l              :.. %f\n",pcalo->GetCaloTrkVar(0)->dX0l);  
+  };
   printf("========================================================================\n");
   //
 };
@@ -246,6 +248,14 @@
   //
   event->clevel1->good2 = 1;
   //
+  // copy variables calculated during calibration process which is skipped here...
+  //
+  event->clevel2->good = L2->GetCaloLevel2()->good;
+  memcpy(event->clevel2->perr,L2->GetCaloLevel2()->perr,sizeof(L2->GetCaloLevel2()->perr));
+  memcpy(event->clevel2->swerr,L2->GetCaloLevel2()->swerr,sizeof(L2->GetCaloLevel2()->swerr));
+  memcpy(event->clevel2->crc,L2->GetCaloLevel2()->crc,sizeof(L2->GetCaloLevel2()->crc));
+  event->clevel2->selftrigger = L2->GetCaloLevel2()->selftrigger;
+  //
   // Calculate variables common to all tracks (qtot, nstrip, etc.)
   //
   if ( debug ) printf("1 Call GetCommonVar() \n");