--- calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2007/08/10 09:55:42	1.3
+++ calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2007/11/26 08:53:47	1.5
@@ -36,6 +36,10 @@
   cont = false;
   emulate18 = true;
   simulation = false;
+  withtrk = true;
+  rigdefault = 50.;
+  nox = false;
+  noy = false;
   //
   Clear();
   //
@@ -131,9 +135,9 @@
   Int_t S11 = 0;
   Float_t tmptrigty = -1.; 
   Bool_t trackanyway = true;
-  Float_t rigdefault = 50.;
+  //  Float_t rigdefault = 50.;
   Bool_t hZn = true;
-  Bool_t withtrk = true;
+  //  Bool_t withtrk = true;
   Bool_t st = true;
   Int_t ntrkentry = 0;
   TrkLevel2 *trk = L2->GetTrkLevel2();
@@ -153,6 +157,7 @@
     if ( L2->GetCaloLevel2()->GetCaloTrkVar(mm)->trkseqno == -2 ) m2 = true;
     if ( L2->GetCaloLevel2()->GetCaloTrkVar(mm)->trkseqno == -3 ) m3 = true;
   };
+  if ( !withtrk ) m3 = true;
   //
   if ( debug ) printf(" Fill estrip matrix needed to calculate variables \n");
   //
@@ -167,6 +172,11 @@
     //
     mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip);
     //
+    // Mask x or y view if nox and/or noy are true (default false)
+    //
+    if ( nox && view == 0 ) mip = 0.; 
+    if ( noy && view == 1 ) mip = 0.; 
+    //
     // Selection mode: fill the matrix only for plane < (22 - N) REMEMBER N = number of W planes to be used as presampler, ie if N = 2 then we want to use planes from 0 to 19
     //                 included so plane < (22 - 2)
     //