Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2240)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2241)
@@ -1,3 +1,11 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/26: Abelardo Moralejo
+  * macros/CT1EgyEst.C
+    - Added to the argument list of CT1EEst the binnings in theta
+      and energy. Commented out the MLog.h and MLogManip.h, headers,
+      otherwise it does not run (don't know why). Commented out filters 
+      (my test file does not contain hadronness), please uncomment 
+      them to run on files with hadronness info.
 
  2003/06/26: Abelardo Moralejo
Index: /trunk/MagicSoft/Mars/macros/CT1EgyEst.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/CT1EgyEst.C	(revision 2240)
+++ /trunk/MagicSoft/Mars/macros/CT1EgyEst.C	(revision 2241)
@@ -35,6 +35,9 @@
 #include "MMatrixLoop.h"
 #include "MChisqEval.h"
+
+/*
 #include "MLog.h"
 #include "MLogManip.h"
+*/
 
 void CT1EgyEst()
@@ -61,8 +64,14 @@
   Float_t maxdist       = 1.;
 
+  MBinning BinningE("BinningE");
+  MBinning BinningTheta("BinningTheta");
+  BinningE.SetEdgesLog(50, 500, 50000.);
+  BinningTheta.SetEdges(5, 0., 50.);
+
   CT1EEst(inPath,  fileNameIn, 
-            outPath, energyParName, 
-            hilName, hilSrcName,    hadronnessName, 
-            howMany, maxhadronness, maxalpha, maxdist);
+	  outPath, energyParName, 
+	  hilName, hilSrcName,    hadronnessName, 
+	  howMany, maxhadronness, maxalpha, maxdist, 
+	  &BinningE, &BinningTheta);
 }
 
@@ -84,8 +93,9 @@
 
 void CT1EEst(TString inPath,  TString fileNameIn, 
-               TString outPath, TString energyParName,
-	       TString hilName, TString hilSrcName, TString hadronnessName,
-               Int_t howMany, 
-               Float_t maxhadronness, Float_t maxalpha, Float_t maxdist)
+	     TString outPath, TString energyParName,
+	     TString hilName, TString hilSrcName, TString hadronnessName,
+	     Int_t howMany, 
+	     Float_t maxhadronness, Float_t maxalpha, Float_t maxdist,
+	     MBinning* binsE, MBinning* binsTheta)
 {
   cout << "================================================================"
@@ -125,4 +135,5 @@
   Optimize.SetOutFile(paramout);
 
+  /*
   MFCT1SelFinal filterhadrons;
   filterhadrons.SetHadronnessName(hadronnessName);
@@ -130,4 +141,5 @@
   filterhadrons.SetInverted();
   Optimize.SetEventFilter(&filterhadrons);
+  */
 
   Optimize.SetNevents(howMany);
@@ -223,4 +235,6 @@
   // Select events
   //
+
+  /*
   cout << "Select events with hadronness < " << maxhadronness 
 	<< " and |alpha| < " << maxalpha << endl; 
@@ -230,4 +244,5 @@
 
   MContinue cont(&hcut2);
+  */
 
   parlist2.AddToList(&tlist2);
@@ -237,5 +252,5 @@
 
   tlist2.AddToList(&read2);
-  tlist2.AddToList(&cont);
+  //  tlist2.AddToList(&cont);
   tlist2.AddToList(&eest2);
 
@@ -253,11 +268,6 @@
   tlist2.AddToList(&migfill);
 
-  MBinning BinningE("BinningE");
-  MBinning BinningTheta("BinningTheta");
-  BinningE.SetEdgesLog(50, 500, 50000.);
-  BinningTheta.SetEdges(5, 0., 50.);
-  
-  parlist2.AddToList(&BinningE);
-  parlist2.AddToList(&BinningTheta);
+  parlist2.AddToList(binsE);
+  parlist2.AddToList(binsTheta);
 
   MBinning BinningDE("BinningDE");