--- calo/flight/CaloProfile/inc/CaloProfile.h	2009/08/12 14:54:15	1.8
+++ calo/flight/CaloProfile/inc/CaloProfile.h	2009/08/17 15:00:35	1.10
@@ -29,6 +29,7 @@
 #include <TSystemDirectory.h>
 #include <TSQLServer.h>
 #include <TF1.h>
+#include <TGraphErrors.h>
 
 #include <PamLevel2.h>
 
@@ -131,11 +132,13 @@
     Bool_t maskXO;
     Bool_t maskYO;
     //
+    Bool_t xyaverage;
+    //
     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"...
     //
 
  public:
@@ -175,6 +178,9 @@
     void SetDebug(Bool_t d){ debug=d; };
     void UsePlane18X(){ no18x=false; };
     //
+    void UseAverage(){ xyaverage = true;};
+    void UseAllMeas(){ xyaverage = false;};
+    //
     void MaskSection(TString);
     void UnMaskSection(TString);
     void UnMaskSections();