diff --git a/macros/BeCorrPRC/ES1_4560.cxx b/macros/BeCorrPRC/ES1_4560.cxx
index c869e938f1947a35309f88aa919ffe03f0c9b2e8..fd4848d78d8af39cdfafa7103c86e7aa409e7b9d 100644
--- a/macros/BeCorrPRC/ES1_4560.cxx
+++ b/macros/BeCorrPRC/ES1_4560.cxx
@@ -8,18 +8,30 @@ void ES1_4560()
 
 	ana.SetCMAngularRange(45, 60);
 
-	//	ana.SetFigures("figures/", ".eps");
+	ana.SetFigures("figures/4560/", ".eps");
 
 	//	ana.SetChainsToDraw(0, 0, 0, 0, 1, 1);
 	ana.SetChainsToDraw();
+
 	Bool_t epsilonT[6] = {0,0,1,0,0};
 	Bool_t cosThetaT[6] = {0,0,1,0,0};
-
 	Bool_t epsilonY[6] = {0,0,1,0,0};
 	Bool_t cosThetaY[6] = {0,0,1,0,0};
-
 	Bool_t thetaAT[6] = {0,0,1,0,0};
 
+	ana.SetSpectra();
+	ana.SetEpsilonTintervals(epsilonT);
+	ana.SetEpsilonTintervals();
+	ana.SetCosThetaTkIntervals(cosThetaT);
+	ana.SetCosThetaTkIntervals();
+	ana.SetEpsilonYintervals(epsilonY);
+	ana.SetEpsilonYintervals();
+	ana.SetCosThetaYkIntervals(cosThetaY);
+	ana.SetCosThetaYkIntervals();
+	ana.SetThetaATintervals(thetaAT);
+	ana.SetThetaATintervals();
+
+
 
 	ana.SetExpChain("../../../be/rootdata/correlations/v5_exp/Be.", 0, 40);
 
@@ -69,73 +81,52 @@ void ES1_4560()
 //			"sRatio>0.051 && sRatio<0.101");
 	ana.SetCuts();
 
-	Long64_t eEventsECuts[5][6] = {/*1090000, 1060000, 1070000, 1090000, 1110000, 1100000,*/
-										2900000, 2900000, 2900000, 2900000, 2900000, 2900000,
+	Long64_t eEventsECuts[5][6] = {2900000, 2900000, 2900000, 2900000, 2900000, 2900000,
 										3400000, 3400000, 3400000, 3500000, 3400000, 3400000,
 										2400000, 2400000, 2400000, 2400000, 2400000, 2400000,
 										2900000, 3000000, 2900000, 3000000, 2900000, 3000000,
 										3200000, 3300000, 3300000, 3400000, 3300000, 3400000};
-//	Long64_t eEventsECuts[5][6] = {3950000, 3950000, 3800000, 3850000, 3950000, 3900000,
-//									eMaxEvents, eMaxEvents, 4100000, eMaxEvents, eMaxEvents, eMaxEvents,
-//									3050000, 3150000, 3200000, 3200000, 3250000, 3350000,
-//									3850000, 3950000, 3900000, 3900000, 4000000, 4000000,
-//									4100000, 4100000, 4000000, 4100000, eMaxEvents, eMaxEvents};
 	ana.ExpEventsECuts(eEventsECuts);
 
-//	const Long64_t sMaxEvents = 3000000;
-
 	Long64_t sEventsECuts[5][6] = {sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
 										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
 										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
 										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
 										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents};
-//	Long64_t sEventsECuts[5][6] = {sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
-//										sMaxEvents, 2630000, sMaxEvents, sMaxEvents, 2660000, 2660000,
-//										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
-//										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
-//										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents};
 	ana.SimEventsECuts(sEventsECuts);
 
 	ana.SetRangeProportion(1.1, 1);
 
 	///////////////////////////////////////////////////////////////////////////////////
 
-	ana.SetSpectra();
 	ana.Spectra();
 
-	ana.SetEpsilonTintervals(epsilonT);
-	//	ana.SetEpsilonTintervals();
 	ana.EpsilonT();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaTkIntervals(cosThetaT);
-	//	ana.CosThetaTk();
+	ana.CosThetaTk();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetEpsilonYintervals(epsilonY);
-	//	ana.EpsilonY();
+	ana.EpsilonY();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaYkIntervals(cosThetaY);
-	//	ana.CosThetaYk();
+	ana.CosThetaYk();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetThetaATintervals(thetaAT);
-	////	ana.SetThetaATintervals();
-	//	ana.ThetaAT();
+	ana.ThetaAT();
 
 	sw.Print();
 	sw.Continue();
 
-	Info("ES1_90120.cxx", "Finished.");
+	Info("ES1_4560.cxx", "Finished.");
 
 	return;
 
diff --git a/macros/BeCorrPRC/ES1_6075.cxx b/macros/BeCorrPRC/ES1_6075.cxx
index 518e6085d010c524ee1bdd4eccaf2e0612c11370..8f0fb8af194564af8f8fafb752b4d58d9d0ef310 100644
--- a/macros/BeCorrPRC/ES1_6075.cxx
+++ b/macros/BeCorrPRC/ES1_6075.cxx
@@ -8,18 +8,31 @@ void ES1_6075()
 
 	ana.SetCMAngularRange(60, 75);
 
-	//	ana.SetFigures("figures/", ".eps");
+	ana.SetFigures("figures/6075/", ".eps");
 
-	//	ana.SetChainsToDraw(0, 0, 0, 0, 1, 1);
+//	ana.SetChainsToDraw(0, 0, 0, 0, 1, 1);
 	ana.SetChainsToDraw();
+
+
 	Bool_t epsilonT[6] = {0,0,1,0,0};
 	Bool_t cosThetaT[6] = {0,0,1,0,0};
-
 	Bool_t epsilonY[6] = {0,0,1,0,0};
 	Bool_t cosThetaY[6] = {0,0,1,0,0};
-
 	Bool_t thetaAT[6] = {0,0,1,0,0};
 
+	ana.SetSpectra();
+//	ana.SetEpsilonTintervals(epsilonT);
+	ana.SetEpsilonTintervals();
+//	ana.SetCosThetaTkIntervals(cosThetaT);
+	ana.SetCosThetaTkIntervals();
+//	ana.SetEpsilonYintervals(epsilonY);
+	ana.SetEpsilonYintervals();
+//	ana.SetCosThetaYkIntervals(cosThetaY);
+	ana.SetCosThetaYkIntervals();
+	ana.SetThetaATintervals(thetaAT);
+	ana.SetThetaATintervals();
+
+
 
 	ana.SetExpChain("../../../be/rootdata/correlations/v5_exp/Be.", 0, 40);
 
@@ -67,8 +80,6 @@ void ES1_6075()
 									4100000, 4100000, 4000000, 4100000, eMaxEvents, eMaxEvents};
 	ana.ExpEventsECuts(eEventsECuts);
 
