Make the generated header name agree with agreed upon convention

AIDASoft · Jun 11, 2024 · b2942e3 · b2942e3
1 parent 8e57faa
commit b2942e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/python/podio_gen/cpp_generator.py b/python/podio_gen/cpp_generator.py
@@ -491,9 +491,7 @@ def _write_all_collections_header(self):
 
         collection_files = (x.split("::")[-1] + "Collection.h" for x in self.datamodel.datatypes)
         self._write_file(
-            os.path.join(
-                self.install_dir, self.package_name, f"All{self.package_name}Collections.h"
-            ),
+            os.path.join(self.install_dir, self.package_name, f"{self.package_name}.h"),
             self._eval_template(
                 "AllCollections.h.jinja2",
                 {

diff --git a/python/templates/AllCollections.h.jinja2 b/python/templates/AllCollections.h.jinja2
@@ -1,10 +1,10 @@
 // AUTOMATICALLY GENERATED FILE - DO NOT EDIT
 
-#ifndef All{{ package_name }}Collections_H
-#define All{{ package_name }}Collections_H
+#ifndef {{ package_name.upper() }}_{{ package_name }}_H
+#define {{ package_name.upper() }}_{{ package_name }}_H
 
 {% for name in includes %}
 #include "{{ incfolder }}{{ name }}"
 {% endfor %}
 
-#endif // All{{ package_name }}Collections_H
+#endif // {{ package_name.upper() }}_{{ package_name }}_H