Modified calibration script and added script for analysis of Be beam

VME_crate

-//===================================================================
-//== VME exp1212 Ne17
-//== Version: 2012-28-11
-//===================================================================
-
-Mod. Position in 	Go4			Description
-     VME crate
-
-v785	 5				Q1[16];		X strips SSD 
-		 5				Q2[16];		Y strips SSD
-v785	 6				C1[16];		Ampl. from CsI (circle)
-v785N	 7				C2[16];		Ampl. from CsI (square)
-v775N	 9				TDC[16];    Times from plastics
-v775	11				TR1[16];		Times from DSD rings
-		11				TS1[16];		Times from DSD sectors
-v775	13				TQ1[16];		Times from X strips SSD
-		13				TQ2[16];		Times from Y strips SSD
-v792N	15				QDC[16];		Ampl. from plastics
-MADC	17				R1[16];		Ampl. from DSD rings
-	   17				S1[16];		Ampl. from DSD sectors
-v560N	20				SCR[16];		Scaler
-
-	Position in		Go4			Description
-	CAMAC crate
-
-		1				x1[32]		X wires of MWPC1
-		2				y1[32]		Y wires of MWPC1
-		3				x2[32]		X wires of MWPC2
-		4				y2[32]		Y wires of MWPC2
-
-
-
-

analysis/fillChain.cxx

@@ -11,15 +11,19 @@ using std::endl;
 void fillTree(Int_t nofile = 0, const Int_t noevents = 0) {
 
 	TString inFile;
-//	inFile.Form("~/data/exp1804/h5_14_%02d.root", nofile);
-	inFile.Form("~/data/exp1804/be10_03_%d0.root", nofile);			//files 00,10,...,60
-//	inFile.Form("~/data/exp1804/be10_%02d_00.root", nofile);		//files 01,02, 03, 05
+	inFile.Form("~/data/exp1804/h5_14_%02d.root", nofile);
+//	inFile.Form("~/data/exp1804/be10_03_%d0.root", nofile);		//files 00,10,...,90
+																//where 70 is run 01
+																//		80 is run 02
+																//		90 is run 05
 //	inFile.Form("~/data/exp1804/calib/si_20_03.root");
 
 	TString outFile;
-//	outFile.Form("~/data/exp1804/h5_14_%02d_calib.root", nofile);
-	outFile.Form("~/data/exp1804/be10_03_%d0_calib.root", nofile);	//files 00,10,...,60
-//	outFile.Form("~/data/exp1804/be10_%02d_00_calib.root", nofile); //files 01,02, 03, 05
+	outFile.Form("~/data/exp1804/h5_14_%02d_calib.root", nofile);
+//	outFile.Form("~/data/exp1804/be10_03_%d0_calib.root", nofile);	//files 00,10,...,60
+																	//where 70 is run 01
+																	//		80 is run 02
+																	//		90 is run 05
 //	outFile.Form("~/data/exp1804/calib/si_20_03_calib.root");
 
 	cout << "Input file: " << inFile << endl;

analysis/showBananas2.cxx

@@ -17,14 +17,14 @@ void showBananas2() {
 
 //	TFile *fr = new TFile("~/data/exp1804/h5_11_00.root");
 	TChain *tr = new TChain("AnalysisxTree");
-//	tr->Add("~/data/exp1804/h5_14_0?.root");
-	tr->Add("~/data/exp1804/be10_0?_?0.root");
+	tr->Add("~/data/exp1804/h5_14_0?.root");
+//	tr->Add("~/data/exp1804/be10_0?_?0.root");
 
 
 	TChain *trCal = new TChain("cal");
 //	trCal->Add("~/data/exp1804/h5_11_0?_calib.root");
-//	trCal->Add("~/data/exp1804/h5_14_0?_calib.root");
-	trCal->Add("~/data/exp1804/be10_0?_?0_calib.root");
+	trCal->Add("~/data/exp1804/h5_14_0?_calib.root");
+//	trCal->Add("~/data/exp1804/be10_0?_?0_calib.root");
 
 	tr->AddFriend(trCal);
 
@@ -384,7 +384,7 @@ void showBananas2() {
 
 	//*/
 
-	return;
+//	return;
 
 /////////////////////////////////////////////////////////////////////
 //	c9
@@ -507,7 +507,7 @@ void showBananas2() {
 /////////////////////////////////////////////////////////////////////
 //	c11
 
-	TCanvas *c11 = new TCanvas("c11", "dE-E uncorrected", 1600, 800);
+	/*TCanvas *c11 = new TCanvas("c11", "dE-E uncorrected", 1600, 800);
 	c11->Divide(4,2);
 
 	firstThinStrip = 5;
@@ -539,7 +539,7 @@ void showBananas2() {
 /////////////////////////////////////////////////////////////////////
 //	c12
 
-	TCanvas *c12 = new TCanvas("c12", "dE-E corrected (first approximation)", 1600, 800);
+	/*TCanvas *c12 = new TCanvas("c12", "dE-E corrected (first approximation)", 1600, 800);
 	c12->Divide(4,2);
 
 	Int_t drawnEvents2[8];
@@ -562,6 +562,7 @@ void showBananas2() {
 				i+firstThinStrip, i+firstThinStrip);
 
 		tr->Draw(varName, condition, "col", drawEntries);
+		c12->Update();
 	}//*/
 
 //	return;