--- calo/flight/CaloFranzini/inc/CaloFranzini.h	2008/01/03 10:02:24	1.5
+++ calo/flight/CaloFranzini/inc/CaloFranzini.h	2008/01/11 15:27:11	1.6
@@ -88,7 +88,7 @@
     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);
+    TArrayF *LoadLongAverage(Float_t rig); 
     TMatrixD *LoadCovarianceMatrix(Float_t rig);
     //
     Float_t GetAverageAt(Int_t plane, Float_t rig);
@@ -96,6 +96,8 @@
     //
     Float_t GetFullAverageAt(Int_t plane, Int_t strip, Float_t rig);
     Float_t GetFullHmatrixAt(Int_t i, Int_t j, Float_t rig);
+    Float_t GetFullAverageAt(Int_t plane, Int_t strip, Float_t rig, Int_t rigbin);
+    Float_t GetFullHmatrixAt(Int_t i, Int_t j, Float_t rig, Int_t rigbin);
     //
     Bool_t Open(TString matrixfile);
     Bool_t LoadBin();
@@ -105,6 +107,16 @@
     Bool_t LoadFullMatrices();
     TFile *GetFile(){return file;};
     //
+    TMatrixD *LoadFullAverage(Int_t rigbin);
+    TMatrixD *LoadFullNAverage(Int_t rigbin);
+    void UnLoadFullAverage(Int_t rigbin);
+    void UnLoadFullNAverage(Int_t rigbin);
+    TMatrixF *LoadFullMatrix(Int_t rigbin);
+    void LoadFullMatrix(Int_t rigbin, TMatrixF *&fmatri);
+    TMatrixF *LoadFullNMatrix(Int_t rigbin);
+    void UnLoadFullMatrix(Int_t rigbin);
+    void UnLoadFullNMatrix(Int_t rigbin);
+    //
     Bool_t CreateMatrixFile(TString matrixfile);
     Bool_t UpdateMatrixFile(TString matrixfile);
     void WriteNumBin(Int_t numbin);
@@ -112,7 +124,9 @@
     void WriteLongMean(TArrayF *qpl, Int_t bin);
     void WriteLongMatrix(TMatrixD *matrix, Int_t bin);
     void WriteFullMatrix(TMatrixF *matrix, Int_t bin);
+    void WriteFullNMatrix(TMatrixF *matrix, Int_t bin);
     void WriteFullMean(TMatrixD *matrix, Int_t bin);
+    void WriteFullNMean(TMatrixD *matrix, Int_t bin);
     void WriteInvertedLongMatrix(TMatrixD matrix, Int_t bin);
     void WriteInvertedFullMatrix(TMatrixF matrix, Int_t bin);
     void CloseMatrixFile();