Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Lawrence Davou Christopher
athena
Commits
2015eda9
Commit
2015eda9
authored
7 years ago
by
Grzegorz Gach
Browse files
Options
Downloads
Patches
Plain Diff
Added information about ROB to AFP_RawDataCollection.
Former-commit-id: f9bd659b3507d2562b6cc7b8f5c995bd0fe36c3c
parent
974db9e3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ForwardDetectors/AFP/AFP_RawEv/AFP_RawEv/AFP_RawDataCollection.h
+3
-11
3 additions, 11 deletions
...Detectors/AFP/AFP_RawEv/AFP_RawEv/AFP_RawDataCollection.h
ForwardDetectors/AFP/AFP_RawEv/src/AFP_RawDataCollection.cxx
+6
-5
6 additions, 5 deletions
ForwardDetectors/AFP/AFP_RawEv/src/AFP_RawDataCollection.cxx
with
9 additions
and
16 deletions
ForwardDetectors/AFP/AFP_RawEv/AFP_RawEv/AFP_RawDataCollection.h
+
3
−
11
View file @
2015eda9
...
...
@@ -29,6 +29,7 @@ class AFP_RawDataCollection : public DataVector <AFP_RawData>
uint16_t
m_header_numberId
;
uint16_t
m_ADC2Id
;
bool
m_TrigSyncErrId
;
uint32_t
m_robID
;
///< ID of ROB from which data come from. Destinguish A and C side
public:
...
...
@@ -49,6 +50,7 @@ void Set_lvl1Id(uint16_t MB_number);
void
Set_header
(
uint16_t
header_number_number
);
void
Set_ADC2_POT
(
uint16_t
ADC2_number
);
void
SetTrigSyncErr
(
bool
bit
);
void
Set_robID
(
const
uint32_t
robID
)
{
m_robID
=
robID
;}
void
SetZero_POT
();
...
...
@@ -61,6 +63,7 @@ uint16_t Get_lvl1Id() const {return m_L1Id;};
uint16_t
Get_header_number_POT
()
const
{
return
m_header_numberId
;};
uint16_t
Get_ADC2_POT
()
const
{
return
m_ADC2Id
;};
bool
GetTrigSyncErr
()
const
{
return
m_TrigSyncErrId
;};
uint32_t
Get_robID
()
const
{
return
m_robID
;}
const
std
::
vector
<
AFP_RawData
>&
Get_POT_DATA
()
const
{
return
m_POT_DATA
;};
AFP_RawData
Get_POT_PMF_DATA
(
uint32_t
Numpmf
)
const
{
return
m_POT_DATA
[
Numpmf
];};
...
...
@@ -71,14 +74,3 @@ CLASS_DEF( AFP_RawDataCollection , 1078031561 , 1 )
#endif
This diff is collapsed.
Click to expand it.
ForwardDetectors/AFP/AFP_RawEv/src/AFP_RawDataCollection.cxx
+
6
−
5
View file @
2015eda9
...
...
@@ -4,8 +4,6 @@
#include
"AFP_RawEv/AFP_RawDataCollection.h"
// svn, again...
AFP_RawDataCollection
::
AFP_RawDataCollection
()
:
DataVector
<
AFP_RawData
>
(),
m_L1Id
(
0
),
...
...
@@ -16,7 +14,8 @@ DataVector<AFP_RawData>(),
m_BCIdId
(
0
),
m_header_numberId
(
0
),
m_ADC2Id
(
0
),
m_TrigSyncErrId
(
0
)
m_TrigSyncErrId
(
0
),
m_robID
(
0
)
{
}
...
...
@@ -32,7 +31,8 @@ AFP_RawDataCollection::AFP_RawDataCollection(uint16_t MB_number) :
m_BCIdId
(
0
),
m_header_numberId
(
0
),
m_ADC2Id
(
0
),
m_TrigSyncErrId
(
0
)
m_TrigSyncErrId
(
0
),
m_robID
(
0
)
{
}
...
...
@@ -46,7 +46,8 @@ AFP_RawDataCollection::AFP_RawDataCollection( uint16_t Mrod_number, uint16_t MB_
m_BCIdId
(
0
),
m_header_numberId
(
0
),
m_ADC2Id
(
0
),
m_TrigSyncErrId
(
0
)
m_TrigSyncErrId
(
0
),
m_robID
(
0
)
{
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment