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

convertRawToAnalyzed/analyse.cpp

@@ -15,8 +15,8 @@ int main(int argc, char* argv[])
 
 	//to be extracted from the source as parameters
 	const Int_t noBranches = 4;
-	const Double_t cfRatio = 0.5;
-	const Int_t cfTD = 5;
+	const Double_t cfRatio = 0.7;
+	const Int_t cfTD = 3;
 	Double_t noiseMin = 5;
 	Double_t noiseMax = 25;
 

macros/histCorr.C

@@ -7,7 +7,7 @@ void histCorr(
 		const char *foldername = "8_2",
 //		const char *ext = ".eps",
 		const char *ext = ".gif",
-		const Bool_t can1 = 1, const Bool_t can2 = 1, const Bool_t can3 = 1, const Bool_t can4 = 0)
+		const Bool_t can1 = 1, const Bool_t can2 = 1, const Bool_t can3 = 1, const Bool_t can4 = 0, const Bool_t can5 = 0)
 {
 	gSystem->Load("../libData.so");
 	TFile *f = new TFile(Form("../data/dataDSR4/%s", filename));
@@ -64,7 +64,7 @@ void histCorr(
 		
 		c1->Show();
 		c1->Update();
-		c1->Print(Form("../macros/picsDRS4/file%s/TimeDiffCFD%s", foldername, ext));
+		//c1->Print(Form("../macros/picsDRS4/file%s/TimeDiffCFD%s", foldername, ext));
 	}
 
 	if (can2) {
@@ -107,6 +107,8 @@ void histCorr(
 //		TH2F *h9 = new TH2F("h9", "Time difference between 90 and 10: ch0 vs ch1", 100, 0., 5., 100, 0., 5.);
 		TH1F *h9 = new TH1F("h9", "Delta tau", 100, -10., 30.);
 
+		TH1F *h10 = new TH1F("h10", "Time difference between 90 and 10 > 0 and chi square < 0.0005", 100, 0., 5.);
+
 		c3->cd(1);
 //		t->Draw("Ach1.fTime90 - Ach1.fTime10 >> h7","((Ach1.fTime90-Ach1.fTime10)>=0)","col");
 		t->Draw("Ach1.fTime90 - Ach1.fTime10 >> h7","((Ach1.fTime90-Ach1.fTime10)>=0) && (Ach1.fEdgeXi < 0.0015)","col");
@@ -137,9 +139,12 @@ void histCorr(
 		c3->Update();
 
 		c3->cd(4);
-		t->Draw("Ach1.fTime90 - Ach1.fTime10","((Ach1.fTime90-Ach1.fTime10)>=0)","col");
+		t->Draw("Ach1.fTime90 - Ach1.fTime10 >> h10","((Ach1.fTime90-Ach1.fTime10)>=0)","");
 		t->SetLineColor(kRed);
-		t->Draw("Ach1.fTime90 - Ach1.fTime10","((Ach1.fTime90-Ach1.fTime10)>=0) && (Ach1.fEdgeXi < 0.0005)","same");
+		t->Draw("Ach1.fTime90 - Ach1.fTime10 ","((Ach1.fTime90-Ach1.fTime10)>=0) && (Ach1.fEdgeXi < 0.0005)","same"); //????????
+		h10->GetXaxis()->SetTitle("\\Delta \\tau_{1}^{(rise)} [ns]");
+		h10->GetXaxis()->CenterTitle();
+
 		c3->Update();
 		c3->Print(Form("../macros/picsDRS4/file%s/RisingEdge%s", foldername, ext));
 	//	c3->Print("../macros/picsDRS4/file7_8/RisingEdge.eps");
@@ -149,18 +154,38 @@ void histCorr(
 	if (can4) {
 		TCanvas *c4 = new TCanvas("c4", "Correlation pictures: XiSquares");
 
-		TH2F *h10 = new TH2F("h10", "Time difference between two channels vs XiSquare of edge",100, -0., 5., 100, 0., 0.005);
-
-		t->Draw("Ach1.fEdgeXi : (Ach1.fTime90 - Ach1.fTime10) >> h10","(Ach1.fTime90 - Ach1.fTime10)>0","col");
+		TH2F *h11 = new TH2F("h11", "Time difference between two channels vs XiSquare of edge",100, -0., 5., 100, 0., 0.005);
+		t->Draw("Ach1.fEdgeXi : (Ach1.fTime90 - Ach1.fTime10) >> h11","","col");
+		//t->Draw("Ach1.fEdgeXi : (Ach1.fTime90 - Ach1.fTime10) >> h11","(Ach1.fTime90 - Ach1.fTime10)>0","col");
 		//x
-		h10->GetXaxis()->SetTitle("\\Delta \\tau_{1}^{(rise)} [ns]");
-		h10->GetXaxis()->CenterTitle();
+		h11->GetXaxis()->SetTitle("\\Delta \\tau_{1}^{(rise)} [ns]");
+		h11->GetXaxis()->CenterTitle();
 		//y
-		h10->GetYaxis()->SetTitle("fEdgeXi");
-		h10->GetYaxis()->CenterTitle();
+		h11->GetYaxis()->SetTitle("fEdgeXi");
+		h11->GetYaxis()->CenterTitle();
 		c4->Update();
 		c4->Print(Form("../macros/picsDRS4/file%s/XiSquares%s", foldername, ext));
 
 	}
 
+	if (can5) {
+		TCanvas *c5 = new TCanvas("c5", "Changing CFD parameters");
+
+		TH1F *h12 = new TH1F("h12", "Delta tau CFD",100, -10., 30.);
+
+	//	c5->Divide(1,2);
+	//	c5->cd(1);
+		t->Draw("Ach0.fTimeCFD - Ach1.fTimeCFD >> h12","Ach1.fChargeCFD>0.05e-9 && Ach1.fChargeCFD<0.5e-9","");
+
+		h12->GetXaxis()->SetTitle("\\Delta \\tau_{0-1} [ns]");
+		h12->GetXaxis()->CenterTitle();
+		TF1 *fGaus = new TF1("f1", "gaus", 8.5, 13.);
+		h12->Fit(fGaus, "R");
+		gStyle->SetOptFit();
+
+		c5->Update();
+		c5->Print(Form("../macros/picsDRS4/file%s/TimeDiffCFD_0.7_3%s", foldername, ext));
+
+	}
+
 }

macros/testShowCFD.cxx

@@ -5,7 +5,7 @@ void testShowCFD()
 
 	const Long64_t kFirstEvent = 128;
 
-	TFile fr("../data/dataDSR4/analysis_07_8.root");
+	TFile fr("../data/dataDSR4/analysis_08_2_CFD07_3.root");
 	TTree *tr = (TTree*)fr.Get("atree");
 
 	AEvent *revent = new AEvent();

macros/testShowGraphs.cxx

@@ -5,9 +5,9 @@ void testShowGraphs()
 
 	const Long64_t kFirstEvent = 50;
 
-//	TFile fr("../data/dataDSR4/analysis_07_1.root");
+	TFile fr("../data/dataDSR4/analysis_08_2.root");
 //	TFile fr("../data/dataDSR4/analysis_07_8.root");
-	TFile fr("../data/dataTektronix/exp18.root");
+//	TFile fr("../data/dataTektronix/exp18.root");
 //	TFile fr("../data/dataTektronix/analysisExp7.root");
 	TTree *tr = (TTree*)fr.Get("atree");