update index equivalence declaration

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1573,11 +1573,11 @@ concept ng_iterator = framework::is_base_of_template_v<TableIterator, T> || fram
 //   return false;
 // }
 
-template <soa::ng_table T, soa::soa_table B>
-consteval bool is_binding_compatible_v()
-{
-  return false;
-}
+// template <soa::ng_table T, soa::soa_table B>
+// consteval bool is_binding_compatible_v()
+// {
+//   return false;
+// }
 
 template <typename A>
 concept with_originals = requires() {
@@ -3082,10 +3082,16 @@ O2HASH("TEST/0");
     }                                                                                               \
   }
 
-#define DECLARE_EQUIVALENT_FOR_INDEX(_Base_, _Equiv_) \
-  template <>                                         \
-  struct EquivalentIndex<_Base_, _Equiv_> {           \
-    constexpr static bool value = true;               \
+#define DECLARE_EQUIVALENT_FOR_INDEX(_Base_, _Equiv_)                                                     \
+  template <>                                                                                             \
+  struct EquivalentIndexNG<o2::aod::Hash<_Base_::ref.desc_hash>, o2::aod::Hash<_Equiv_::ref.desc_hash>> { \
+    constexpr static bool value = true;                                                                   \
+  }
+
+#define DECLARE_EQUIVALENT_FOR_INDEX_NG(_Base_, _Equiv_)                                      \
+  template <>                                                                                 \
+  struct EquivalentIndexNG<o2::aod::Hash<_Base_ ""_h>, o2::aod::Hash<_Equiv_ ""_h>> {         \
+    constexpr static bool value = true;                                                       \
   }
 
 #define DECLARE_SOA_COLUMN_FULL(_Name_, _Getter_, _Type_, _Label_)                                                                                                                \

Framework/Core/include/Framework/AnalysisDataModel.h

@@ -1785,18 +1785,16 @@ using McParticle = McParticles::iterator;
 } // namespace aod
 namespace soa
 {
-DECLARE_EQUIVALENT_FOR_INDEX(aod::Collisions_000, aod::Collisions_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredMcParticles_000, aod::StoredMcParticles_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracks, aod::StoredTracksIU);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracks, aod::StoredTracksExtra_000);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracksIU, aod::StoredTracksExtra_000);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracks, aod::StoredTracksExtra_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracksIU, aod::StoredTracksExtra_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracksExtra_000, aod::StoredTracksExtra_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::HMPID_000, aod::HMPID_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredMFTTracks, aod::StoredMFTTracks_000);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredMFTTracks, aod::StoredMFTTracks_001);
-DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredMFTTracks_000, aod::StoredMFTTracks_001);
+DECLARE_EQUIVALENT_FOR_INDEX_NG("COLLISION/0", "COLLISION/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("MCPARTICLE/0", "MCPARTICLE/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACK_IU/0");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/0");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/0");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/0", "TRACKEXTRA/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("HMPID/0", "HMPID/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("MFTTracks/0", "MFTTracks/1");
 } // namespace soa
 
 namespace aod