Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NeuRad_tests
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vratislav Chudoba
NeuRad_tests
Commits
3ac26a0b
Commit
3ac26a0b
authored
Jan 11, 2017
by
Vratislav Chudoba
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://er.jinr.ru:90/vratislav.chudoba/NeuRad_tests
parents
d3787933
ce93b2dc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
RawEvent.cpp
dataClasses/RawEvent.cpp
+8
-0
RawEvent.h
dataClasses/RawEvent.h
+6
-0
No files found.
dataClasses/RawEvent.cpp
View file @
3ac26a0b
...
...
@@ -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
View file @
3ac26a0b
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment