--- calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2009/09/15 10:19:03	1.15
+++ calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2010/03/10 12:11:11	1.17
@@ -14,6 +14,11 @@
   Clear();
 }
 
+void CaloPreSampler::SetCaloLevel2Pointer(CaloLevel2 *cl2p){
+  if ( pcalo ) delete pcalo;
+  pcalo = cl2p;
+}
+
 CaloPreSampler::CaloPreSampler(PamLevel2 *l2p){  
   //
   L2 = l2p;
@@ -36,6 +41,7 @@
   sel = true;
   cont = false;
   emulate18 = true;
+  usepl18x = false;
   simulation = false;
   withtrk = true;
   rigdefault = 50.;
@@ -235,6 +241,8 @@
     //
     mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip);
     //
+    if ( !usepl18x && view==0 && plane==18 ) mip = 0.;
+    //
     // Mask x or y view if nox and/or noy are true (default false)
     //
     if ( mask[view][plane] ) mip = 0.;