--- calo/flight/CaloFranzini/inc/CaloFranzini.h	2007/12/18 09:55:04	1.4
+++ calo/flight/CaloFranzini/inc/CaloFranzini.h	2008/01/03 10:02:24	1.5
@@ -17,6 +17,7 @@
 #include <TSystemDirectory.h>
 #include <TSQLServer.h>
 #include <TMatrixD.h>
+#include <TMatrixF.h>
 #include <TArrayI.h>
 #include <TArrayF.h>
 #include <TStyle.h>
@@ -45,6 +46,8 @@
     TArrayF *brigm;
     TArrayF *qplmean[17];
     TMatrixD *hmat[17];
+    TMatrixF *hfmat[17];
+    TMatrixD *fqplmean[17];
     Int_t N;
     Int_t NC;
     //
@@ -58,6 +61,7 @@
     Float_t qplane[43];
     Bool_t sel;
     Bool_t cont;
+    Bool_t crig;
     //
     Int_t mask18b;
     Bool_t dofull;
@@ -90,9 +94,15 @@
     Float_t GetAverageAt(Int_t plane, Float_t rig);
     Float_t GetHmatrixAt(Int_t i, Int_t j, Float_t rig);
     //
+    Float_t GetFullAverageAt(Int_t plane, Int_t strip, Float_t rig);
+    Float_t GetFullHmatrixAt(Int_t i, Int_t j, Float_t rig);
+    //
     Bool_t Open(TString matrixfile);
     Bool_t LoadBin();
+    Bool_t LoadLong();
+    Bool_t LoadFull();
     Bool_t LoadMatrices();
+    Bool_t LoadFullMatrices();
     TFile *GetFile(){return file;};
     //
     Bool_t CreateMatrixFile(TString matrixfile);
@@ -101,7 +111,10 @@
     void WriteRigBin(TArrayF *rigbin);
     void WriteLongMean(TArrayF *qpl, Int_t bin);
     void WriteLongMatrix(TMatrixD *matrix, Int_t bin);
+    void WriteFullMatrix(TMatrixF *matrix, Int_t bin);
+    void WriteFullMean(TMatrixD *matrix, Int_t bin);
     void WriteInvertedLongMatrix(TMatrixD matrix, Int_t bin);
+    void WriteInvertedFullMatrix(TMatrixF matrix, Int_t bin);
     void CloseMatrixFile();
     //
     void CalculateLongTZeta(){ dofull = false; dolong=true; };
@@ -112,6 +125,8 @@
     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 DrawLongAverage(Int_t bin);
+    void UseCaloRig(){crig=true;};
     //
     void Clear();
     void Clear(Option_t *option){Clear();};