Script histCorr.C is complemented

macros/histCorr.C

 //#include "TCanvas.h"
 
-void histCorr()
+void histCorr(const Bool_t can1 = 1, const Bool_t can2 = 1)
 {
 	gSystem->Load("../libData.so");
 	TFile *f = new TFile("../data/dataDSR4/analysis_07_8.root");
 	TTree *t = (TTree*)f->Get("atree");
-	TCanvas *c1 = new TCanvas("canvas", "Correlation pictures");
+
+	if (can1) {
+		TCanvas *c1 = new TCanvas("c1", "Correlation pictures: delta t from CFD vs something");
 		c1->Divide(2,2);
 
-//	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);
+		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", "Time difference between two channels vs amplitude of the first channel",125, -100., 100., 125, 0., 0.5);
+		TH2F *h4 = new TH2F("h4", "Time difference between two channels vs amplitude of the second channel",125, -100., 100., 125, 0., 0.5);
 
 		c1->cd(1);
 		t->Draw("Ach0.fChargeCFD : ( Ach0.fTimeCFD - Ach2.fTimeCFD ) >> h1","","col");
@@ -33,24 +33,53 @@ void histCorr()
 		h2->GetYaxis()->CenterTitle();
 
 		c1->cd(3);
-	t->Draw("Ach0.fChargeCFD:Ach2.fChargeCFD >> h3","","col");
+		t->Draw("Ach0.fAmpMax: ( Ach0.fTimeCFD - Ach2.fTimeCFD ) >> h3","","col");
 		//x
-	h3->GetXaxis()->SetTitle("Q_{2} [C]");
+		h3->GetXaxis()->SetTitle("\\Delta \\tau_{0-2}  [ns]");
 		h3->GetXaxis()->CenterTitle();
 		//y
-	h3->GetYaxis()->SetTitle("Q_{0} [C]");
+		h3->GetYaxis()->SetTitle("Max_ampl_{0} [V]");
 		h3->GetYaxis()->CenterTitle();
 
 		c1->cd(4);
+		t->Draw("Ach2.fAmpMax: ( Ach0.fTimeCFD - Ach2.fTimeCFD ) >> h4","","col");
+		//x
+		h4->GetXaxis()->SetTitle("\\Delta \\tau_{0-2}  [ns]");
+		h4->GetXaxis()->CenterTitle();
+		//y
+		h4->GetYaxis()->SetTitle("Max_ampl_{2} [V]");
+		h4->GetYaxis()->CenterTitle();
+		
+		c1->Show();
+		c1->Update();
+	}
+
+	if (can2) {
+		TCanvas *c2 = new TCanvas("c2", "Correlation pictures: Integrals and amplitudes");
+		c2->Divide(1,2);
+
+		TH2F *h5 = new TH2F("h5", "Integral of the first channel vs integral of the second channel", 300, 0., 2e-9, 300, 0., 2e-9);
+		TH2F *h6 = new TH2F("h6", "Amplitude of the first channel vs amplitude of the second channel", 300, 10, 1e-10, 300, 10, 1e-10);
+
+		c2->cd(1);
+		t->Draw("Ach0.fChargeCFD : Ach2.fChargeCFD >> h5","","col");
+		//x
+		h5->GetXaxis()->SetTitle("Q_{2} [C]");
+		h5->GetXaxis()->CenterTitle();
+		//y
+		h5->GetYaxis()->SetTitle("Q_{0} [C]");
+		h5->GetYaxis()->CenterTitle();
+
+		c2->cd(2);
+		t->Draw("Ach0.fAmpMax : Ach2.fAmpMax >> h6","","col");
+		//x
+		h6->GetXaxis()->SetTitle("Max_ampl_{2} [V]");
+		h6->GetXaxis()->CenterTitle();
+		//y
+		h6->GetYaxis()->SetTitle("Max_ampl_{0} [V]");
+		h6->GetYaxis()->CenterTitle();
 	
-	//TCanvas *c2 = new TCanvas("Correlations 2");
-	//c2->Divide(1,2);
+		c2->Update();
+	}
 
 }
-/*Time difference between two channels vs an integral of the first channel,
-2. Time difference between two channels vs an integral of the second channel,
-3. Integral of the first channel vs integral of the second channel,
-4. Time difference between two channels vs amplitude of the first channel,
-5. Time difference between two channels vs amplitude of the second channel,
-6. Amplitude of the first channel vs amplitude of the second channel
-*/