Skip to content
Snippets Groups Projects
Commit 11fd26f6 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

Making it possible to read xAOD::TriggerMenu metadata correctly (xAODTrigger-00-00-35-02)

	* Backporting a fix from xAODTrigger-00-00-37, which is needed
	  in order to be able to read xAOD::TriggerMenu metadata
	  successfully.
	* Tagging as xAODTrigger-00-00-35-02

2015-07-03 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Making the xAOD::TrigDecisionAuxInfo_v1 and
	  xAOD::EnergySumRoIAuxInfo_v1 constructors initialise their
	  primitive member variables explicitly. To avoid an irreproducibility
	  issue discovered in the T0 validation jobs.
	* Removing the mistakenly created xAODTrigger-00-00-35 subdirectory.
	* Tagging as xAODTrigger-00-00-35-01
parent 03c5087a
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/ */
// $Id: EnergySumRoIAuxInfo_v1.cxx 579914 2014-01-24 10:15:15Z krasznaa $ // $Id: EnergySumRoIAuxInfo_v1.cxx 680153 2015-07-03 13:47:51Z krasznaa $
// Local includes // Local includes
#include "xAODTrigger/versions/EnergySumRoIAuxInfo_v1.h" #include "xAODTrigger/versions/EnergySumRoIAuxInfo_v1.h"
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
namespace xAOD { namespace xAOD {
EnergySumRoIAuxInfo_v1::EnergySumRoIAuxInfo_v1() EnergySumRoIAuxInfo_v1::EnergySumRoIAuxInfo_v1()
: AuxInfoBase() { : AuxInfoBase(),
roiWord0( 0 ), roiWord1( 0 ), roiWord2( 0 ),
thrNames(), energyX( 0 ), energyY( 0 ), energyT( 0 ) {
AUX_VARIABLE( roiWord0 ); AUX_VARIABLE( roiWord0 );
AUX_VARIABLE( roiWord1 ); AUX_VARIABLE( roiWord1 );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/ */
// $Id: TrigDecisionAuxInfo_v1.cxx 581968 2014-02-06 16:08:52Z krasznaa $ // $Id: TrigDecisionAuxInfo_v1.cxx 680153 2015-07-03 13:47:51Z krasznaa $
// Local include(s): // Local include(s):
#include "xAODTrigger/versions/TrigDecisionAuxInfo_v1.h" #include "xAODTrigger/versions/TrigDecisionAuxInfo_v1.h"
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
namespace xAOD { namespace xAOD {
TrigDecisionAuxInfo_v1::TrigDecisionAuxInfo_v1() TrigDecisionAuxInfo_v1::TrigDecisionAuxInfo_v1()
: AuxInfoBase() { : AuxInfoBase(),
smk( 0 ), bgCode( 0 ), lvl2ErrorBits( 0 ), efErrorBits( 0 ),
lvl2Truncated( false ), efTruncated( false ) {
AUX_VARIABLE( smk ); AUX_VARIABLE( smk );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/ */
// $Id: TriggerMenu_v1.cxx 631658 2014-11-27 18:53:39Z lheinric $ // $Id: TriggerMenu_v1.cxx 683716 2015-07-17 10:03:58Z krasznaa $
// System include(s): // System include(s):
#include <iostream> #include <iostream>
...@@ -149,7 +149,7 @@ namespace xAOD { ...@@ -149,7 +149,7 @@ namespace xAOD {
bool TriggerMenu_v1::chainSignatureLogicsAvailable() const { bool TriggerMenu_v1::chainSignatureLogicsAvailable() const {
static Accessor< std::vector< std::vector< uint32_t > > > acc( "chainSignatureLogics" ); static Accessor< std::vector< std::vector< int > > > acc( "chainSignatureLogics" );
return acc.isAvailable( *this ); return acc.isAvailable( *this );
} }
......
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