Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acc2go4
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pavel Sharov
acc2go4
Commits
13493d00
Commit
13493d00
authored
Sep 11, 2024
by
mbsdaq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some changes in histogram filling
parent
60971d7a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
TNeEvent.cxx
TNeEvent.cxx
+3
-1
TNeProc.cxx
TNeProc.cxx
+7
-6
No files found.
TNeEvent.cxx
View file @
13493d00
...
@@ -32,7 +32,9 @@ void TNeEvent::Clear(Option_t *t)
...
@@ -32,7 +32,9 @@ void TNeEvent::Clear(Option_t *t)
//==================================================================
//==================================================================
// SQ
// SQ
memset
(
T1xa
,
0
,
sizeof
(
T1xa
));
memset
(
T1xa
,
0
,
sizeof
(
T1xa
));
memset
(
T1xa
,
0
,
sizeof
(
T1xa
));
memset
(
T1xt
,
0
,
sizeof
(
T1xt
));
memset
(
T1ya
,
0
,
sizeof
(
T1ya
));
memset
(
T1yt
,
0
,
sizeof
(
T1yt
));
// ToF
// ToF
memset
(
F3
,
0
,
sizeof
(
F3
));
memset
(
F3
,
0
,
sizeof
(
F3
));
...
...
TNeProc.cxx
View file @
13493d00
...
@@ -115,13 +115,13 @@ TNeProc::TNeProc(const char* name) : TGo4EventProcessor(name)
...
@@ -115,13 +115,13 @@ TNeProc::TNeProc(const char* name) : TGo4EventProcessor(name)
d1T1xa
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1xa/T1xas_%2.2d"
,
i
)
//указывать не повторяющуюся структуру папок и уникальные имена
d1T1xa
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1xa/T1xas_%2.2d"
,
i
)
//указывать не повторяющуюся структуру папок и уникальные имена
,
Form
(
"T1 x amp CH %2.2d"
,
i
),
8192
,
0.
,
8192.
);
,
Form
(
"T1 x amp CH %2.2d"
,
i
),
8192
,
0.
,
8192.
);
d1T1xt
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1xt/T1xts_%2.2d"
,
i
)
d1T1xt
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1xt/T1xts_%2.2d"
,
i
)
,
Form
(
"T1 x time CH %2.2d"
,
i
),
4096
,
0.
,
4095.
);
,
Form
(
"T1 x time CH %2.2d"
,
i
),
4096
,
1.
,
4096
);
d1T1xc
[
i
]
=
MakeTH1
(
'D'
,
Form
(
"T1xc/T1xcs_%2.2d"
,
i
)
d1T1xc
[
i
]
=
MakeTH1
(
'D'
,
Form
(
"T1xc/T1xcs_%2.2d"
,
i
)
,
Form
(
"T1 x energy MeV %2.2d"
,
i
),
4000
,
-
2.
,
98.
);
,
Form
(
"T1 x energy MeV %2.2d"
,
i
),
4000
,
-
2.
,
98.
);
d1T1ya
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1ya/T1yas_%2.2d"
,
i
)
//указывать не повторяющуюся структуру папок и уникальные имена
d1T1ya
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1ya/T1yas_%2.2d"
,
i
)
//указывать не повторяющуюся структуру папок и уникальные имена
,
Form
(
"T1 x amp CH %2.2d"
,
i
),
8192
,
0.
,
8192.
);
,
Form
(
"T1 x amp CH %2.2d"
,
i
),
8192
,
0.
,
8192.
);
d1T1yt
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1yt/T1yts_%2.2d"
,
i
)
d1T1yt
[
i
]
=
MakeTH1
(
'I'
,
Form
(
"T1yt/T1yts_%2.2d"
,
i
)
,
Form
(
"T1 x time CH %2.2d"
,
i
),
4096
,
0.
,
4095.
);
,
Form
(
"T1 x time CH %2.2d"
,
i
),
4096
,
1
,
4096
);
d1T1yc
[
i
]
=
MakeTH1
(
'D'
,
Form
(
"T1yc/T1ycs_%2.2d"
,
i
)
d1T1yc
[
i
]
=
MakeTH1
(
'D'
,
Form
(
"T1yc/T1ycs_%2.2d"
,
i
)
,
Form
(
"T1 x energy MeV %2.2d"
,
i
),
4000
,
-
2.
,
98.
);
,
Form
(
"T1 x energy MeV %2.2d"
,
i
),
4000
,
-
2.
,
98.
);
}
}
...
@@ -192,6 +192,7 @@ Bool_t TNeProc::BuildEvent(TGo4EventElement* target)
...
@@ -192,6 +192,7 @@ Bool_t TNeProc::BuildEvent(TGo4EventElement* target)
TGo4Analysis
*
go4
=
TGo4Analysis
::
Instance
();
TGo4Analysis
*
go4
=
TGo4Analysis
::
Instance
();
TNeEvent
*
NeEvent
=
(
TNeEvent
*
)
target
;
TNeEvent
*
NeEvent
=
(
TNeEvent
*
)
target
;
target
->
Clear
();
TGo4MbsSubEvent
*
psubevt
;
TGo4MbsSubEvent
*
psubevt
;
TGo4MbsEvent
*
fInput
=
(
TGo4MbsEvent
*
)
GetInputEvent
();
TGo4MbsEvent
*
fInput
=
(
TGo4MbsEvent
*
)
GetInputEvent
();
...
@@ -477,11 +478,11 @@ Bool_t TNeProc::BuildEvent(TGo4EventElement* target)
...
@@ -477,11 +478,11 @@ Bool_t TNeProc::BuildEvent(TGo4EventElement* target)
switch
(
module_id
)
switch
(
module_id
)
{
{
case
3
:
// mTDC: time sect & rings p1
case
3
:
// mTDC: time sect & rings p1
chnl
=
(
idata
[
n
]
>>
16
)
&
0x
1
f
;
chnl
=
(
idata
[
n
]
>>
16
)
&
0x
3
f
;
adc
=
idata
[
n
]
&
0xfff
;
//only 12 bits
adc
=
idata
[
n
]
&
0xfff
;
//only 12 bits
if
(
chnl
<
16
)
{
if
(
chnl
<
16
)
{
NeEvent
->
T1xt
[
chnl
]
=
adc
;
NeEvent
->
T1xt
[
chnl
]
=
adc
;
}
else
{
}
else
if
(
chnl
<
32
)
{
NeEvent
->
T1yt
[
chnl
-
16
]
=
adc
;
NeEvent
->
T1yt
[
chnl
-
16
]
=
adc
;
}
}
break
;
break
;
...
@@ -623,9 +624,9 @@ ToF = (tf5 - tf3)*0.015625 + 68.475;
...
@@ -623,9 +624,9 @@ ToF = (tf5 - tf3)*0.015625 + 68.475;
}
}
}
}
for
(
n
=
0
;
n
<
16
;
++
n
)
{
for
(
n
=
0
;
n
<
16
;
++
n
)
{
d1T1xa
[
n
]
->
Fill
(
NeEvent
->
T1xa
[
n
]);
if
(
NeEvent
->
T1xt
[
n
]
>
0
)
d1T1xa
[
n
]
->
Fill
(
NeEvent
->
T1xa
[
n
]);
d1T1xt
[
n
]
->
Fill
(
NeEvent
->
T1xt
[
n
]);
d1T1xt
[
n
]
->
Fill
(
NeEvent
->
T1xt
[
n
]);
d1T1ya
[
n
]
->
Fill
(
NeEvent
->
T1ya
[
n
]);
if
(
NeEvent
->
T1yt
[
n
]
>
0
)
d1T1ya
[
n
]
->
Fill
(
NeEvent
->
T1ya
[
n
]);
d1T1yt
[
n
]
->
Fill
(
NeEvent
->
T1yt
[
n
]);
d1T1yt
[
n
]
->
Fill
(
NeEvent
->
T1yt
[
n
]);
hT1a
->
Fill
(
NeEvent
->
T1xa
[
n
],
n
);
hT1a
->
Fill
(
NeEvent
->
T1xa
[
n
],
n
);
hT1a
->
Fill
(
NeEvent
->
T1ya
[
n
],
n
+
16
);
hT1a
->
Fill
(
NeEvent
->
T1ya
[
n
],
n
+
16
);
...
...
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