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

dataClasses/AEvent.cpp

@@ -301,6 +301,10 @@ Double_t AEvent::GetfCFD() {
 		return fTimeCFD;
 }
 
+Double_t AEvent::GetfLED() {
+		return fTimeLED;
+}
+
 Double_t AEvent::GetOnefTime(Int_t i) {
 		return fTime[i];
 }

dataClasses/AEvent.h

@@ -82,6 +82,8 @@ public:
 
 	Double_t GetfCFD();
 
+	Double_t GetfLED();
+
 	Double_t GetOnefTime(Int_t i);
 
 	Double_t GetOnefAmpPos(Int_t i);

macros/testShowGraphs.cxx

+#include <TTree.h>
+#include <TGraph.h>
+#include <TFile.h>
+#include <TSystem.h>
+#include <TCanvas.h>
+#include "TStyle.h"
+
 void testShowGraphs()
 {
+	using std::cout;
+	using std::endl;
+
+	gStyle->SetCanvasDefH(900);
+	gStyle->SetCanvasDefW(1500);
+
+	const char *foldername = "7_8";
+	const char *ext = ".gif";
 
 	gSystem->Load("../libData.so");
 
 	const Long64_t kFirstEvent = 128;
 
-
 //	TFile fr("../data/dataDSR4/Neurad_7_08_NEW.root");
 //	TFile fr("../data/dataDSR4/analysis_07_8.root");
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 //	TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root");
 
 //	TFile fr("../data/dataTektronix/exp18.root");
 
-=======
-=======
 	TFile fr("../data/dataDSR4/analysis_08_2.root");
->>>>>>> 58f61cb195c6b08755455386b15990ce4c27b599
+
 //	TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root");
 //	TFile fr("../data/dataTektronix/exp18.root");
->>>>>>> 09d9ad17f40ac0af9d228137f715f25ee9ea15ae
+
 //	TFile fr("../data/dataTektronix/analysisExp7.root");
 	TTree *tr = (TTree*)fr.Get("atree");
 
 	AEvent *revent = new AEvent();
-	cout << tr->SetBranchAddress("Ach0.",&revent) << endl;
+	tr->SetBranchAddress("Ach0.",&revent);
 
 	TGraph *gr[13];
 	Double_t t10[13];
 	Double_t t90[13];
 
-//	cout << "warning" << endl;
-
-	cout << tr->GetEntries() << endl;
-
 	//loop over events
 	for (Long64_t i = 0; i < 13; i++) {
 		gr[i] = 0;
 		t10[i] = 0;
 		t90[i] = 0;
-//	cout << "warning 1" << endl;
-//		cout << i+kFirstEvent << endl;
+
 		tr->GetEntry(i+kFirstEvent);
-//		tr->GetEntry(i);
-//	cout << "warning 2" << endl;
+
 		gr[i] = new TGraph(*revent->GetGraphSignal());
 		t10[i] = revent->GetT_10();
 		t90[i] = revent->GetT_90();
@@ -56,40 +60,28 @@ void testShowGraphs()
 
 	}//for over events
 
-//	cout << "warning 3" << endl;
 
 	TCanvas *c1 = new TCanvas("c1","test",10,10,1000,600);
-<<<<<<< HEAD
-
-	//c1->Divide(3,2);
-
-	c1->Divide(3,4);
+	c1->Divide(2,2);
 
-=======
-	//c1->Divide(3,2);
-	c1->Divide(3,4);
->>>>>>> 09d9ad17f40ac0af9d228137f715f25ee9ea15ae
 
 	TF1 *f1 = new TF1("f1name", "[0]+x*[1]");
 //	TF1 *f1 = new TF1("pol1", );
 
-<<<<<<< HEAD
-
-	for (Int_t k = 0; k < 6; k++) {
-
-//	for (Int_t k = 0; k < 12; k++) {
-=======
-	for (Int_t k = 0; k < 12; k++) {
->>>>>>> 09d9ad17f40ac0af9d228137f715f25ee9ea15ae
 
+	for (Int_t k = 0; k < 4; k++) {
 		c1->cd(k+1);
+		gr[k]->GetXaxis()->SetRangeUser(130, 175);
+		gr[k]->GetXaxis()->SetTitle("Time [ns]");
+		gr[k]->GetXaxis()->CenterTitle();
+		gr[k]->GetYaxis()->SetTitle("Signal [V]");
+		gr[k]->GetYaxis()->CenterTitle();
 		gr[k]->Draw("AL*");
-
 		//cout << t10[k] << "\t" << t90[k] << endl;
 		//f1->SetRange(t10[k], t90[k]);
 		//gr[k]->Fit(f1, "RQ");
 	}
-
+	c1->Print(Form("../macros/picsDRS4/file%s/signals%s", foldername, ext));
 //	c1->cd(2);
 //	tr->Draw("gAmp.Draw()","","goff",1,124);
 }