A few macros_W modified.

macros_W/cal1ePeaks.cxx

@@ -7,7 +7,8 @@ void cal1ePeaks()
 {
 
 	TString location = "../data/WPT_tests";
-	TString suffix = "_nonLin";
+//	TString suffix = "_nonLin";
+	TString suffix = "";
 
 	//name of input root file
 	TString iFile;
@@ -16,7 +17,7 @@ void cal1ePeaks()
 //	iFile.Form("%s/680pF_11okt_measure_with_opt_grease/HV900_Sci_mounted_Am241in_front_10cm_thr28_nxtrim1_11oct_30min_0000.root", location.Data());
 
 	//name of file with calibration parameters
-	TString oFile = "cal1e_HV1000_nonLin.par";
+	TString oFile = "parameters/cal1e_HV1000_nonLin.par";
 //	TString oFile = "cal1e_HV950.par";
 //	TString oFile = "cal1e_HV900.par";
 
@@ -27,7 +28,7 @@ void cal1ePeaks()
 
 	//2D histogram to be calibrated
 //	TString histName = "adcAllWoBaseline";
-	TString histName = "fhCalAdcAllWoBaselineNonLinear";
+	TString histName = "fhAdcAllWoBaselineNLcorr";
 
 	ofstream calFile;
 	calFile.open(oFile.Data());
@@ -121,6 +122,11 @@ void cal1ePeaks()
 		cWork[cNumber]->cd(i-pads*cNumber+1);
 		hTemp->Draw();
 		hTemp->GetXaxis()->SetRangeUser(xmin, xmax);
+		hTemp->GetXaxis()->CenterTitle();
+		hTemp->GetXaxis()->SetTitle("A*");
+		hTemp->GetXaxis()->SetTitleSize(0.06);
+		hTemp->GetXaxis()->SetTitleOffset(0.75);
+		hTemp->GetYaxis()->SetTitle("counts");
 		if (useParFile) {
 			std::getline(parFile, line);
 			std::istringstream(line,ios_base::in) >> ch >> min >> max;
@@ -133,6 +139,8 @@ void cal1ePeaks()
 
 	calFile.close();	
 
+//	cWork[0]->SaveAs("figures/cal1e.png");
+
 }
 
 void fillParFilePreliminary(Int_t noChannels, Int_t min, Int_t max) {

macros_W/calPeaksVoltage.cxx

@@ -7,10 +7,10 @@ using namespace std;
 void calPeaksVoltage()
 {
 
-	TString inFile = "parameters/histOutput680.root";
+	TString inFile = "objects/histOutput680.root";
 //	TString inFile = "histOutput.root";
 
-	TString outFile = "../parameters/calGraphs680.root";
+	TString outFile = "objects/calGraphs680.root";
 //	TString outFile = "calGraphs.root";
 
 	TString outPeaksFile = "parameters/halfVoltPositions680.par";

macros_W/extract1DHists.cxx

@@ -3,7 +3,7 @@ void extract1DHists()
 
 	//output in channel units
 //	TString outputFile = "histOutput.root";
-	TString outputFile = "parameters/histOutput680.root";
+	TString outputFile = "objects/histOutput680.root";
 
 	//output in 1e units
 //	TString outputFile = "histOutput1e_HV1000.root";