Code cleanup and addressing review comments

AIDASoft · Jan 30, 2024 · 5548f4c · 5548f4c
1 parent 95dac2b
commit 5548f4c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 23 deletions.
diff --git a/include/podio/AssociationCollection.h b/include/podio/AssociationCollection.h
@@ -1,5 +1,6 @@
 #ifndef PODIO_ASSOCIATIONCOLLECTION_H
 #define PODIO_ASSOCIATIONCOLLECTION_H
+
 #include "podio/detail/AssociationCollectionImpl.h"
 
 // Preprocessor helper macros for concatenating tokens at preprocessing times

diff --git a/include/podio/detail/Association.h b/include/podio/detail/Association.h
@@ -230,6 +230,10 @@ class AssociationT {
 
 template <typename FromT, typename ToT>
 std::ostream& operator<<(std::ostream& os, const Association<FromT, ToT>& assoc) {
+  if (!assoc.isAvailable()) {
+    return os << "[not available]";
+  }
+
   return os << " id: " << assoc.id() << '\n'
             << " weight: " << assoc.getWeight() << '\n'
             << " from: " << assoc.getFrom().id() << '\n'

diff --git a/include/podio/utilities/DeprecationMacros.h b/include/podio/utilities/DeprecationMacros.h
diff --git a/python/templates/MutableObject.h.jinja2 b/python/templates/MutableObject.h.jinja2
@@ -43,12 +43,6 @@ public:
   operator {{ class.bare_type }}() const;
 
 public:
-  // Some typedefs for the Association handling
-  using MutT = {{ class.namespace }}::Mutable{{ class.bare_type }};
-  using DefT = {{ class.namespace }}::{{ class.bare_type }};
-  using CollT = {{ class.namespace }}::{{ class.bare_type }}Collection;
-
-  static constexpr auto TypeName = "{{ class.namespace }}::Mutable{{ class.bare_type }}";
 
 {{ macros.member_getters(Members, use_get_syntax) }}
 {{ macros.single_relation_getters(OneToOneRelations, use_get_syntax) }}

diff --git a/tests/read_test.h b/tests/read_test.h
@@ -31,8 +31,6 @@
 
 // Define an association that is used for the I/O tests
 using TestAssocCollection = podio::AssociationCollection<ExampleMC, ex42::ExampleWithARelation>;
-// Make sure the I/O parts are dynamically registered
-PODIO_DECLARE_ASSOCIATION(ExampleMC, ex42::ExampleWithARelation)
 
 template <typename FixedWidthT>
 bool check_fixed_width_value(FixedWidthT actual, FixedWidthT expected, const std::string& type) {

diff --git a/tests/unittests/associations.cpp b/tests/unittests/associations.cpp
@@ -163,12 +163,6 @@ TEST_CASE("Associations templated accessors", "[associations]") {
   }
 }
 
-TEST_CASE("AssociationCollection basics", "[associations]") {
-  auto coll = TestAColl();
-
-  // TODO: basics without I/O
-}
-
 TEST_CASE("AssociationCollection constness", "[associations][static-checks][const-correctness]") {
   // Test type-aliases in AssociationCollection
   STATIC_REQUIRE(std::is_same_v<TestAColl::const_iterator, TestAIter>);

diff --git a/tests/write_frame.h b/tests/write_frame.h
@@ -28,8 +28,6 @@
 
 // Define an association that is used for the I/O tests
 using TestAssocCollection = podio::AssociationCollection<ExampleMC, ex42::ExampleWithARelation>;
-// Make sure the I/O parts are dynamically registered
-PODIO_DECLARE_ASSOCIATION(ExampleMC, ex42::ExampleWithARelation)
 
 auto createMCCollection() {
   auto mcps = ExampleMCCollection();