--- DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2006/11/17 10:08:08	1.7
+++ DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2006/11/22 08:31:11	1.8
@@ -615,27 +615,27 @@
 	      tim = 100000.;
 	      plo = m;
 	      fbi = 0;
-	      if ( clevel1->estrip[j4][m][l] > 1. ){
+	      if ( clevel1->estrip[j4][m][l] > 0.99995 ){
 		tim = 10000.;
 		plo = m;
 		fbi = 1;
 	      };
-	      if ( clevel1->estrip[j4][m][l] > 10. ){
+	      if ( clevel1->estrip[j4][m][l] > 9.9995 ){
 		tim = 1000.;
 		plo = 22 + m;
 		fbi = 1;
 	      };
-	      if ( clevel1->estrip[j4][m][l] > 100. ){
+	      if ( clevel1->estrip[j4][m][l] > 99.995 ){
 		tim = 100.;
 		plo = 22 + m;
 		fbi = 0;
 	      };
-	      if ( clevel1->estrip[j4][m][l] > 1000. ){
+	      if ( clevel1->estrip[j4][m][l] > 999.95 ){
 		tim = 10.;
 		plo = 44 + m;
 		fbi = 0;
 	      };
-	      if ( clevel1->estrip[j4][m][l] > 10000. ){
+	      if ( clevel1->estrip[j4][m][l] > 9999.5 ){
 		tim = 1.;
 		plo = 66 + m;
 		fbi = 0;
@@ -651,9 +651,10 @@
 	      } else {
 		svstrip[istrip] = -(fbi*1000000000 + plo*10000000 + j4*100000 + cle);
 	      };
-	      //	      if ( ei == 770 ) printf(" j %i l %i m %i estrip %f \n",j4,l,m,clevel1->estrip[j4][m][l]);
-	      //	      if ( ei == 770 ) printf(" num lim %i fbi %i tim %f plo %i cle %i \n",numeric_limits<Int_t>::max(),fbi,tim,plo,cle);
-	      //	      if ( ei == 770 ) printf(" svstrip %i \n",svstrip[istrip]);
+	      //
+	      //	      if ( ei >= -770 ) printf(" j %i l %i m %i estrip %f \n",j4,l,m,clevel1->estrip[j4][m][l]);
+	      //	      if ( ei >= -770 ) printf(" num lim %i fbi %i tim %f plo %i cle %i \n",numeric_limits<Int_t>::max(),fbi,tim,plo,cle);
+	      //	      if ( ei >= -770 ) printf(" svstrip %i \n",svstrip[istrip]);
 	      //
 	      istrip++;
 	    };
@@ -737,7 +738,7 @@
   calol2cm();
 }
 
-void CaloProcessing::FillCommonVar(CaloLevel2 *ca){
+void CaloProcessing::FillCommonVar(CaloLevel1 *c1, CaloLevel2 *ca){
   //
   ca->good = clevel2->good;
   if ( clevel2->trigty == 2. ){
@@ -759,7 +760,6 @@
   ca->qmax = clevel2->qmax;
   ca->elen = clevel2->elen;
   ca->selen = clevel2->selen;
-  ca->estrip = TArrayI(ca->nstrip,svstrip);
   memcpy(ca->qq,clevel2->qq,sizeof(clevel2->qq));
   memcpy(ca->planemax,clevel2->planemax,sizeof(clevel2->planemax));
   memcpy(ca->varcfit,clevel2->varcfit,sizeof(clevel2->varcfit));
@@ -767,6 +767,11 @@
   memcpy(ca->cibar,clevel2->cibar,sizeof(clevel2->cibar));
   memcpy(ca->cbar,clevel2->cbar,sizeof(clevel2->cbar));
   //
+  if ( c1 ){
+    c1->istrip = istrip;
+    c1->estrip = TArrayI(istrip,svstrip);
+  };
+  //
 }
 
 void CaloProcessing::ClearStructs(){