Merge branch 'master' of http://er.jinr.ru:90/vratislav.chudoba/NeuRad_tests

dataClasses/AEvent.cpp

@@ -18,6 +18,7 @@ AEvent::AEvent() : fNPoints(1024) {
 AEvent::~AEvent() {
 	// TODO Auto-generated destructor stub
 	delete gSignal;
+	delete gCFD;
 }
 
 void AEvent::SetRawDataFile(const char* inprawfile, const char* treename) {
@@ -61,6 +62,10 @@ void AEvent::ProcessEvent() {
 	fAmpMax = maxAmp;
 	fTimeAmpMax = maxAmpT;
 
+	SetGraphs();
+
+	SetCFD();
+
 	return;
 
 }
@@ -88,6 +93,7 @@ void AEvent::SetInputEvent(RawEvent** event) {
 void AEvent::Init() {
 
 	gSignal = new TGraph();
+	gCFD = new TGraph();
 	fInputEvent = 0;
 
 }
@@ -102,3 +108,6 @@ void AEvent::SetGraphs() {
 
 	return;
 }
+
+void AEvent::SetCFD() {
+}

dataClasses/AEvent.h

@@ -38,6 +38,7 @@ private:
 	Double_t fTimeAmpMax;
 
 	TGraph *gSignal;
+	TGraph *gCFD;
 
 	RawEvent *fInputEvent;		//!
 
@@ -53,13 +54,14 @@ public:
 	void Reset();
 	 //Resets arrays to zeros
 
-	void SetGraphs();
 	TGraph* GetGraph() {
 		return gSignal;
 	}
 
 private:
 	void Init();
+	void SetGraphs();
+	void SetCFD();
 };
 
 #endif /* DATACLASSES_AEVENT_H_ */

macros/testShowCFD.cxx

+void testShowCFD()
+{
+
+	gSystem->Load("../libData.so");
+
+	const Long64_t kFirstEvent = 128;
+
+	TFile fr("../data/dataDSR4/analysis_07_1.root");
+	TTree *tr = (TTree*)fr.Get("atree");
+
+	AEvent *revent = new AEvent();
+	tr->SetBranchAddress("Ach0.",&revent);
+
+	TGraph *gr[10];
+
+	//loop over events
+	for (Int_t i = 0; i < 10; i++) {
+		gr[i] = 0;
+		tr->GetEntry(i+kFirstEvent);
+		gr[i] = new TGraph(*revent->GetGraph());
+	}//for over events
+
+
+	TCanvas *c1 = new TCanvas("c1","test",10,10,1000,600);
+	c1->Divide(3,2);
+
+	for (Int_t i = 0; i < 6; i++) {
+		c1->cd(i+1);
+		gr[i]->Draw();
+	}
+
+//	c1->cd(2);
+//	tr->Draw("gAmp.Draw()","","goff",1,124);
+}

macros/testShowGraphs.cxx

@@ -3,22 +3,25 @@ void testShowGraphs()
 
 	gSystem->Load("../libData.so");
 
+	const Long64_t kFirstEvent = 128;
+
 	TFile fr("../data/dataDSR4/analysis_07_1.root");
 	TTree *tr = (TTree*)fr.Get("atree");
 
 	AEvent *revent = new AEvent();
-	tr->SetBranchAddress("Ach1",&revent);
+	tr->SetBranchAddress("Ach0.",&revent);
 
 	TGraph *gr[10];
 
+	//loop over events
 	for (Int_t i = 0; i < 10; i++) {
 		gr[i] = 0;
-		tr->GetEntry(i+28);
+		tr->GetEntry(i+kFirstEvent);
 		gr[i] = new TGraph(*revent->GetGraph());
-	}
+	}//for over events
 
 
-	auto c1 = new TCanvas("c1","test",10,10,1000,600);
+	TCanvas *c1 = new TCanvas("c1","test",10,10,1000,600);
 	c1->Divide(3,2);
 
 	for (Int_t i = 0; i < 6; i++) {