adapt changes suggested by comments

Author: mhemmer-cern

Framework/Core/include/Framework/AnalysisDataModel.h

@@ -1548,39 +1548,6 @@ DECLARE_SOA_TABLE_VERSIONED(V0s_002, "AOD", "V0", 2, //! Run 3 V0 table (version
 using V0s = V0s_002; //! this defines the current default version
 using V0 = V0s::iterator;
 
-namespace v0otf
-{
-DECLARE_SOA_INDEX_COLUMN(Collision, collision);                         //! Collision index
-DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos"); //! Positive track
-DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //! Negative track
-DECLARE_SOA_COLUMN(Px, px, float);                                      //! momentum in x
-DECLARE_SOA_COLUMN(Py, py, float);                                      //! momentum in y
-DECLARE_SOA_COLUMN(Pz, pz, float);                                      //! momentum in z
-DECLARE_SOA_COLUMN(E, e, float);                                        //! energy
-DECLARE_SOA_COLUMN(Qt, qt, float);                                      //! Qt of AP
-DECLARE_SOA_COLUMN(Alpha, alpha, float);                                //! Alpha of AP
-DECLARE_SOA_COLUMN(Cx, cx, float);                                      //! conversion point x coordiante
-DECLARE_SOA_COLUMN(Cy, cy, float);                                      //! conversion point y coordiante
-DECLARE_SOA_COLUMN(Cz, cz, float);                                      //! conversion point z coordiante
-DECLARE_SOA_COLUMN(Chi2NDF, chi2NDF, float);                            //! chi^2 over NDF from KFParticle
-DECLARE_SOA_COLUMN(PsiPair, psiPair, float);                            //! Psi pair
-DECLARE_SOA_COLUMN(DCAr, dcaR, float);                                  //! DCA in radial direction
-DECLARE_SOA_COLUMN(DCAz, dcaZ, float);                                  //! DCA in z direction
-DECLARE_SOA_COLUMN(Mass, mass, float);                                  //! mass of the conversion. Do NOT use for cut!
-} // namespace v0otf
-
-DECLARE_SOA_TABLE(V0otfs, "AOD", "V0OTF", //! Run 2 V0 on the fly table
-                  o2::soa::Index<>,
-                  v0otf::CollisionId, v0otf::PosTrackId, v0otf::NegTrackId,
-                  v0otf::Px, v0otf::Py, v0otf::Pz, v0otf::E,
-                  v0otf::Qt, v0otf::Alpha,
-                  v0otf::Cx, v0otf::Cy, v0otf::Cz,
-                  v0otf::Chi2NDF, v0otf::PsiPair,
-                  v0otf::DCAr, v0otf::DCAz,
-                  v0otf::Mass);
-
-using V0otf = V0otfs::iterator;
-
 namespace cascade
 {
 DECLARE_SOA_INDEX_COLUMN(V0, v0);                                   //! V0 index
@@ -1705,6 +1672,26 @@ DECLARE_SOA_COLUMN(SPDFiredFastOrL0, spdFiredFastOrL0, uint16_t);     //! Fired
 DECLARE_SOA_COLUMN(SPDFiredFastOrL1, spdFiredFastOrL1, uint16_t);     //! Fired FASTOR signals in the first layer of the SPD (online)
 DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t);     //! V0A trigger charge
 DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t);     //! V0C trigger charge
+namespace v0otf
+{
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                         //! Collision index
+DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos"); //! Positive track
+DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //! Negative track
+DECLARE_SOA_COLUMN(Px, px, float);                                      //! momentum in x
+DECLARE_SOA_COLUMN(Py, py, float);                                      //! momentum in y
+DECLARE_SOA_COLUMN(Pz, pz, float);                                      //! momentum in z
+DECLARE_SOA_COLUMN(E, e, float);                                        //! energy
+DECLARE_SOA_COLUMN(Qt, qt, float);                                      //! Qt of AP
+DECLARE_SOA_COLUMN(Alpha, alpha, float);                                //! Alpha of AP
+DECLARE_SOA_COLUMN(Cx, cx, float);                                      //! conversion point x coordiante
+DECLARE_SOA_COLUMN(Cy, cy, float);                                      //! conversion point y coordiante
+DECLARE_SOA_COLUMN(Cz, cz, float);                                      //! conversion point z coordiante
+DECLARE_SOA_COLUMN(Chi2NDF, chi2NDF, float);                            //! chi^2 over NDF from KFParticle
+DECLARE_SOA_COLUMN(PsiPair, psiPair, float);                            //! Psi pair
+DECLARE_SOA_COLUMN(DCAr, dcaR, float);                                  //! DCA in radial direction
+DECLARE_SOA_COLUMN(DCAz, dcaZ, float);                                  //! DCA in z direction
+DECLARE_SOA_COLUMN(Mass, mass, float);                                  //! mass of the conversion. Do NOT use for cut!
+} // namespace v0otf
 } // namespace run2
 
 DECLARE_SOA_TABLE(Run2BCInfos, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
@@ -1715,6 +1702,18 @@ DECLARE_SOA_TABLE(Run2BCInfos, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy
                   run2::V0TriggerChargeA, run2::V0TriggerChargeC);
 using Run2BCInfo = Run2BCInfos::iterator;
 
+DECLARE_SOA_TABLE(Run2V0otfs, "AOD", "RUN2V0OTF", //! Run 2 V0 on the fly table
+                  o2::soa::Index<>,
+                  run2::v0otf::CollisionId, run2::v0otf::PosTrackId, run2::v0otf::NegTrackId,
+                  run2::v0otf::Px, run2::v0otf::Py, run2::v0otf::Pz, run2::v0otf::E,
+                  run2::v0otf::Qt, run2::v0otf::Alpha,
+                  run2::v0otf::Cx, run2::v0otf::Cy, run2::v0otf::Cz,
+                  run2::v0otf::Chi2NDF, run2::v0otf::PsiPair,
+                  run2::v0otf::DCAr, run2::v0otf::DCAz,
+                  run2::v0otf::Mass);
+
+using Run2V0otf = Run2V0otfs::iterator;
+
 // ---- MC tables ----
 namespace mccollision
 {