From 6e9fb460d322c6aaa81eb86bdd5c2cc41a375cee Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Tue, 11 Dec 2018 15:37:04 +0100
Subject: [PATCH] serialisation works
Former-commit-id: ed1d172b53a4392c3abe3708855ed5d3f3e1a257
---
.../TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx | 7 ++++---
.../TrigOutputHandling/src/TriggerEDMSerialiserTool.h | 1 -
.../TrigUpgradeTest/share/egamma.withViews.py | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
index a4cbf6356c6..8fc2eaba783 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
@@ -67,8 +67,9 @@ StatusCode TriggerEDMDeserialiserAlg::execute_r(const EventContext& context) con
resize( bsize );
toBuffer( start, buff.get() );
-
- RootType classDesc = RootType::ByName( transientType+"_v1" ); // TODO remove this dirty hack, needsdiscussion how to find the real type
+ /* TODO find out how to read the type informatin that is encoded in the payload, we will need to have less configuration, and thus more robust decoding
+ // this code is commented but will be used once this one bit is understood
+ RootType classDesc = RootType::ByName( transientType+"_v1" );
size_t usedBytes{ bsize };
void* obj = m_serializerSvc->deserialize( buff.get(), usedBytes, classDesc );
ATH_MSG_DEBUG( "Obtained object " << obj << " which used " << usedBytes << " bytes from available " << bsize );
@@ -84,7 +85,7 @@ StatusCode TriggerEDMDeserialiserAlg::execute_r(const EventContext& context) con
} else {
ATH_MSG_WARNING( "Deserialisation of object of CLID " << clid << " and name " << name << " failed" );
}
-
+ */
start = toNextFragment( start );
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h
index ae831fe99ec..9d1eda9c391 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h
@@ -37,7 +37,6 @@ class TriggerEDMSerialiserTool: public extends<AthAlgTool, HLTResultMTMakerTool>
private:
Gaudi::Property<std::vector<std::string>> m_collectionsToSerialize { this, "CollectionsToSerialize", {}, "TYPE#SG.aux1.aux2..etc key of collections to be streamed (like in StreamAOD), the type has to be an exact type i.e. with _vN not the alias type" };
-
Gaudi::Property<int> m_moduleID { this, "ModuleID", 0, "The HLT result fragment to which the output should be added"};
// internal structure to keep configuration organised conveniently
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index eb99c60b98f..60e46f4f64b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -1,4 +1,5 @@
+
#
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
--
GitLab