--- calo/flight/CaloFranzini/inc/CaloFranzini.h	2007/12/04 12:42:50	1.2
+++ calo/flight/CaloFranzini/inc/CaloFranzini.h	2007/12/13 17:08:08	1.3
@@ -5,7 +5,7 @@
 #ifndef calofranzini_h
 #define calofranzini_h
 
-#include <PamLevel2.h>
+#include <iostream>
 
 #include <TTree.h>
 #include <TFriendElement.h>
@@ -19,8 +19,13 @@
 #include <TMatrixD.h>
 #include <TArrayI.h>
 #include <TArrayF.h>
+#include <TStyle.h>
+#include <TCanvas.h>
+#include <TStyle.h>
+#include <TH1F.h>
+//
 
-#include <iostream>
+#include <PamLevel2.h>
 
 using namespace std;
 
@@ -37,6 +42,8 @@
     TFile *file;
     Int_t nbin;
     TArrayF *brig;
+    Int_t N;
+    Int_t NC;
     //
     // needed to avoid reprocessing the same event over and over to obtain the variables;
     //
@@ -45,8 +52,11 @@
     UInt_t atime;
     Int_t sntr;
     Float_t estrip[2][22][96];
-    Float_t qplane[44];
+    Float_t qplane[43];
+    Bool_t sel;
+    Bool_t cont;
     //
+    Int_t mask18b;
     Bool_t dofull;
     Bool_t dolong;
     Int_t degfre;
@@ -67,23 +77,32 @@
     Float_t GetNormLongTZeta(); ///< Returns longitudinal covariance parameter used for event selection
     Float_t GetNormFullTZeta(); ///< Returns full calorimeter covariance parameter used for event selection
     //
+    void Selection(){sel = true; cont = false;}; ///< Set selection mode: planes from 1 to 22-N are used, plane 18 - N is masked if "emulate18" variable is true (DEFAULT);
+    void Contamination(){sel = false; cont = true;}; ///< Set contamination mode: planes from N to 22 are used.
     Int_t GetDegreeOfFreedom(){return degfre;};
     //
     TArrayF *LoadLongAverage(Float_t rig);
     TMatrixD *LoadCovarianceMatrix(Float_t rig);
     //
     Bool_t Open(TString matrixfile);
+    TFile *GetFile(){return file;};
     //
     Bool_t CreateMatrixFile(TString matrixfile);
     void WriteNumBin(Int_t numbin);
     void WriteRigBin(TArrayF *rigbin);
     void WriteLongMean(TArrayF *qpl, Int_t bin);
     void WriteLongMatrix(TMatrixD *matrix, Int_t bin);
+    void WriteInvertedLongMatrix(TMatrixD matrix, Int_t bin);
     void CloseMatrixFile();
     //
     void CalculateLongTZeta(){ dofull = false; dolong=true; };
     void CalculateFullTZeta(){ dolong = false; dofull=true; };
     void SetDebug(Bool_t d){ debug=d; };
+    void SetNoWpreSampler(Int_t n);
+    void SetNoWcalo(Int_t n);
+    Int_t GetNoWpreSampler(){return N;}; ///< Get the number of W planes used as presampler. 
+    Int_t GetNoWcalo(){return NC;}; ///< Get the number of W planes used as calorimeter.
+    void DrawLongAverage(Float_t rig);
     //
     void Clear();
     void Clear(Option_t *option){Clear();};