Bump trackextra table to the latest version (#13785)

* Bump trackextra table to the latest version

* update table version in test

Author: maciacco

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -337,7 +337,7 @@ void AODProducerWorkflowDPL::addToTracksExtraTable(TracksExtraCursorType& tracks
                     extraInfoHolder.itsClusterSizes,
                     extraInfoHolder.tpcNClsFindable,
                     extraInfoHolder.tpcNClsFindableMinusFound,
-                    // extraInfoHolder.tpcNClsFindableMinusPID,
+                    extraInfoHolder.tpcNClsFindableMinusPID,
                     extraInfoHolder.tpcNClsFindableMinusCrossedRows,
                     extraInfoHolder.tpcNClsShared,
                     extraInfoHolder.trdPattern,

Framework/Core/include/Framework/AnalysisDataModel.h

@@ -638,8 +638,8 @@ DECLARE_SOA_EXTENDED_TABLE(TracksExtra_002, StoredTracksExtra_002, "EXTRACKEXTRA
 DECLARE_SOA_TABLE(Run2TrackExtras, "AOD", "RUN2TRACKEXTRA",
                   track::ITSSignal);
 
-using StoredTracksExtra = StoredTracksExtra_001;
-using TracksExtra = TracksExtra_001;
+using StoredTracksExtra = StoredTracksExtra_002;
+using TracksExtra = TracksExtra_002;
 
 using Track = Tracks::iterator;
 using TrackIU = TracksIU::iterator;
@@ -1893,6 +1893,8 @@ 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("TRACKEXTRA/0", "TRACKEXTRA/2");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/1", "TRACKEXTRA/2");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("HMPID/0", "HMPID/1");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("MFTTracks/0", "MFTTracks/1");
 } // namespace soa

Framework/Core/src/AODReaderHelpers.cxx

@@ -166,6 +166,8 @@ AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(std::vector<InputSpec>& reque
             outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/0"_h>>());
           } else if (version == 1U) {
             outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/1"_h>>());
+          } else if (version == 2U) {
+            outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/2"_h>>());
           }
         } else if (description == header::DataDescription{"EXMFTTRACK"}) {
           if (version == 0U) {

Framework/Core/test/test_AnalysisTask.cxx

@@ -209,7 +209,7 @@ TEST_CASE("AdaptorCompilation")
   REQUIRE(task2.inputs.size() == 10);
   REQUIRE(task2.inputs[2].binding == "TracksExtension");
   REQUIRE(task2.inputs[1].binding == "Tracks");
-  REQUIRE(task2.inputs[4].binding == "TracksExtra_001Extension");
+  REQUIRE(task2.inputs[4].binding == "TracksExtra_002Extension");
   REQUIRE(task2.inputs[3].binding == "TracksExtra");
   REQUIRE(task2.inputs[6].binding == "TracksCovExtension");
   REQUIRE(task2.inputs[5].binding == "TracksCov");