From b6b64e7caaf7d5b2f6a10b8fe68b1cd473866e47 Mon Sep 17 00:00:00 2001
From: Vratislav Chudoba <chudoba@jinr.ru>
Date: Mon, 16 Jan 2017 16:25:11 +0300
Subject: [PATCH] AEvent sligthly modified. Script "histCorr.C" modified.

---
 dataClasses/AEvent.cpp | 28 ++++++++++++++++------------
 dataClasses/AEvent.h   |  1 +
 macros/histCorr.C      | 31 ++++++++++++++++++++++++++-----
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/dataClasses/AEvent.cpp b/dataClasses/AEvent.cpp
index 3084f9a..c7715a7 100644
--- a/dataClasses/AEvent.cpp
+++ b/dataClasses/AEvent.cpp
@@ -60,18 +60,7 @@ void AEvent::ProcessEvent() {
 		fAmpPos[j] = fAmpPos[j] - fZeroLevel;
 	}
 
-	Double_t maxAmp = 0.;
-	Double_t maxAmpT = 0.;
-
-	maxAmp = fAmpPos[0];
-	for(Int_t j=0; j < fNPoints; j++) {
-		if(fAmpPos[j] > maxAmp) {
-			maxAmp = fAmpPos[j];
-			maxAmpT = fTime[j];
-		}
-	}
-	fAmpMax = maxAmp;
-	fTimeAmpMax = maxAmpT;
+	SetMaxAmplitudes();
 
 	SetGraphs();
 
@@ -227,3 +216,18 @@ Double_t AEvent::GetOnefTime(Int_t i) {
 Double_t AEvent::GetOnefAmpPos(Int_t i) {
 		return fAmpPos[i];
 }
+
+void AEvent::SetMaxAmplitudes() {
+	Double_t maxAmp = 0.;
+	Double_t maxAmpT = 0.;
+
+	maxAmp = fAmpPos[0];
+	for(Int_t j=0; j < fNPoints; j++) {
+		if(fAmpPos[j] > maxAmp) {
+			maxAmp = fAmpPos[j];
+			maxAmpT = fTime[j];
+		}
+	}
+	fAmpMax = maxAmp;
+	fTimeAmpMax = maxAmpT;
+}
diff --git a/dataClasses/AEvent.h b/dataClasses/AEvent.h
index 4981cd6..354edb1 100644
--- a/dataClasses/AEvent.h
+++ b/dataClasses/AEvent.h
@@ -102,6 +102,7 @@ public:
 
 private:
 	void Init();
+	void SetMaxAmplitudes();
 	void SetGraphs();
 	void SetCFD();
 };
diff --git a/macros/histCorr.C b/macros/histCorr.C
index 0657524..ca55de8 100644
--- a/macros/histCorr.C
+++ b/macros/histCorr.C
@@ -1,3 +1,5 @@
+//#include "TCanvas.h"
+
 void histCorr()
 {
 	gSystem->Load("../libData.so");
@@ -6,19 +8,38 @@ void histCorr()
 	TCanvas *c1 = new TCanvas("canvas", "Correlation pictures");
 	c1->Divide(2,2);
 
-	TH2F *h1 = new TH2F("h1", "Time difference between two channels vs an integral of the first channel",500,10,1e-10,500,-300,300);
-	TH2F *h2 = new TH2F("h2", "Time difference between two channels vs an integral of the second channel",100,10,1e-10,100,-300,300);
-	TH2F *h3 = new TH2F("h3", "Integral of the first channel vs integral of the second channel",100,10,1e-10,100,-300,300);
+//	TH2F *h1 = new TH2F("h1", "Time difference between two channels vs an integral of the first channel",500,-150.,150.,500,0.,5e-9);
+	TH2F *h1 = new TH2F("h1", "Time difference between two channels vs an integral of the first channel",125,-50.,50.,125,0.,5e-9);
+	TH2F *h2 = new TH2F("h2", "Time difference between two channels vs an integral of the second channel",125,-50.,50.,125,0e-9,5e-9);
+//	TH2F *h3 = new TH2F("h3", "Integral of the first channel vs integral of the second channel",500,0.,5e-9,500,0.,5e-9);
+	TH2F *h3 = new TH2F("h3", "Integral of the first channel vs integral of the second channel",500,0.,2e-9,500,0.,2e-9);
 	TH2F *h4 = new TH2F("h4", "Time difference between two channels vs amplitude of the first channel",100,10,1e-10,100,-300,300);
 
 	c1->cd(1);
-	t->Draw("( Ach0.fTimeCFD - Ach2.fTimeCFD ) : Ach0.fChargeCFD >> h1","","col");
+	t->Draw("Ach0.fChargeCFD : ( Ach0.fTimeCFD - Ach2.fTimeCFD ) >> h1","","col");
+	//x
+	h1->GetXaxis()->SetTitle("\\Delta \\tau_{0-2}  [ns]");
+	h1->GetXaxis()->CenterTitle();
+	//y
+	h1->GetYaxis()->SetTitle("Q_{0} [C]");
+	h1->GetYaxis()->CenterTitle();
 
 	c1->cd(2);
-	t->Draw("( Ach0.fTimeCFD - Ach2.fTimeCFD ) : Ach2.fChargeCFD >> h2","","col");
+	t->Draw("Ach2.fChargeCFD : ( Ach0.fTimeCFD - Ach2.fTimeCFD ) >> h2","","col");
+	h2->GetXaxis()->SetTitle("\\Delta \\tau_{0-2}  [ns]");
+	h2->GetXaxis()->CenterTitle();
+	//y
+	h2->GetYaxis()->SetTitle("Q_{2} [C]");
+	h2->GetYaxis()->CenterTitle();
 
 	c1->cd(3);
 	t->Draw("Ach0.fChargeCFD:Ach2.fChargeCFD >> h3","","col");
+	//x
+	h3->GetXaxis()->SetTitle("Q_{2} [C]");
+	h3->GetXaxis()->CenterTitle();
+	//y
+	h3->GetYaxis()->SetTitle("Q_{0} [C]");
+	h3->GetYaxis()->CenterTitle();
 
 	c1->cd(4);
 
-- 
2.18.1