From 368070a318b6d39f33afef8cf0e8fe0b30f38a8e Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Tue, 25 Nov 2025 21:42:45 +0100
Subject: [PATCH 1/2] Define dictionaries for X::Layout type aliases before
 their alias-to types

This is necessary to get the X::Laout type alias recorded in the
rootmap file, that is needed for the read rule.
---
 DataFormats/HGCalDigi/src/classes_def.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/DataFormats/HGCalDigi/src/classes_def.xml b/DataFormats/HGCalDigi/src/classes_def.xml
index 04be2860f668b..f2973a18744be 100644
--- a/DataFormats/HGCalDigi/src/classes_def.xml
+++ b/DataFormats/HGCalDigi/src/classes_def.xml
@@ -41,9 +41,11 @@
   </class>
   <class name="edm::Wrapper<HGCalSlinkEmulatorInfo>"/>
 
+  <class name="hgcaldigi::HGCalDigiHost"/>
+  <!-- ::Layout alias must be listed before the aliased-to type -->
+  <class name="hgcaldigi::HGCalDigiHost::Layout"/>
   <class name="hgcaldigi::HGCalDigiSoA"/>
   <class name="hgcaldigi::HGCalDigiSoA::View"/>
-  <class name="hgcaldigi::HGCalDigiHost"/>
 
   <class name="hgcaldigi::HGCalDigiSoALayout<128,false>"/>
   <class name="edm::Wrapper<PortableHostCollection<hgcaldigi::HGCalDigiSoALayout<128,false> > >" splitLevel="0" rntupleStreamerMode="true"/>
@@ -51,19 +53,25 @@
   <!-- Recursive templates implementing the association of indices and layouts, and containing the data -->
   <class name="portablecollection::CollectionLeaf<0, hgcaldigi::HGCalDigiSoALayout<128, false>>"/>
 
+  <class name="hgcaldigi::HGCalECONDPacketInfoHost" rntupleStreamerMode="true"/>
+  <!-- ::Layout alias must be listed before the aliased-to type -->
+  <class name="hgcaldigi::HGCalECONDPacketInfoHost::Layout"/>
   <class name="hgcaldigi::HGCalECONDPacketInfoSoA"/>
   <class name="hgcaldigi::HGCalECONDPacketInfoSoA::View"/>
-  <class name="hgcaldigi::HGCalECONDPacketInfoHost" rntupleStreamerMode="true"/>
   <class name="edm::Wrapper<hgcaldigi::HGCalECONDPacketInfoHost>" splitLevel="0"/>
 
+  <class name="hgcaldigi::HGCalFEDPacketInfoHost" rntupleStreamerMode="true"/>
+  <!-- ::Layout alias must be listed before the aliased-to type -->
+  <class name="hgcaldigi::HGCalFEDPacketInfoHost::Layout"/>
   <class name="hgcaldigi::HGCalFEDPacketInfoSoA"/>
   <class name="hgcaldigi::HGCalFEDPacketInfoSoA::View"/>
-  <class name="hgcaldigi::HGCalFEDPacketInfoHost" rntupleStreamerMode="true"/>
   <class name="edm::Wrapper<hgcaldigi::HGCalFEDPacketInfoHost>" splitLevel="0"/>
 
+  <class name="hgcaldigi::HGCalDigiTriggerHost"/>
+  <!-- ::Layout alias must be listed before the aliased-to type -->
+  <class name="hgcaldigi::HGCalDigiTriggerHost::Layout"/>
   <class name="hgcaldigi::HGCalDigiTriggerSoA"/>
   <class name="hgcaldigi::HGCalDigiTriggerSoA::View"/>
-  <class name="hgcaldigi::HGCalDigiTriggerHost"/>
   <class name="hgcaldigi::HGCalDigiTriggerSoALayout<128,false>"/>
   <class name="edm::Wrapper<PortableHostCollection<hgcaldigi::HGCalDigiTriggerSoALayout<128,false> > >" splitLevel="0"/>
   <class name="portablecollection::CollectionLeaf<0, hgcaldigi::HGCalDigiTriggerSoALayout<128, false>>"/>

From f5d4652b7933f50a4c80a9386a88ce9314c6c60a Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Tue, 25 Nov 2025 21:57:36 +0100
Subject: [PATCH 2/2] Specify rntupleStreamerMode consistently for the
 PortableHostCollections

---
 DataFormats/HGCalDigi/src/classes_def.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DataFormats/HGCalDigi/src/classes_def.xml b/DataFormats/HGCalDigi/src/classes_def.xml
index f2973a18744be..c72e17ae60676 100644
--- a/DataFormats/HGCalDigi/src/classes_def.xml
+++ b/DataFormats/HGCalDigi/src/classes_def.xml
@@ -41,14 +41,14 @@
   </class>
   <class name="edm::Wrapper<HGCalSlinkEmulatorInfo>"/>
 
-  <class name="hgcaldigi::HGCalDigiHost"/>
+  <class name="hgcaldigi::HGCalDigiHost"  rntupleStreamerMode="true"/>
   <!-- ::Layout alias must be listed before the aliased-to type -->
   <class name="hgcaldigi::HGCalDigiHost::Layout"/>
   <class name="hgcaldigi::HGCalDigiSoA"/>
   <class name="hgcaldigi::HGCalDigiSoA::View"/>
 
   <class name="hgcaldigi::HGCalDigiSoALayout<128,false>"/>
-  <class name="edm::Wrapper<PortableHostCollection<hgcaldigi::HGCalDigiSoALayout<128,false> > >" splitLevel="0" rntupleStreamerMode="true"/>
+  <class name="edm::Wrapper<PortableHostCollection<hgcaldigi::HGCalDigiSoALayout<128,false> > >" splitLevel="0"/>
 
   <!-- Recursive templates implementing the association of indices and layouts, and containing the data -->
   <class name="portablecollection::CollectionLeaf<0, hgcaldigi::HGCalDigiSoALayout<128, false>>"/>
@@ -67,7 +67,7 @@
   <class name="hgcaldigi::HGCalFEDPacketInfoSoA::View"/>
   <class name="edm::Wrapper<hgcaldigi::HGCalFEDPacketInfoHost>" splitLevel="0"/>
 
-  <class name="hgcaldigi::HGCalDigiTriggerHost"/>
+  <class name="hgcaldigi::HGCalDigiTriggerHost" rntupleStreamerMode="true"/>
   <!-- ::Layout alias must be listed before the aliased-to type -->
   <class name="hgcaldigi::HGCalDigiTriggerHost::Layout"/>
   <class name="hgcaldigi::HGCalDigiTriggerSoA"/>