--- calo/flight/CaloProfile/inc/CaloProfile.h	2009/08/12 14:54:15	1.8
+++ calo/flight/CaloProfile/inc/CaloProfile.h	2009/12/14 14:52:13	1.15
@@ -29,6 +29,8 @@
 #include <TSystemDirectory.h>
 #include <TSQLServer.h>
 #include <TF1.h>
+#include <TGraphErrors.h>
+#include <TMinuit.h>
 
 #include <PamLevel2.h>
 
@@ -56,6 +58,8 @@
     UInt_t atime;
     //
     Float_t estrip[2][22][96];
+    TString suf;
+    Bool_t usepl18x;
     //
 
  public:
@@ -79,7 +83,13 @@
     void Print();
     void Print(Option_t *option){Print();};
     //
-    ClassDef(CaloLat,1);
+    
+    void UsePlane18X(Bool_t use){usepl18x = use;};
+    //
+    //
+    void SetSuffix(TString suffix){ suf = suffix;};
+    //
+    ClassDef(CaloLat,3);
 };
 
 /**
@@ -106,6 +116,7 @@
     Bool_t sel;
     Bool_t cont;
     Int_t mask18b;
+    Bool_t usepl18x;
     //
     Float_t chi2;
     Float_t ndf;
@@ -131,12 +142,19 @@
     Bool_t maskXO;
     Bool_t maskYO;
     //
+    Bool_t xyaverage;
+    //
+    Bool_t heavytail;
+    Float_t letmax;
+    Float_t lmipth;
+    //
     Float_t eplane[2][22];
     //
     CaloLevel2 *clp;
     //
-    Float_t Evaluate(TString s, Float_t max); // expression must be of the form "5*t"."t+10","t-(4*t)"...
+    Float_t Evaluate(TString s, Float_t tmax, Float_t X0pl ); // expression must be of the form "tmax+2.*X0pl", "5*tmax"."tmax+10","tmax-(4*tmax)+3.*X0pl"...
     //
+    TString suf;
 
  public:
     //
@@ -162,7 +180,10 @@
     Float_t Get_asymm(){this->Fit(); return asymm;};
     Float_t Get_exptmax(){this->Process(); return etmax;};
     Float_t Get_X0pl(){this->Process(); return X0pl;};
-    Int_t Get_fitresult(){this->Fit(); return fitresult;};
+    //
+    Float_t Get_letmax(){ return letmax;};
+    Float_t Get_lmipth(){ return lmipth;};
+    Int_t Get_fitresult(){this->Fit(); return fitresult;};    
     //
     void ForceNextFit(){atime=0;fatime=0;};
     void Draw();
@@ -173,7 +194,13 @@
     ~CaloLong(){ Delete(); };
     //
     void SetDebug(Bool_t d){ debug=d; };
-    void UsePlane18X(){ no18x=false; };
+    //    void UsePlane18X(){ no18x=false; };
+    
+    void UsePlane18X(Bool_t use="false"){usepl18x = use; no18x=!use;};
+    //
+    //
+    void UseAverage(){ xyaverage = true;};
+    void UseAllMeas(){ xyaverage = false;};
     //
     void MaskSection(TString);
     void UnMaskSection(TString);
@@ -192,9 +219,15 @@
     void SetLowerLimit(TString sl){ slmax = sl; };// expression must be of the form "5*t"."t+10","t-(4*t)"... where t will be replaced by the fitted maximum (X0)
     void SetUpperLimit(TString su){ sumax = su; };// expression must be of the form "5*t"."t+10","t-(4*t)"... where t will be replaced by the fitted maximum (X0)
     //
+    void Setletmax(Float_t l){ letmax = l;};
+    void Setlmipth(Float_t l){ lmipth = l;};
+    void HeavyTail(Bool_t b){ heavytail=b;};
+    //
     Float_t GetLowerLimit(){ return lmax;};
     Float_t GetUpperLimit(){ return umax;};
     //
+    void SetSuffix(TString suffix){ suf = suffix;};
+    //
     void Clear();
     void Clear(Option_t *option){Clear();};
     void Delete();
@@ -204,7 +237,7 @@
     void Print();
     void Print(Option_t *option){Print();};
     //
-    ClassDef(CaloLong,2);
+    ClassDef(CaloLong,4);
 };
 
 /**
@@ -226,7 +259,9 @@
     Float_t estrip[23][96][96];
     Int_t smax[23];
     Int_t smay[23];
+    Bool_t usepl18x;
     //
+    TString suf;
 
  public:
     //
@@ -245,11 +280,16 @@
     void Delete();
     void Delete(Option_t *option){Delete();};
     //
+    void SetSuffix(TString suffix){ suf = suffix;};
+    
+    void UsePlane18X(Bool_t use){usepl18x = use;};
+    //
+    //
     void Process(); ///< Process data 
     void Print();
     void Print(Option_t *option){Print();};
     //
-    ClassDef(Calo2D,1);
+    ClassDef(Calo2D,3);
 };
 
 #endif