diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx index a4cbf6356c6ccbbc2d562e6990e30528aaa38119..8fc2eaba783c0b914ec457734e4c9554481a5f38 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 ae831fe99ec0e8dca1a8b9dfa4b03ede843be635..9d1eda9c391ff9ab7ad866ac7a0da7a4996f0499 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 eb99c60b98f5d38a8a8a87038cb923624be6aa72..60e46f4f64b02cf1500ba260ad7d976d3ecf7868 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 #