Skip to content
Snippets Groups Projects
Commit 5f9c7de3 authored by Frank Winklmeier's avatar Frank Winklmeier Committed by Atlas Nightlybuild
Browse files

Merge branch 'transOwn.AthContainers-20210924' into 'master'

AthContainers: Make DataVector::m_ownPolicy transient.

See merge request !46724

(cherry picked from commit 1f9f81f6)

dfc1b820 AthContainers: Make DataVector::m_ownPolicy transient.
e4073a70 trigbs_dumpHLTNav.py needs to read bs-streamerinfos.root in order to handle schema evolution.
24be20da fix flake8 warnings
parent 044f4944
No related branches found
No related tags found
No related merge requests found
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file AthContainers/DataVector.h
......@@ -3262,6 +3262,10 @@ public:
/// Declare the automatically created variable transient
ROOT_SELECTION_NS::MemberAttributes< kTransient > m_isMostDerived;
/// We do not want to save this. The P->T converter should
/// decide the ownership mode.
ROOT_SELECTION_NS::MemberAttributes< kTransient > m_ownPolicy;
};
EXIT_ROOT_SELECTION_NS
......
......@@ -31,7 +31,8 @@ atlas_add_test( dumpHLTContentInBS_run3
LOG_IGNORE_PATTERN "^----.*(bytes|B/ev)" )
atlas_add_test( dumpHLTNav
SCRIPT trigbs_dumpHLTNav.py -n 3 -s 371 ${trigbs_testFileRun3} )
SCRIPT trigbs_dumpHLTNav.py -n 3 -s 371 ${trigbs_testFileRun3}
LOG_IGNORE_PATTERN "no dictionary for class" )
atlas_add_test( updateMetadata
SCRIPT rm -f newMeta.*.data
......
......@@ -85,7 +85,7 @@ def dump_nav(collections):
cont_if.setStore(cont_aux)
print(' - %s' % key)
print(' - %s' % key, flush=True)
for i in range(cont_if.size()):
obj = cont_if.at(i)
print(' - Element #%d' % i)
......@@ -142,7 +142,21 @@ def dump_info(bsfile, args):
dump_nav(collections)
def load_streamerinfos():
import ROOT
import os
for p in os.environ['DATAPATH'].split (':'):
fname = os.path.join (p, 'bs-streamerinfos.root')
if os.path.exists (fname):
ROOT.TFile.Open (fname)
break
else:
log.warning('Cannot find bs-streamerinfos.root file in DATAPATH')
return
if '__main__' in __name__:
args = get_parser().parse_args()
load_streamerinfos()
for f in args.files:
dump_info(f, args)
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