Merge branch 'master' of http://er.jinr.ru:90/vratislav.chudoba/NeuRad_tests

dataClasses/RawEvent.cpp

@@ -65,11 +65,19 @@ void RawEvent::SetTime(Double_t t, Int_t i) {
 	return;
 }
 
+<<<<<<< HEAD
 Double_t RawEvent::GetTime(Int_t i) {
 		return fTime[i];
 }
 
 Double_t RawEvent::GetAmp(Int_t i) {
+=======
+double RawEvent::GetOneTime(Int_t i) {
+		return fTime[i];
+}
+
+double RawEvent::GetOneAmp(Int_t i) {
+>>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
 		return fAmp[i];
 }
 //void RawEvent::SetGraphs() {

dataClasses/RawEvent.h

@@ -62,9 +62,15 @@ public:
 
 	void PrintTime(Int_t i);
 
+<<<<<<< HEAD
 	Double_t GetTime(Int_t i);
 
 	Double_t GetAmp(Int_t i);
+=======
+	double GetOneTime(Int_t i);
+
+	double GetOneAmp(Int_t i);	
+>>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
 
 //	void InvertAmp(Double_t a, Int_t i);
 	//Inverts the amplitudes i.e. makes from negative singals