diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 84b116471081389a9625d8b1aa28408afd7c74d5..bd36de2e3bd59a11f29957539b9ed133dc923a24 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -68,7 +68,7 @@ file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData )
 atlas_add_test( egammaRunData
    SCRIPT test/test_egamma_run_data.sh
    PROPERTIES TIMEOUT 1000   
-   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*|Fragment size"
+   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*|payload after inserting"
    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData
    )
 
@@ -196,6 +196,14 @@ atlas_add_test( pebTest
    EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|TriggerSummary.*HLT_"
    )
 
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_dataScoutingTest )
+atlas_add_test( dataScoutingTest
+   SCRIPT test/test_dataScouting.sh
+   PROPERTIES TIMEOUT 1000
+   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_dataScoutingTest
+   EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|ROBFragments with IDs|{module.*words}|TriggerSummary.*HLT_"
+   )
+
 file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_l1sim )
 atlas_add_test( l1sim
    SCRIPT test/test_l1sim.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
index aab1fb4b73f7cd5f49452b6868f50dd7620ad9d8..fea35d084f8ba168883c7ab69fb46643e613ad8d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
@@ -119,7 +119,7 @@ decisionObjectsToRecord = []
 for d in decisionObjects:
     decisionObjectsToRecord.extend([
         "xAOD::TrigCompositeContainer_v1#%s" % d,
-        "xAOD::TrigCompositeAuxContainer_v1#%s" % d
+        "xAOD::TrigCompositeAuxContainer_v1#%s.decisions" % d
     ])
 
 ##########################################
@@ -147,7 +147,7 @@ from TrigUpgradeTest.pebMenuDefs import dataScoutingResultIDFromName
 electronDSModuleIDs = [serialiser.fullResultID(), dataScoutingResultIDFromName('dataScoutingElectronTest')] # 0 is main (full) result; we get the other ID from the EDM configuration
 serialiser.addCollectionListToResults([
     "xAOD::TrigElectronContainer_v1#Electrons",
-    "xAOD::TrigElectronAuxContainer_v1#ElectronsAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot",
+    "xAOD::TrigElectronAuxContainer_v1#ElectronsAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.wstot",
 ], electronDSModuleIDs)
 
 ##### Result maker part 2 - stream tags #####
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
index f200563ff5d2a327490365cd8b7df480aa43069b..9278e815268bd85f3e99acd372795436f42db991 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
@@ -1,176 +1,176 @@
-HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :348 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG     Fragment size including 68 bytes from 1x DynAux: 416 bytes
-HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :772 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG     Fragment size including 52 bytes from 1x DynAux: 824 bytes
-HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :716 bytes
 HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG     Fragment size including 892 bytes from 14x DynAux: 1608 bytes
-HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :632 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG     Fragment size including 124 bytes from 1x DynAux: 756 bytes
-HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1732 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG     Fragment size including 64 bytes from 1x DynAux: 1796 bytes
-HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2832 bytes
 HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG     Fragment size including 2180 bytes from 14x DynAux: 5012 bytes
-HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :824 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG     Fragment size including 144 bytes from 1x DynAux: 968 bytes
-HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :2372 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG     Fragment size including 72 bytes from 1x DynAux: 2444 bytes
-HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1728 bytes
 HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG     Fragment size including 1508 bytes from 14x DynAux: 3236 bytes
-HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :632 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG     Fragment size including 112 bytes from 1x DynAux: 744 bytes
-HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1732 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG     Fragment size including 64 bytes from 1x DynAux: 1796 bytes
-HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3292 bytes
 HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG     Fragment size including 2460 bytes from 14x DynAux: 5752 bytes
-HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :444 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG     Fragment size including 92 bytes from 1x DynAux: 536 bytes
-HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1092 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG     Fragment size including 56 bytes from 1x DynAux: 1148 bytes
-HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :992 bytes
 HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG     Fragment size including 1060 bytes from 14x DynAux: 2052 bytes
-HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :916 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG     Fragment size including 152 bytes from 1x DynAux: 1068 bytes
-HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :2692 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG     Fragment size including 76 bytes from 1x DynAux: 2768 bytes
-HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :4580 bytes
 HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG     Fragment size including 3244 bytes from 14x DynAux: 7824 bytes
-HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :348 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG     Fragment size including 72 bytes from 1x DynAux: 420 bytes
-HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :772 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG     Fragment size including 52 bytes from 1x DynAux: 824 bytes
-HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1176 bytes
 HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG     Fragment size including 1172 bytes from 14x DynAux: 2348 bytes
-HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :536 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG     Fragment size including 100 bytes from 1x DynAux: 636 bytes
-HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1412 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG     Fragment size including 60 bytes from 1x DynAux: 1472 bytes
-HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3016 bytes
 HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG     Fragment size including 2292 bytes from 14x DynAux: 5308 bytes
-HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :444 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG     Fragment size including 100 bytes from 1x DynAux: 544 bytes
-HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1092 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG     Fragment size including 56 bytes from 1x DynAux: 1148 bytes
-HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :808 bytes
 HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG     Fragment size including 948 bytes from 14x DynAux: 1756 bytes
-HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :252 bytes
-HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :452 bytes
-HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :440 bytes
-HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :632 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG     Fragment size including 144 bytes from 1x DynAux: 776 bytes
-HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1732 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG     Fragment size including 64 bytes from 1x DynAux: 1796 bytes
-HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3476 bytes
 HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG     Fragment size including 2572 bytes from 14x DynAux: 6048 bytes
-HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :348 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG     Fragment size including 68 bytes from 1x DynAux: 416 bytes
-HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :772 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG     Fragment size including 52 bytes from 1x DynAux: 824 bytes
-HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :808 bytes
 HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG     Fragment size including 948 bytes from 14x DynAux: 1756 bytes
-HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :1012 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG     Fragment size including 196 bytes from 1x DynAux: 1208 bytes
-HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :3012 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG     Fragment size including 80 bytes from 1x DynAux: 3092 bytes
-HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3844 bytes
 HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG     Fragment size including 2796 bytes from 14x DynAux: 6640 bytes
-HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :444 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG     Fragment size including 104 bytes from 1x DynAux: 548 bytes
-HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1092 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG     Fragment size including 56 bytes from 1x DynAux: 1148 bytes
-HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2464 bytes
 HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG     Fragment size including 1956 bytes from 14x DynAux: 4420 bytes
-HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :348 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG     Fragment size including 72 bytes from 1x DynAux: 420 bytes
-HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :772 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG     Fragment size including 52 bytes from 1x DynAux: 824 bytes
-HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :716 bytes
 HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG     Fragment size including 892 bytes from 14x DynAux: 1608 bytes
-HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :252 bytes
-HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :452 bytes
-HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :440 bytes
-HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :348 bytes
 HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG     Fragment size including 64 bytes from 1x DynAux: 412 bytes
-HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :772 bytes
 HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG     Fragment size including 52 bytes from 1x DynAux: 824 bytes
-HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :440 bytes
-HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :444 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG     Fragment size including 104 bytes from 1x DynAux: 548 bytes
-HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1092 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG     Fragment size including 56 bytes from 1x DynAux: 1148 bytes
-HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1360 bytes
 HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG     Fragment size including 1284 bytes from 14x DynAux: 2644 bytes
-HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :444 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG     Fragment size including 100 bytes from 1x DynAux: 544 bytes
-HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1092 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG     Fragment size including 56 bytes from 1x DynAux: 1148 bytes
-HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :808 bytes
 HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG     Fragment size including 948 bytes from 14x DynAux: 1756 bytes
-HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux. Fragment size :536 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG     Fragment size including 92 bytes from 1x DynAux: 628 bytes
-HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions Fragment size :152 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1412 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG     Fragment size including 60 bytes from 1x DynAux: 1472 bytes
-HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :172 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3292 bytes
 HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG     Fragment size including 2460 bytes from 14x DynAux: 5752 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :168 bytes
 TrigSignatureMoniMT                                INFO HLT_2e3_etcut                 20        10        6         5         5         
 TrigSignatureMoniMT                                INFO HLT_2e3_etcut decisions                           16        83        
 TrigSignatureMoniMT                                INFO HLT_e3_e5_etcut               20        20        12        10        10        
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
index 874c41acd26867914eeb6295763ad1d80e2df916..bb2fb3c567f95799205a1d52ca98fc7cb9bc160e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
@@ -119,7 +119,7 @@ decisionObjectsToRecord = []
 for d in decisionObjects:
     decisionObjectsToRecord.extend([
         "xAOD::TrigCompositeContainer_v1#%s" % d,
-        "xAOD::TrigCompositeAuxContainer_v1#%s" % d
+        "xAOD::TrigCompositeAuxContainer_v2#%s.decisions" % d
     ])
 
 ##########################################
@@ -141,7 +141,7 @@ serialiser.addCollectionListToMainResult([
     "xAOD::TrigEMClusterContainer_v1#L2CaloEMClusters",
     "xAOD::TrigEMClusterAuxContainer_v2#L2CaloEMClustersAux.RoIword.clusterQuality.e233.e237.e277.e2tsts1.ehad1.emaxs1.energy.energySample.et.eta.eta1.fracs1.nCells.phi.rawEnergy.rawEnergySample.rawEt.rawEta.rawPhi.viewIndex.weta2.wstot",
     "xAOD::TrigElectronContainer_v1#Electrons",
-    "xAOD::TrigElectronAuxContainer_v1#ElectronsAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot",
+    "xAOD::TrigElectronAuxContainer_v1#ElectronsAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.wstot",
 ])
 
 ##### Result maker part 2 - stream tags #####