-	const Long64_t sMaxEvents = 3000000;
-
 	Long64_t sEventsECuts[5][6] = {sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
 										sMaxEvents, 2630000, sMaxEvents, sMaxEvents, 2660000, 2660000,
 										sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,
@@ -80,42 +91,34 @@ void ES1_6075()
 
 	///////////////////////////////////////////////////////////////////////////////////
 
-	ana.SetSpectra();
 	ana.Spectra();
 
-	ana.SetEpsilonTintervals(epsilonT);
-	//	ana.SetEpsilonTintervals();
 	ana.EpsilonT();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaTkIntervals(cosThetaT);
-	//	ana.CosThetaTk();
+	ana.CosThetaTk();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetEpsilonYintervals(epsilonY);
-	//	ana.EpsilonY();
+	ana.EpsilonY();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaYkIntervals(cosThetaY);
-	//	ana.CosThetaYk();
+	ana.CosThetaYk();
 
 	sw.Print();
 	sw.Continue();
 
-	ana.SetThetaATintervals(thetaAT);
-	////	ana.SetThetaATintervals();
-	//	ana.ThetaAT();
+	ana.ThetaAT();
 
 	sw.Print();
 	sw.Continue();
 
-	Info("ES1_90120.cxx", "Finished.");
+	Info("ES1_6075.cxx", "Finished.");
 
 	return;
 
diff --git a/macros/BeCorrPRC/ES1_7590.cxx b/macros/BeCorrPRC/ES1_7590.cxx
index 9d49ac9b690f398fc8fb06ee8adbc19c4e674003..4cb18b26f5810060404462cabdfb535fa6572a0f 100644
--- a/macros/BeCorrPRC/ES1_7590.cxx
+++ b/macros/BeCorrPRC/ES1_7590.cxx
@@ -1,8 +1,5 @@
 void ES1_7590()
 {
-	//open chain with Be events only and draw E_Be
-
-	//order: al0, noal0, al180, noal180
 
 	TStopwatch sw;
 	sw.Start();
@@ -11,20 +8,27 @@ void ES1_7590()
 
 	ana.SetCMAngularRange(75, 90);
 
-//	TString configuration = "v5_7590";
-
-//	ana.SetFigures("figures/", ".eps");
+	ana.SetFigures("figures/7590/", ".eps");
 
 //	ana.SetChainsToDraw(0, 0, 0, 0, 1, 1);
 	ana.SetChainsToDraw();
 	Bool_t epsilonT[6] = {0,0,1,0,0};
 	Bool_t cosThetaT[6] = {0,0,1,0,0};
-
 	Bool_t epsilonY[6] = {0,0,1,0,0};
 	Bool_t cosThetaY[6] = {0,0,1,0,0};
-
 	Bool_t thetaAT[6] = {0,0,1,0,0};
 
+	ana.SetSpectra();
+//	ana.SetEpsilonTintervals(epsilonT);
+	ana.SetEpsilonTintervals();
+//	ana.SetCosThetaTkIntervals(cosThetaT);
+	ana.SetCosThetaTkIntervals(cosThetaT);
+//	ana.SetEpsilonYintervals(epsilonY);
+	ana.SetEpsilonYintervals();
+	ana.SetCosThetaYkIntervals(cosThetaY);
+	ana.SetCosThetaYkIntervals();
+	ana.SetThetaATintervals(thetaAT);
+	ana.SetThetaATintervals();
 
 	ana.SetExpChain("../../../be/rootdata/correlations/v5_exp/Be.", 0, 40);
 
@@ -34,7 +38,6 @@ void ES1_7590()
 
 	const Long64_t sMaxEvents = 3000000;
 	Long64_t sEvents[6] = {2050000, 2050000, 2050000, 2050000, 1900000, 1950000};
-//	cout << sEvents << endl;
 	ana.SetNoSimEvents(sEvents);
 
 	Int_t lowSimFile[6] = {0, 0, 0, 0, 0, 0};
@@ -60,10 +63,6 @@ void ES1_7590()
 	ana.OpenSimChains();
 
 
-	ana.SetSpectra();
-	ana.Spectra();
-
-
 	ana.SetRatiosGStoEX("sRatio>0.075 && sRatio<0.125",
 						"sRatio>0.076 && sRatio<0.126",
 						"sRatio>0.070 && sRatio<0.120",
@@ -77,85 +76,46 @@ void ES1_7590()
 									eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents,
 									eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents,
 									eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents};
-//	ana.ExpEventsECuts();
 	ana.ExpEventsECuts(eEventsECuts);
 
 	const Long64_t sMaxEvents = 3000000;
-	Long64_t sEventsECuts[5][6] = {/*sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents,*/
-									2020000, 2040000, 2130000, 2080000, 2060000, 2080000,
+	Long64_t sEventsECuts[5][6] = {2020000, 2040000, 2130000, 2080000, 2060000, 2080000,
 									2000000, 2020000, 2000000, 2010000, 1990000, 1970000,
 									2320000, 2300000, 2340000, 2310000, 2300000, 2290000,
 									2060000, 2070000, 2110000, 2110000, 2070000, 2060000,
 									2050000, 2050000, 2110000, 2110000, 2050000, 2050000};
 	ana.SimEventsECuts(sEventsECuts);
 
-	TCut sRatioAl0 = "sRatio>0.075 && sRatio<0.125";
-	TCut sRatioNoAl0 = "sRatio>0.076 && sRatio<0.126";
-	TCut sRatioAl180 = "sRatio>0.070 && sRatio<0.120";
-	//	TCut sRatioAl180 = "sRatio>0.050 && sRatio<0.100";
-	TCut sRatioNoAl180 = "sRatio>0.070 && sRatio<0.120";
-	//	TCut sRatioNoAl180 = "sRatio>0.010 && sRatio<0.150";
-	TCut sRatioAl90 = "sRatio>0.075 && sRatio<0.125";
-	TCut sRatioNoAl90 = "sRatio>0.076 && sRatio<0.126";
-	TCut sRatio[6] = {sRatioAl0, sRatioNoAl0, sRatioAl180, sRatioNoAl180, sRatioAl90, sRatioNoAl90};
-
-
 	ana.SetRangeProportion(1.1, 1);
-//	const Double_t eTRange[5][6] = {280, 280, 280, 280, 280, 280,
-//									350, 350, 350, 350, 350, 350,
-//									350, 350, 350, 350, 350, 350,
-//									630, 630, 630, 630, 630, 630,
-//									700, 700, 700, 700, 700, 700};
 
-	ana.SetEpsilonTintervals(epsilonT);
-//	ana.SetEpsilonTintervals();
-//	ana.EpsilonT();
+/////////////////////////////////////////////////////////////////////////////////
 
+	ana.Spectra();
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaTkIntervals(cosThetaT);
-//	ana.CosThetaTk();
-
+	ana.EpsilonT();
 	sw.Print();
 	sw.Continue();
 
-	ana.SetEpsilonYintervals(epsilonY);
-//	ana.EpsilonY();
-
+	ana.CosThetaTk();
 	sw.Print();
 	sw.Continue();
 
-	ana.SetCosThetaYkIntervals(cosThetaY);
-//	ana.CosThetaYk();
-
+	ana.EpsilonY();
 	sw.Print();
 	sw.Continue();
 
-	ana.SetThetaATintervals(thetaAT);
-////	ana.SetThetaATintervals();
-//	ana.ThetaAT();
+	ana.CosThetaYk();
+	sw.Print();
+	sw.Continue();
 
+	ana.ThetaAT();
 	sw.Print();
 	sw.Continue();
 
 	Info("ES1_7590.cxx", "Finished.");
 
-	return;
-
-///////////////////////////////////////////////////////////
-
-	const Bool_t kVerbose = 1;
-	const Float_t kRangeProportionIn = 2.0;
-
-
-	const Double_t eTRange[5][6] = {280, 280, 280, 280, 280, 280,
-									350, 350, 350, 350, 350, 350,
-									350, 350, 350, 350, 350, 350,
-									630, 630, 630, 630, 630, 630,
-									700, 700, 700, 700, 700, 700};
-
-
 }