--- calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2009/07/27 13:58:58	1.13
+++ calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2009/12/14 14:31:55	1.16
@@ -36,6 +36,7 @@
   sel = true;
   cont = false;
   emulate18 = true;
+  usepl18x = false;
   simulation = false;
   withtrk = true;
   rigdefault = 50.;
@@ -72,6 +73,15 @@
   //
 }
 
+CaloTrkVar* CaloPreSampler::GetCaloTrack(Int_t t){
+  this->Process();
+  if ( t < 0 ) return pcalo->GetCaloStoredTrack(t);
+  if ( L2->GetTrack(t) ){
+    return pcalo->GetCaloStoredTrack(L2->GetTrack(t)->GetTrkTrack()->GetSeqNo());
+  };
+  return NULL;
+}
+
 void CaloPreSampler::SetNoWpreSampler(Int_t n){
   if ( NC+n < 23 ){
     N = n;
@@ -167,6 +177,7 @@
   Bool_t newentry = false;
   //
   if ( L2->IsORB() ){
+    if ( debug ) printf(" I am here, we have orbital infos \n");
     if ( L2->GetOrbitalInfo()->pkt_num != PKT || L2->GetOrbitalInfo()->OBT != OBT || L2->GetOrbitalInfo()->absTime != atime || sel != ssel ){
       newentry = true;
       OBT = L2->GetOrbitalInfo()->OBT;
@@ -225,6 +236,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.;