From 6bd7004c2542eafa970f8f89b4875d8e10331640 Mon Sep 17 00:00:00 2001 From: Tomasz Bold <tomasz.bold@gmail.com> Date: Thu, 29 Nov 2018 14:30:24 +0100 Subject: [PATCH] Debugged Aux data --- .../src/TriggerEDMSerialiserTool.cxx | 12 +++++++++++- .../TrigUpgradeTest/share/egamma.withViews.py | 5 +++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx index c8991b35bbc..3de56dd7927 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx +++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx @@ -133,12 +133,21 @@ StatusCode TriggerEDMSerialiserTool::fillDynAux( const Address& address, DataObj ATH_MSG_ERROR( "Can not obtain CLID of: " << typeName ); return StatusCode::FAILURE; } + ATH_MSG_DEBUG( "CLID " << clid ); RootType classDesc = RootType::ByName( typeName ); size_t sz=0; const void* rawptr = auxStore->getData( auxVarID ); ATH_CHECK( rawptr != nullptr ); + + if ( clid == ClassID_traits<std::vector<float>>::ID() ) { + const std::vector<float>* fvec = reinterpret_cast<const std::vector<float>*> (rawptr); + ATH_MSG_DEBUG("Aux size " << fvec->size() ); + for ( float v : *fvec ) { + ATH_MSG_DEBUG(" v: " << v ); + } + } void* mem = m_serializerSvc->serialize( rawptr, classDesc, sz ); @@ -146,7 +155,7 @@ StatusCode TriggerEDMSerialiserTool::fillDynAux( const Address& address, DataObj ATH_MSG_ERROR( "Serialisation of " << address.type <<"#" << address.key << "."<< name << " unsuccessful" ); return StatusCode::FAILURE; } - + std::vector<uint32_t> fragment; Address auxAddress = { typeName, clid, address.key+"."+name, false }; ATH_CHECK( makeHeader( auxAddress, fragment ) ); @@ -158,6 +167,7 @@ StatusCode TriggerEDMSerialiserTool::fillDynAux( const Address& address, DataObj ATH_MSG_DEBUG("Fragment size " << fragment.size() ); buffer.insert( buffer.end(), fragment.begin(), fragment.end() ); + } diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py index bb87abcaaa6..817c7cb8b50 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py @@ -349,9 +349,10 @@ print summMaker serialiser = TriggerEDMSerialiserTool(name="Serialiser", OutputLevel=VERBOSE) serialiser.CollectionsToSerialize = [ "xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions", - "xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux.*", + "xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux.", "xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex", - "xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.eta.phi.rawEnergy.rawEt.rawEta.rawPhi.nCells.clusterQuality.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot" ] + "xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot" ] + #"xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux." ] stmaker = StreamTagMakerTool() stmaker.OutputLevel = DEBUG -- GitLab