--- calo/flight/CaloEnergy/src/CaloEnergy.cpp	2009/11/27 10:31:08	1.17
+++ calo/flight/CaloEnergy/src/CaloEnergy.cpp	2010/06/30 12:20:09	1.21
@@ -45,7 +45,8 @@
     delete clong;
     clong = new CaloLong(L2);
     clong->SplitInto(0,22);
-    clong->HeavyTail(true);
+    //    clong->HeavyTail(true);
+    clong->HeavyTail(false);
   };
   if ( cp ) delete cp;
   cp = NULL;
@@ -73,7 +74,8 @@
     clong = new CaloLong(L2);
     if ( cp ) clong->SetCaloLevel2Pointer(cp->GetCaloLevel2Pointer());
     clong->SplitInto(0,22);
-    clong->HeavyTail(true);
+    //    clong->HeavyTail(true);
+    clong->HeavyTail(false);
   };
   //
 }
@@ -93,6 +95,7 @@
   asntr = "start";
   //
   debug = false;
+  usepl18x = false;
   //
   indep = false;
   //
@@ -528,6 +531,9 @@
   //
   for (Int_t ch=0; ch< L2->GetCaloLevel1()->istrip; ch++){
     en = L2->GetCaloLevel1()->DecodeEstrip(ch,view,plane,strip);
+    //
+    if ( !usepl18x && view==0 && plane==18 ) en = 0.;
+    //
     enstrip[view][plane][strip]=en;
   };
   //
@@ -1134,7 +1140,7 @@
   //
   // check if the cylinder of integration can go out of the sensor given the frame which has been set (if we use all the calorimeter fRad is < 0 and the printout is suppressed)
   //
-  if ( (fM1+0.122-0.244*(Float_t)fRad) < 0. ) printf("Error: (fM1+0.122-0.244*(Float_t)fRad) < 0. fM1 %f fRad %i %f \n",fM1,fRad,(fM1+0.122-0.244*(Float_t)fRad));
+  if ( (fM1+0.122-0.244*(Float_t)fRad) < 0.000000001 ) printf("Error: (fM1+0.122-0.244*(Float_t)fRad) < 0. fM1 %f fRad %i %f \n",fM1,fRad,(fM1+0.122-0.244*(Float_t)fRad));
   //
   if ( fLong ){
     if ( debug ) printf(" ==================================================================> LONGITUDINAL FIT! \n");