--- calo/flight/CaloFranzini/src/CaloFranzini.cpp	2008/01/25 15:09:07	1.8
+++ calo/flight/CaloFranzini/src/CaloFranzini.cpp	2009/12/14 14:35:53	1.11
@@ -36,6 +36,8 @@
   PKT = 0;
   atime = 0;
   //
+  usepl18x = false;
+  //
   crig = false;
   sel = true;
   cont = false;
@@ -129,6 +131,19 @@
   };
 }
 
+void CaloFranzini::SplitInto(Int_t NoWpreSampler, Int_t NoWcalo){
+  this->SetNoWpreSampler(0);
+  this->SetNoWcalo(0);
+  if ( NoWpreSampler < NoWcalo ){
+          this->SetNoWpreSampler(NoWpreSampler);
+          this->SetNoWcalo(NoWcalo);
+  } else {
+          this->SetNoWcalo(NoWcalo);            
+          this->SetNoWpreSampler(NoWpreSampler);
+  };
+}
+
+
 void CaloFranzini::Process(){
   this->Process(0);
 }
@@ -188,6 +203,8 @@
       //
       mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip);
       //
+      if ( !usepl18x && view==0 && plane==18 ) mip = 0.;
+      //
       estrip[view][plane][strip] = mip;
       //    
       nplane = 1 - view + 2 * (plane - N);
@@ -281,6 +298,8 @@
       //
       mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip);
       //
+      if ( !usepl18x && view==0 && plane==18 ) mip = 0.;
+      //
       //      nplane = 1 - view + 2 * plane;
       //      if ( nplane > 37 ) nplane--; 
       nplane = 1 - view + 2 * (plane - N);
@@ -858,7 +877,7 @@
   //
 }
 
-void CaloFranzini::LoadFullMatrix(Int_t rigbin, TMatrixF *&fmatri){
+void CaloFranzini::LoadFullMatrix(Int_t rigbin, TMatrixF *fmatri){
   //
   TString name = Form("origfmatrixn%i",rigbin);
   fmatri=(TMatrixF*)ffile->Get(name.Data());