Commit 6855412b authored by Vratislav Chudoba's avatar Vratislav Chudoba

Probably successful merge of some of the previous commits.

parent d92d4eae
...@@ -65,21 +65,15 @@ void RawEvent::SetTime(Double_t t, Int_t i) { ...@@ -65,21 +65,15 @@ void RawEvent::SetTime(Double_t t, Int_t i) {
return; return;
} }
<<<<<<< HEAD
Double_t RawEvent::GetTime(Int_t i) { Double_t RawEvent::GetTime(Int_t i) {
return fTime[i]; return fTime[i];
} }
Double_t RawEvent::GetAmp(Int_t i) { Double_t RawEvent::GetAmp(Int_t i) {
=======
double RawEvent::GetOneTime(Int_t i) {
return fTime[i]; return fTime[i];
} }
double RawEvent::GetOneAmp(Int_t i) {
>>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
return fAmp[i];
}
//void RawEvent::SetGraphs() { //void RawEvent::SetGraphs() {
// //
// gAmp->Set(fNPoints); // gAmp->Set(fNPoints);
......
...@@ -62,15 +62,9 @@ public: ...@@ -62,15 +62,9 @@ public:
void PrintTime(Int_t i); void PrintTime(Int_t i);
<<<<<<< HEAD
Double_t GetTime(Int_t i); Double_t GetTime(Int_t i);
Double_t GetAmp(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); // void InvertAmp(Double_t a, Int_t i);
//Inverts the amplitudes i.e. makes from negative singals //Inverts the amplitudes i.e. makes from negative singals
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment