From ddc88a08be9fc5794564a88a0723ebd17c5daf0c Mon Sep 17 00:00:00 2001
From: "Kostyleva D.A" <dariak@exolina2.jinr.ru>
Date: Mon, 17 Oct 2016 14:25:42 +0300
Subject: [PATCH] Fixing output file with energies

---
 AculData/AculCalibration.cpp | 2 +-
 AculData/AculCalibration.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AculData/AculCalibration.cpp b/AculData/AculCalibration.cpp
index 24d86d2..28f130e 100755
--- a/AculData/AculCalibration.cpp
+++ b/AculData/AculCalibration.cpp
@@ -1118,7 +1118,7 @@ void AculCalibration::FindEnergyPeaks(TCanvas *c1, const char* ifile, const char
 		PeaksFitting(hWork);
 		hWork->Draw();
 
-		ofile << hWork->GetName()<<"\t"<< fPeak[0] <<"\t"<< fPeak[1] <<"\t"<< fPeak[2] <<"\t"<< fPeak[3] <<endl;
+		ofile << i <<"\t"<< fPeak[0] <<"\t"<< fPeak[1] <<"\t"<< fPeak[2] <<"\t"<< fPeak[3] <<endl;
 
 	}
 
diff --git a/AculData/AculCalibration.h b/AculData/AculCalibration.h
index 72aaa75..159975b 100755
--- a/AculData/AculCalibration.h
+++ b/AculData/AculCalibration.h
@@ -146,7 +146,7 @@ public:
 	//  blockmax: maximum  block data are displayed for
 
 	Bool_t	CalculateCalibParameters(const char* inputfile, const char* block,
-			/*const Int_t address,*/ const char* treename, Int_t lowerchannel = 0,
+			const char* treename, Int_t lowerchannel = 0,
 			Int_t upperchannel = 4095, Int_t nEBins = 1000, Int_t lowersubaddress = 0,
 			Int_t uppersubaddress = ADDRESSNUMBER-1); //calculate calibration parameters for given block in given file
 
@@ -178,7 +178,7 @@ public:
 
 
 
-	void CalibrateRawSpectra(const char* inputfile, const char* block, /*const Int_t address,*/ const char* treename, Int_t lowerchannel = 0, Int_t upperchannel = 4095, Int_t nEBins = 1000, Int_t lowersubaddress = 0, Int_t uppersubaddress = ADDRESSNUMBER-1);
+	void CalibrateRawSpectra(const char* inputfile, const char* block, const char* treename, Int_t lowerchannel = 0, Int_t upperchannel = 4095, Int_t nEBins = 1000, Int_t lowersubaddress = 0, Int_t uppersubaddress = ADDRESSNUMBER-1);
 
 	void FindEnergyPeaks(TCanvas *c1, const char* ifile, const char* outfile);
 //	const char* inputfile, const char* block,
-- 
2.18.1