Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena-acts
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
Show more breadcrumbs
Dimitra Amperiadou
athena-acts
Commits
62edd3a4
Commit
62edd3a4
authored
9 years ago
by
Christian Ohm
Committed by
Graeme Stewart
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Branch tag with Scott's fixes without Marcin's xml changes (xAODEventInfo-00-00-22-00)
parent
d8a101e6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Event/xAOD/xAODEventInfo/Root/EventAuxInfo_v1.cxx
+24
-1
24 additions, 1 deletion
Event/xAOD/xAODEventInfo/Root/EventAuxInfo_v1.cxx
Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
+6
-4
6 additions, 4 deletions
Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
with
30 additions
and
5 deletions
Event/xAOD/xAODEventInfo/Root/EventAuxInfo_v1.cxx
+
24
−
1
View file @
62edd3a4
...
...
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventAuxInfo_v1.cxx 6
38
43
1
2015-0
1-09 00:56:12Z ssnyder
$
// $Id: EventAuxInfo_v1.cxx 6
67
43
7
2015-0
5-15 20:10:40Z cohm
$
// Local include(s):
#include
"xAODEventInfo/versions/EventAuxInfo_v1.h"
...
...
@@ -11,9 +11,32 @@ namespace xAOD {
EventAuxInfo_v1
::
EventAuxInfo_v1
()
:
AuxInfoBase
(),
runNumber
(
0
),
eventNumber
(
0
),
lumiBlock
(
0
),
timeStamp
(
0
),
timeStampNSOffset
(
0
),
bcid
(
0
),
detectorMask0
(
0
),
detectorMask1
(
0
),
detectorMask2
(
0
),
detectorMask3
(
0
),
eventTypeBitmask
(
0
),
statusElement
(
0
),
extendedLevel1ID
(
0
),
level1TriggerType
(
0
),
actualInteractionsPerCrossing
(
0
),
averageInteractionsPerCrossing
(
0
),
pixelFlags
(
0
),
sctFlags
(
0
),
trtFlags
(
0
),
larFlags
(
0
),
tileFlags
(
0
),
muonFlags
(
0
),
forwardDetFlags
(
0
),
coreFlags
(
0
),
backgroundFlags
(
0
),
lumiFlags
(
0
),
beamPosX
(
0
),
beamPosY
(
0
),
beamPosZ
(
0
),
...
...
This diff is collapsed.
Click to expand it.
Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
+
6
−
4
View file @
62edd3a4
...
...
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventInfo_v1.cxx 6
36390 2014-12-16 21:52:18Z cranshaw
$
// $Id: EventInfo_v1.cxx 6
67437 2015-05-15 20:10:40Z cohm
$
// System include(s):
#include
<iostream>
...
...
@@ -17,7 +17,7 @@
#include
"xAODEventInfo/EventInfoContainer.h"
#include
"EventInfoAccessors_v1.h"
namespace
{
namespace
xAODEventInfoPrivate
{
// Forward declaration(s):
template
<
typename
T
>
...
...
@@ -48,6 +48,7 @@ namespace {
}
// private namespace
namespace
xAOD
{
using
xAODEventInfoPrivate
::
operator
<<
;
EventInfo_v1
::
EventInfo_v1
()
:
SG
::
AuxElement
(),
m_streamTags
(),
m_updateStreamTags
(
false
),
...
...
@@ -680,8 +681,6 @@ namespace xAOD {
return
;
}
}
// namespace xAOD
/// This operator is provided to make it convenient to print debug messages
/// including information about the current event. With something like:
///
...
...
@@ -728,3 +727,6 @@ std::ostream& operator<< ( std::ostream& out, const xAOD::EventInfo_v1& ei ) {
// Return the stream:
return
out
;
}
}
// namespace xAOD
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