Script histCorr.C for drawing correlation pictures is modified, pictures are added

data/rawDataDSR4/LOGBOOK.md

@@ -6,7 +6,7 @@ File name		| Num of events | Comment
 ------------------------|---------------|---------------------------------------------------------------------|
 NeuRad_test_071216_1.dat| 500           | collimated gamma source; ch0 and ch1 have coincidence; trigger ch0  |
 NeuRad_test_071216_2.dat| 5000          | collimated gamma source; ch0 and ch1 have coincidence; trigger ch0  |
-NeuRad_test_071216_3.dat|		| neutron source Cf						      |
+NeuRad_test_071216_3.dat| 1039		| neutron source Cf						      |
 NeuRad_test_071216_4.dat| 2000		| source 60Co; trigger ch0; ch0-front, ch1,ch2,ch3 - back	      |
 NeuRad_test_071216_5.dat| 2000		| source 60Co; trigger ch0; ch0-front, ch1,ch2,ch3 - back	      |
 NeuRad_test_071216_6.dat| 2000		| source 60Co; trigger ch0; ch0-front, ch1,ch2,ch3 - back	      |
@@ -17,5 +17,5 @@ Change of PMT amplification: increasing voltage up to 1100 mV, threshold 25 mV
 
 ------------------------|---------------|---------------------------------------------------------------------|
 NeuRad_test_071216_8.dat| 10000		| source 60Co; trigger ch0; ch0-front, ch1,ch2,ch3 - back 	      |
-NeuRad_test_081216_1.dat|		| trigger ch2	      				?????		      |
+NeuRad_test_081216_1.dat| 2204		| trigger ch2	      				?????		      |
 NeuRad_test_081216_2.dat| 10000		| collimated gamma source; two channels only: ch0 and ch1	      |

macros/histCorr.C

 //#include "TCanvas.h"
 
-void histCorr(const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 = 0, const Bool_t can4 = 1)
+void histCorr(const char *filename = "analysis_07_8.root", const char *foldername = "7_8", const char *ext = ".eps", const Bool_t can1 = 1, const Bool_t can2 = 1, const Bool_t can3 = 1, const Bool_t can4 = 1)
 {
 	gSystem->Load("../libData.so");
-//	TFile *f = new TFile("../data/dataDSR4/analysis_07_8.root");
-	TFile *f = new TFile("../data/dataDSR4/test18.root");
+	TFile *f = new TFile(Form("../data/dataDSR4/%s", filename));
+//	TFile *f = new TFile("../data/dataDSR4/analysis_08_2.root");
 	TTree *t = (TTree*)f->Get("atree");
 
 	if (can1) {
@@ -56,6 +56,7 @@ void histCorr(const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 =
 		
 		c1->Show();
 		c1->Update();
+		c1->Print(Form("../macros/picsDRS4/file%s/TimeDiffCFD%s", foldername, ext));
 	}
 
 	if (can2) {
@@ -85,6 +86,8 @@ void histCorr(const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 =
 		h6->GetYaxis()->CenterTitle();
 	
 		c2->Update();
+		c2->Print(Form("../macros/picsDRS4/file%s/IntergAmpl%s", foldername, ext));
+	//	c2->Print("../macros/picsDRS4/file7_8/IntergAmpl.eps");
 	}
 
 	if (can3) {
@@ -129,22 +132,26 @@ void histCorr(const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 =
 		t->SetLineColor(kRed);
 		t->Draw("Ach1.fTime90 - Ach1.fTime10","((Ach1.fTime90-Ach1.fTime10)>=0) && (Ach1.fEdgeXi < 0.0005)","same");
 		c3->Update();
+		c3->Print(Form("../macros/picsDRS4/file%s/RisingEdge%s", foldername, ext));
+	//	c3->Print("../macros/picsDRS4/file7_8/RisingEdge.eps");
 
 	}
 
-if (can4) {
-		TCanvas *c4 = new TCanvas("c4", "Correlation pictures: rising edge times");
+	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");
 		//x
-		h10->GetXaxis()->SetTitle("\\Delta \\tau_{0}^{(rise)} [ns]");
+		h10->GetXaxis()->SetTitle("\\Delta \\tau_{1}^{(rise)} [ns]");
 		h10->GetXaxis()->CenterTitle();
 		//y
 		h10->GetYaxis()->SetTitle("fEdgeXi");
 		h10->GetYaxis()->CenterTitle();
 		c4->Update();
-}
+		c4->Print(Form("../macros/picsDRS4/file%s/XiSquares%s", foldername, ext));
+
+	}
 
 }