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
b3ddd8eb
Commit
b3ddd8eb
authored
Jan 12, 2017
by
Kostyleva D.A
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Readme with logbook information is added, some warnings are eliminated
parent
5180a1eb
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
26 deletions
+33
-26
README.txt
convertDRS4/README.txt
+1
-1
read_binary.cpp
convertDRS4/read_binary.cpp
+3
-5
README.md
data/rawDataDSR4/README.md
+19
-1
AEvent.cpp
dataClasses/AEvent.cpp
+4
-11
AEvent.h
dataClasses/AEvent.h
+1
-2
analyse.C
macros/analyse.C
+2
-2
makefile
makefile
+3
-4
No files found.
convertDRS4/README.txt
View file @
b3ddd8eb
...
...
@@ -2,7 +2,7 @@ Application for convertation of binary files acquired by DRS4 to ROOT file.
1. read_binary.cpp complies within makefile (commaned make clean, then make in Neurad_test) and makes object file read_binary in current directory
2. To convert binary file to root file do:
./read_binary_DRS4 ./data/rawDataDSR4/input_file_name.dat ../data/rawDataDSR4/output_file_name.root
./read_binary_DRS4 .
.
/data/rawDataDSR4/input_file_name.dat ../data/rawDataDSR4/output_file_name.root
!both input and output files should be specified!
convertDRS4/read_binary.cpp
View file @
b3ddd8eb
...
...
@@ -333,11 +333,9 @@ int main(int argc, const char * argv[])
rfile
->
Write
();
rfile
->
Close
();
// delete event;
printf
(
"error1
\n
"
);
delete
[]
event
;
printf
(
"error2
\n
"
);
for
(
Int_t
i
=
0
;
i
<
4
;
i
++
)
{
delete
event
[
i
];
}
return
1
;
}
data/rawDataDSR4/README.md
View file @
b3ddd8eb
Raw data. Both in binary and root format.
Logbook
File name | Num of events | Comment
------------------------|---------------|---------------------------------------------------------------------|
NeuRad_test_071216_1.dat| 500 |
NeuRad_test_071216_2.dat| 500 | collimated gamma source; ch0 and ch1 have coincidence; ?trigger ch0?|
NeuRad_test_071216_3.dat| | neutron source Cf |
NeuRad_test_071216_4.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_5.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_6.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_7.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
***
Change of PMT amplification: increasing voltage up to 1100 mV, threshold 25 mV
***
NeuRad_test_071216_8.dat| 10000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_081216_1.dat| | trigger ch3 |
NeuRad_test_081216_2.dat| | collimated gamma source; two channels only: ch1 and ch2 |
dataClasses/AEvent.cpp
View file @
b3ddd8eb
...
...
@@ -55,11 +55,8 @@ void AEvent::ProcessEvent() {
fTime
[
j
]
=
time
[
j
];
}
// SetGraphs();
const
Double_t
zeroLevel
=
FindZeroLevel
();
// const Double_t zeroLevel = 0;
for
(
Int_t
j
=
0
;
j
<
fNPoints
;
j
++
)
{
//fAmpPos[j] = amp[j]*(-1.) - zeroLevel;
fAmpPos
[
j
]
=
fAmpPos
[
j
]
-
zeroLevel
;
}
...
...
@@ -176,26 +173,22 @@ void AEvent::SetCFD() {
Double_t
AEvent
::
FindZeroLevel
(
Int_t
pmin
,
Int_t
pmax
)
{
// fGraphZero->Set(fNPoints);
// const Double_t *amp = fInputEvent->GetAmp();
// const Double_t *time = fInputEvent->GetTime();
SetGraphs
();
Double_t
correction
=
0
;
TF1
*
fit1
=
new
TF1
(
"fit1"
,
"[0]"
);
TF1
*
fit1
=
new
TF1
(
"fit1"
,
"[0]"
);
//function for one parameter fitting in the range of pmin-pmax
fit1
->
SetRange
(
pmin
,
pmax
);
// Warning("AEvent::FindZeroLevel", "Graph was not set");
if
(
!
fGraphSignal
)
{
Warning
(
"AEvent::FindZeroLevel"
,
"Graph was not set"
);
return
0
;
}
// fGraphSignal->Print();
fGraphSignal
->
Fit
(
fit1
,
"RQN"
,
"goff"
);
// fGraphSignal->Fit(fit1,"QR","goff");
correction
=
fit1
->
GetParameter
(
0
);
// printf("zero level %f\n", correction);
delete
fit1
;
return
correction
;
}
Double_t
AEvent
::
GetfCFD
()
{
return
fCFD
;
...
...
dataClasses/AEvent.h
View file @
b3ddd8eb
...
...
@@ -85,8 +85,7 @@ public:
//draws signal shape graphs
Double_t
FindZeroLevel
(
Int_t
pmin
=
10
,
Int_t
pmax
=
100
);
//for zero level correction
//one parameter fit between pmin and pmax
//for zero level correction. one parameter fit between pmin and pmax
//returns fit parameter i.e. number on which amplitude should be corrected
private
:
...
...
macros/analyse.C
View file @
b3ddd8eb
...
...
@@ -2,7 +2,7 @@ void analyse()
{
gSystem
->
Load
(
"../libData.so"
);
TFile
*
f
=
new
TFile
(
"../data/rawDataDSR4/NeuRad_test_07_
1
.root"
);
TFile
*
f
=
new
TFile
(
"../data/rawDataDSR4/NeuRad_test_07_
3
.root"
);
TTree
*
tr
=
(
TTree
*
)
f
->
Get
(
"rtree"
);
const
Int_t
noBranches
=
4
;
...
...
@@ -19,7 +19,7 @@ void analyse()
// tr->SetMakeClass(1);
TFile
*
fw
=
new
TFile
(
"../data/dataDSR4/analysis_07_
1
.root"
,
"RECREATE"
);
//create .root file with somehow analyzed data
TFile
*
fw
=
new
TFile
(
"../data/dataDSR4/analysis_07_
3
.root"
,
"RECREATE"
);
//create .root file with somehow analyzed data
TTree
*
tw
=
new
TTree
(
"atree"
,
"title of drs4 analysis tree"
);
//create analysis tree atree in it
AEvent
*
wevent
[
noBranches
];
// pointer to the array (of AEvent class) in which analyzed data for each channel will be put
...
...
makefile
View file @
b3ddd8eb
...
...
@@ -31,8 +31,7 @@ CONVERTRAWTOANALYZED = $(PWD)/convertRawToAnalyzed
all
:
libData.so
\
read_binary_DRS4
\
convertTektronix
\
convertRawToAnalyzed
convertTektronix
#ROOT html documentation, it will be done as a program which will be alsa compiled by this makefile, program will be as a last condition after all of the libraries
...
...
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