Make SIOBlocks use the schema version appropriately

AIDASoft · May 3, 2023 · b1fc1f0 · b1fc1f0
1 parent 25dd42d
commit b1fc1f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/python/templates/SIOBlock.cc.jinja2 b/python/templates/SIOBlock.cc.jinja2
@@ -15,12 +15,11 @@
 {{ utils.namespace_open(class.namespace) }}
 {% with block_class = class.bare_type + 'SIOBlock' %}
 
-void {{ block_class }}::read(sio::read_device& device, sio::version_type) {
+void {{ block_class }}::read(sio::read_device& device, sio::version_type version) {
   const auto& bufferFactory = podio::CollectionBufferFactory::instance();
   // TODO:
-  // - Actually handle schema versions, instead of going for a hardcoded one
   // - Error handling of empty optional
-  auto maybeBuffers = bufferFactory.createBuffers("{{ class.full_type }}Collection", 1, m_subsetColl);
+  auto maybeBuffers = bufferFactory.createBuffers("{{ class.full_type }}Collection", sio::version::major_version(version), m_subsetColl);
   m_buffers = maybeBuffers.value_or(podio::CollectionReadBuffers{});
 
   if (not m_subsetColl) {

diff --git a/python/templates/SIOBlock.h.jinja2 b/python/templates/SIOBlock.h.jinja2
@@ -4,6 +4,8 @@
 #ifndef {{ package_name.upper() }}_{{ class.bare_type }}SIOBlock_H
 #define {{ package_name.upper() }}_{{ class.bare_type }}SIOBlock_H
 
+#include "{{ incfolder }}DatamodelDefinition.h"
+
 #include "podio/SIOBlock.h"
 
 #include <sio/api.h>
@@ -23,13 +25,12 @@ namespace podio {
 class {{ block_class }}: public podio::SIOBlock {
 public:
   {{ block_class }}() :
-  SIOBlock("{{ class.bare_type }}", sio::version::encode_version(0, 1)) {
+  SIOBlock("{{ class.bare_type }}", sio::version::encode_version({{ package_name }}::meta::schemaVersion, 0)) {
     podio::SIOBlockFactory::instance().registerBlockForCollection("{{class.full_type}}", this);
   }
 
   {{ block_class }}(const std::string& name) :
-  // SIOBlock(name + "__{{ class.bare_type }}", sio::version::encode_version(0, 1)) {}
-  SIOBlock(name, sio::version::encode_version(0, 1)) {}
+  SIOBlock(name, sio::version::encode_version({{ package_name }}::meta::schemaVersion, 0)) {}
 
   // Read the collection data from the device
   void read(sio::read_device& device, sio::version_type version) override;