Skip to content
Snippets Groups Projects
Commit 62edd3a4 authored by Christian Ohm's avatar Christian Ohm Committed by Graeme Stewart
Browse files

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
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventAuxInfo_v1.cxx 638431 2015-01-09 00:56:12Z ssnyder $
// $Id: EventAuxInfo_v1.cxx 667437 2015-05-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),
......
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventInfo_v1.cxx 636390 2014-12-16 21:52:18Z cranshaw $
// $Id: EventInfo_v1.cxx 667437 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment