Revert "Merge branch 'master' of github.com:AliceO2Group/O2Physics"

This reverts commit 151e39e, reversing
changes made to 5cfbb86.

Author: ppoava

PWGEM/Dilepton/DataModel/dileptonTables.h

@@ -599,40 +599,7 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_004, "AOD", "EMPRIMARYEL", 4, //!
                             emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
                             emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
 
-DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_005, "AOD", "EMPRIMARYEL", 5, //!
-                            o2::soa::Index<>, emprimaryelectron::CollisionId,
-                            emprimaryelectron::TrackId, emprimaryelectron::Sign,
-                            track::Pt, track::Eta, track::Phi,
-                            track::DcaXY, track::DcaZ, aod::track::CYY, aod::track::CZY, aod::track::CZZ,
-                            track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusPID, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
-                            track::TPCChi2NCl, track::TPCInnerParam,
-                            track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
-                            pidtofbeta::Beta, pidtof::TOFNSigmaEl,                                         /*pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,*/
-                            track::ITSClusterSizes, track::ITSChi2NCl, track::TOFChi2, track::DetectorMap, /*track::Tgl,*/
-                            emprimaryelectron::IsAssociatedToMPC, emprimaryelectron::IsAmbiguous, emprimaryelectron::ProbElBDT,
-                            mcpidtpc::DeDxTunedMc,
-
-                            // dynamic column
-                            track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
-                            track::TPCNClsPID<track::TPCNClsFindable, track::TPCNClsFindableMinusPID>,
-                            track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
-                            track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
-                            track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
-                            track::TPCFractionSharedCls<track::TPCNClsShared, track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
-                            track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
-                            track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
-
-                            emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
-                            emprimaryelectron::P<track::Pt, track::Eta>,
-                            emprimaryelectron::Px<track::Pt, track::Phi>,
-                            emprimaryelectron::Py<track::Pt, track::Phi>,
-                            emprimaryelectron::Pz<track::Pt, track::Eta>,
-                            emprimaryelectron::Tgl<track::Eta>,
-                            emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
-                            emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
-                            emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
-
-using EMPrimaryElectrons = EMPrimaryElectrons_005;
+using EMPrimaryElectrons = EMPrimaryElectrons_004;
 // iterators
 using EMPrimaryElectron = EMPrimaryElectrons::iterator;
 

PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

@@ -483,7 +483,7 @@ struct skimmerPrimaryElectron {
       emprimaryelectrons(collision.globalIndex(), track.globalIndex(), track.sign(),
                          pt_recalc, eta_recalc, phi_recalc,
                          dcaXY, dcaZ, trackParCov.getSigmaY2(), trackParCov.getSigmaZY(), trackParCov.getSigmaZ2(),
-                         track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusPID(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
+                         track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
                          track.tpcChi2NCl(), track.tpcInnerParam(),
                          track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
                          track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),*/

PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronQC.cxx

@@ -481,7 +481,7 @@ struct skimmerPrimaryElectronQC {
       emprimaryelectrons(collision.globalIndex(), track.globalIndex(), track.sign(),
                          pt_recalc, eta_recalc, phi_recalc,
                          dcaXY, dcaZ, trackParCov.getSigmaY2(), trackParCov.getSigmaZY(), trackParCov.getSigmaZ2(),
-                         track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusPID(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
+                         track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
                          track.tpcChi2NCl(), track.tpcInnerParam(),
                          track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
                          track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),*/

PWGEM/Dilepton/Tasks/Converters/CMakeLists.txt

@@ -35,11 +35,6 @@ o2physics_add_dpl_workflow(electron-converter4
                   PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
                   COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(electron-converter5
-                  SOURCES electronConverter5.cxx
-                  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
-                  COMPONENT_NAME Analysis)
-
 o2physics_add_dpl_workflow(track-converter1
                   SOURCES trackConverter1.cxx
                   PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore