From 84724e4aea4680d4714a9de9cca54f04c9e11c51 Mon Sep 17 00:00:00 2001 From: Vratislav Chudoba Date: Thu, 3 Aug 2017 19:04:19 +0300 Subject: [PATCH] Parameters for 60-75 degrees modified --- Be/BeAnalysis.cpp | 69 +++++------------------------------ Be/BeAnalysis.h | 1 + macros/BeCorrPRC/ES1_6075.cxx | 13 +++++-- 3 files changed, 20 insertions(+), 63 deletions(-) diff --git a/Be/BeAnalysis.cpp b/Be/BeAnalysis.cpp index a6800c1..99ba4c9 100644 --- a/Be/BeAnalysis.cpp +++ b/Be/BeAnalysis.cpp @@ -1026,9 +1026,6 @@ void BeAnalysis::ThetaAT() { } -//void BeAnalysis::ExpEventsECuts(Long64_t **noExpEvents) { -//void BeAnalysis::ExpEventsECuts(Int_t (&noExpEvents)[5][6]) { -//void BeAnalysis::ExpEventsECuts(Int_t (*noExpEvents)[5][6]) { void BeAnalysis::ExpEventsECuts(Long64_t noExpEvents[5][6]) { @@ -1051,48 +1048,11 @@ void BeAnalysis::ExpEventsECuts(Long64_t noExpEvents[5][6]) { } return; - -// eEventsECuts[0][0] = 3950000; -// eEventsECuts[0][1] = 3950000; -// eEventsECuts[0][2] = 3800000; -// eEventsECuts[0][3] = 3850000; -// eEventsECuts[0][4] = 3950000; -// eEventsECuts[0][5] = 3900000; -// -// eEventsECuts[1][0] = eMaxEvents; -// eEventsECuts[1][1] = eMaxEvents; -// eEventsECuts[1][2] = 4100000; -// eEventsECuts[1][3] = eMaxEvents; -// eEventsECuts[1][4] = eMaxEvents; -// eEventsECuts[1][5] = eMaxEvents; -// -// eEventsECuts[2][0] = 3050000; -// eEventsECuts[2][1] = 3150000; -// eEventsECuts[2][2] = 3200000; -// eEventsECuts[2][3] = 3200000; -// eEventsECuts[2][4] = 3250000; -// eEventsECuts[2][5] = 3350000; -// -// eEventsECuts[3][0] = 3850000; -// eEventsECuts[3][1] = 3950000; -// eEventsECuts[3][2] = 3900000; -// eEventsECuts[3][3] = 3900000; -// eEventsECuts[3][4] = 4000000; -// eEventsECuts[3][5] = 4000000; -// -// eEventsECuts[4][0] = 4100000; -// eEventsECuts[4][1] = 4100000; -// eEventsECuts[4][2] = 4000000; -// eEventsECuts[4][3] = 4100000; -// eEventsECuts[4][4] = eMaxEvents; -// eEventsECuts[4][5] = eMaxEvents; } void BeAnalysis::SimEventsECuts(Long64_t noSimEvents[5][6]) { -// sMaxEvents; - if (!noSimEvents) { for (Int_t i = 0; i < 5; i++) { for (Int_t j = 0; j < 6; j++) { @@ -1110,18 +1070,6 @@ void BeAnalysis::SimEventsECuts(Long64_t noSimEvents[5][6]) { } return; - - -// for (Int_t i = 0; i < 5; i++) { -// for (Int_t j = 0; j < 6; j++) { -// sEventsECuts[i][j] = sMaxEvents; -// } -// } -// -// sEventsECuts[1][1] = 2630000; -// sEventsECuts[1][4] = 2660000; -// sEventsECuts[1][5] = 2660000; - } void BeAnalysis::EpsilonTRange() { @@ -1307,17 +1255,20 @@ void BeAnalysis::SaveFigures(TCanvas *canvas, TString variable, Int_t interval) void BeAnalysis::SetSimCuts(TString sEt[5]/*, TString sET0, TString sET1, TString sET2, TString sET3, TString sET4*/) { -// if (sEt == 0) { -// Error("BeAnalysis::SetSimCuts", "String array empty, no effect."); -// return; -// } - for (Int_t i = 0; i < 5; i++) { -// cout << sEt[i].Sizeof() << endl; if (sEt[i].Sizeof() <= 1) continue; crBeE[i] = sEt[i]; Info("BeAnalysis::SetSimCuts", "crBeE[%d] was changed to \'%s\'.", i, sEt[i].Data()); -// cout << crBeE[i] << endl; + } + +} + +void BeAnalysis::SetInputCuts(TString iEt[5]) { + + for (Int_t i = 0; i < 5; i++) { + if (iEt[i].Sizeof() <= 1) continue; + ciBeE[i] = iEt[i]; + Info("BeAnalysis::SetInputCuts", "ciBeE[%d] was changed to \'%s\'.", i, iEt[i].Data()); } } diff --git a/Be/BeAnalysis.h b/Be/BeAnalysis.h index fc78f33..0429139 100644 --- a/Be/BeAnalysis.h +++ b/Be/BeAnalysis.h @@ -47,6 +47,7 @@ public: void SetChainsToDraw(Bool_t ch0 = 1, Bool_t ch1 = 1, Bool_t ch2 = 1, Bool_t ch3 = 1, Bool_t ch4 = 1, Bool_t ch5 = 1); void SetSimCuts(TString sEt[5]/*, TString sET0 = "", TString sET1 = "", TString sET2 = "", TString sET3 = "", TString sET4 = ""*/); + void SetInputCuts(TString iEt[5]/*, TString sET0 = "", TString sET1 = "", TString sET2 = "", TString sET3 = "", TString sET4 = ""*/); void SetCMAngularRange(Int_t minAngle, Int_t maxAngle); diff --git a/macros/BeCorrPRC/ES1_6075.cxx b/macros/BeCorrPRC/ES1_6075.cxx index 76d86a9..18c4c0a 100644 --- a/macros/BeCorrPRC/ES1_6075.cxx +++ b/macros/BeCorrPRC/ES1_6075.cxx @@ -17,14 +17,16 @@ void ES1_6075() ana.SetChainsToDraw(); - Bool_t epsilonT[6] = {0,1,0,0,0}; + Bool_t epsilonT[6] = {0,0,0,1,0}; Bool_t cosThetaT[6] = {1,0,0,0,0}; Bool_t epsilonY[6] = {1,0,0,0,0}; Bool_t cosThetaY[6] = {0,0,1,0,0}; Bool_t thetaAT[6] = {0,0,1,0,0}; - TString simEt[5] = {"", "f6BeIM>1.5 && f6BeIM<2.0", "", "", ""}; + TString simEt[5] = {"", "f6BeIM>1.5 && f6BeIM<2.0", "", "f6BeIM>2.4 && f6BeIM<3.1", ""}; + TString inEt[5] = {"", "E_IM>1.5 && E_IM<2.0", "", "E_IM>2.4 && E_IM<3.1", ""}; ana.SetSimCuts(simEt); + ana.SetInputCuts(inEt); // ana.SetSpectra(); ana.SetEpsilonTintervals(epsilonT); @@ -84,7 +86,8 @@ void ES1_6075() // eMaxEvents, eMaxEvents, 4100000, eMaxEvents, eMaxEvents, eMaxEvents, 3500000, 3500000, 3500000, 3500000, 3500000, 3500000, 3050000, 3150000, 3200000, 3200000, 3250000, 3350000, - 3850000, 3950000, 3900000, 3900000, 4000000, 4000000, +// 3850000, 3950000, 3900000, 3900000, 4000000, 4000000, + eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, eMaxEvents, 4100000, 4100000, 4000000, 4100000, eMaxEvents, eMaxEvents}; ana.ExpEventsECuts(eEventsECuts); @@ -92,7 +95,8 @@ void ES1_6075() // sMaxEvents, 2630000, sMaxEvents, sMaxEvents, 2660000, 2660000, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, 2660000, 2660000, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, - sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, +// sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, + 2500000, 2500000, 2500000, 2500000, 2500000, 2500000, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents, sMaxEvents}; ana.SimEventsECuts(sEventsECuts); @@ -130,6 +134,7 @@ void ES1_6075() if (saveHists) { ana.SaveSpectrumHist(0); ana.SaveEpsilonTHist(0, 5); + ana.SaveEpsilonTHist(1, 2); } Info("ES1_6075.cxx", "Finished."); -- 2.18.1