Merge branch 'AliceO2Group:master' into master

Author: jmunozme

ALICE3/TableProducer/alice3-dq-table-maker.cxx

@@ -77,7 +77,6 @@ using namespace o2::aod;
 using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA,
                                  aod::TracksCov, aod::TracksAlice3, aod::TracksExtraA3,
                                  aod::UpgradeTofs, aod::UpgradeRichs, aod::UpgradeRichSignals,
-                                 aod::UpgradeTrkPids, aod::UpgradeTrkPidSignals,
                                  aod::McTrackLabels>;
 
 using MyEvents = soa::Join<aod::Collisions, aod::CollisionsAlice3, aod::McCollisionLabels>;
@@ -108,7 +107,6 @@ struct Alice3DQTableMaker {
   Produces<ReducedA3PIDTOF> trackPIDTOF;
   Produces<ReducedA3PIDRich> trackPIDRich;
   Produces<ReducedA3PIDRichSignals> trackPIDRichSig;
-  Produces<ReducedA3PIDOT> trackPIDOT;
 
   OutputObj<THashList> fOutputList{"output"};
   OutputObj<TList> fStatsList{"Statistics"}; //! skimming statistics
@@ -565,11 +563,6 @@ struct Alice3DQTableMaker {
                         track.hasSigEl(), track.hasSigMu(), track.hasSigPi(),
                         track.hasSigKa(), track.hasSigPr(), track.hasSigDe(),
                         track.hasSigTr(), track.hasSigHe3(), track.hasSigAl());
-
-        trackPIDOT(track.timeOverThresholdBarrel(),
-                   track.nSigmaTrkEl(), track.nSigmaTrkMu(), track.nSigmaTrkPi(),
-                   track.nSigmaTrkKa(), track.nSigmaTrkPr(), track.nSigmaTrkDe(),
-                   track.nSigmaTrkTr(), track.nSigmaTrkHe(), track.nSigmaTrkAl());
       }
 
       fTrackIndexMap[track.globalIndex()] = trackBasic.lastIndex();
@@ -581,6 +574,7 @@ struct Alice3DQTableMaker {
       } else {
         auto mctrack = track.template mcParticle_as<aod::McParticles>();
         VarManager::FillTrackMC(mcTracks, mctrack);
+        VarManager::FillResolutions(mctrack, track);
 
         mcflags = 0;
         int i = 0; // runs over the MC signals
@@ -650,7 +644,6 @@ struct Alice3DQTableMaker {
       trackPIDTOF.reserve(tracksBarrel.size());
       trackPIDRich.reserve(tracksBarrel.size());
       trackPIDRichSig.reserve(tracksBarrel.size());
-      trackPIDOT.reserve(tracksBarrel.size());
       trackBarrelAssoc.reserve(tracksBarrel.size());
       trackBarrelLabels.reserve(tracksBarrel.size());
     }

ALICE3/Tasks/alice3-dq-efficiency.cxx

@@ -423,6 +423,7 @@ struct AnalysisTrackSelection {
           isCorrectAssoc = (eventMCfromTrack.globalIndex() == event.reducedA3MCEvent().globalIndex());
         }
         VarManager::FillTrackMC(tracksMC, trackMC);
+        VarManager::FillResolutions(trackMC, track);
       }
 
       if (fConfigQA) {

Common/Tools/TrackTuner.h

@@ -853,7 +853,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       //       if(spt1o>0.)             covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
       sigma1Pt2 = trackParCov.getSigma1Pt2();
       if (qOverPtMC > 0.) {
-        sigma1Pt2 *= (qOverPtData / qOverPtMC);
+        sigma1Pt2 *= (qOverPtData / qOverPtMC) * (qOverPtData / qOverPtMC);
         trackParCov.setCov(sigma1Pt2, 14);
       }
     } // updateCurvatureIU block ends here
@@ -1039,7 +1039,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
         //       if(spt1o>0.)             covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
         sigma1Pt2 = trackParCov.getSigma1Pt2();
         if (qOverPtMC > 0.) {
-          sigma1Pt2 *= (qOverPtData / qOverPtMC);
+          sigma1Pt2 *= (qOverPtData / qOverPtMC) * (qOverPtData / qOverPtMC);
           trackParCov.setCov(sigma1Pt2, 14);
         }
       } // ---> track cov matrix elements for 1/Pt ends here

EventFiltering/PWGEM/globalDimuonFilter.cxx

@@ -323,7 +323,6 @@ struct globalDimuonFilter {
 
     int nGoodGLPerSA = 0;
     auto muons_per_MCHMID = fwdtracks.sliceBy(fwdtracksPerMCHTrack, fwdtrack.globalIndex());
-    std::tuple<int, int, int> tupleIds_at_min_chi2mftmch;
     for (const auto& muon_tmp : muons_per_MCHMID) {
       if (muon_tmp.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) {
         float pt = 999.f, eta = 999.f, phi = 999.f;

PWGCF/Femto/Core/pairBuilder.h

@@ -888,7 +888,7 @@ class PairTrackKinkBuilder
   {
     auto trackSlice = trackPartition->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);
     auto kinkSlice = kinkPartition->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);
-    if (trackSlice.size() == 0 || kinkSlice.size() == 0) {
+    if (trackSlice.size() < nLimitPartitionParticles || kinkSlice.size() < nLimitPartitionParticles) {
       return;
     }
     mColHistManager.template fill<mode>(col, mcCols, 0, 0, 0);

PWGCF/Femto/Core/tripletBuilder.h

@@ -187,7 +187,7 @@ class TripletTrackTrackTrackBuilder
     } else if (mTrack1Track2AreSameSpecies) {
       auto trackSlice1 = partition1->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);
       auto trackSlice3 = partition3->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);
-      if (trackSlice1.size() <= nLimitPartitionIdenticalParticles12 || trackSlice3.size() < nLimitPartitionParticles) {
+      if (trackSlice1.size() < nLimitPartitionIdenticalParticles12 || trackSlice3.size() < nLimitPartitionParticles) {
         return;
       }
       mColHistManager.template fill<mode>(col, trackSlice1.size(), trackSlice1.size(), trackSlice3.size());

PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx

@@ -243,23 +243,20 @@ struct FemtoUniverseProducerTask {
     Configurable<float> confPtLowFilterCut{"confPtLowFilterCut", 0.14, "Lower limit for Pt for the global track"};   // pT low
     Configurable<float> confPtHighFilterCut{"confPtHighFilterCut", 5.0, "Higher limit for Pt for the global track"}; // pT high
     Configurable<float> confEtaFilterCut{"confEtaFilterCut", 0.8, "Eta cut for the global track"};                   // eta
-    Configurable<bool> confDxaXYCustom0Cut{"confDxaXYCustom0Cut", false, "Enable Custom Dcaxy < [0] cut."};
-    Configurable<float> confDcaXYFilterCut{"confDcaXYFilterCut", 2.4, "Value for DCA_XY for the global track"}; // max dca to vertex XY
-    Configurable<float> confDcaZFilterCut{"confDcaZFilterCut", 3.2, "Value for DCA_Z for the global track"};    // max dca to vertex Z
-    Configurable<bool> confDcaXYCustom1Cut{"confDcaXYCustom1Cut", true, "Enable Custom |DCAxy| < [1] + [2]/pt cut."};
-    Configurable<float> confDcaXYCustom11FilterCut{"confDcaXYCustom11FilterCut", 0.004, "Value for [1] custom DCAxy cut -> |DCAxy| < [1] + [2]/pT"};
-    Configurable<float> confDcaXYCustom12FilterCut{"confDcaXYCustom12FilterCut", 0.013, "Value for [2] custom DCAxy cut -> |DCAxy| < [1] + [2]/pT"};
+    Configurable<float> confDcaXYCustom1FilterCut{"confDcaXYCustom1FilterCut", 0.0105, "Value for [1] custom DCAxy cut -> |DCAxy| < [1] + [2]/pT"};
+    Configurable<float> confDcaXYCustom2FilterCut{"confDcaXYCustom2FilterCut", 0.035, "Value for [2] custom DCAxy cut -> |DCAxy| < [1] + [2]/pT"};
+    Configurable<float> confDcaZCustom1FilterCut{"confDcaZCustom1FilterCut", 0.02, "Value for [1] custom cut on DCAz -> |DCAz| < [1] + [2]/pT"};
+    Configurable<float> confDcaZCustom2FilterCut{"confDcaZCustom2FilterCut", 0.0, "Value for [2] custom cut on DCAz -> |DCAz| < [1] + [2]/pT"};
     Configurable<bool> confIsApplyTrkCutMCTruth{"confIsApplyTrkCutMCTruth", false, "Apply eta, pT selection cut on MCTruth tracks "};
     Configurable<bool> confIsOnlyPrimary{"confIsOnlyPrimary", false, "Select only primaries"};
   } ConfFilterCuts;
 
-  Filter globalCutFilter = requireGlobalTrackInFilter();
+  Filter globalCutFilter = requireGlobalTrackWoDCAInFilter();
   Filter customTrackFilter = (aod::track::pt > ConfFilterCuts.confPtLowFilterCut) &&
                              (aod::track::pt < ConfFilterCuts.confPtHighFilterCut) &&
                              (nabs(aod::track::eta) < ConfFilterCuts.confEtaFilterCut) &&
-                             (!ConfFilterCuts.confDxaXYCustom0Cut || (aod::track::dcaXY < ConfFilterCuts.confDcaXYFilterCut)) && // true if configurable set to false or if configurable is true and it passes the selection
-                             (aod::track::dcaZ < ConfFilterCuts.confDcaZFilterCut) &&
-                             (!ConfFilterCuts.confDcaXYCustom1Cut || (nabs(aod::track::dcaXY) < ConfFilterCuts.confDcaXYCustom11FilterCut + ConfFilterCuts.confDcaXYCustom12FilterCut / aod::track::pt)); // same logic here
+                             (nabs(aod::track::dcaZ) < (ConfFilterCuts.confDcaZCustom1FilterCut + ConfFilterCuts.confDcaZCustom2FilterCut / aod::track::pt)) &&
+                             (nabs(aod::track::dcaXY) < (ConfFilterCuts.confDcaXYCustom1FilterCut + ConfFilterCuts.confDcaXYCustom2FilterCut / aod::track::pt));
 
   // CASCADE
   FemtoUniverseCascadeSelection cascadeCuts;
@@ -1236,8 +1233,9 @@ struct FemtoUniverseProducerTask {
                   confIsUseCutculator ? cutContainer.at(
                                           femto_universe_track_selection::TrackContainerPosition::kPID)
                                       : PIDBitmask(track),
-                  track.dcaXY(), childIDs, 0,
-                  track.sign()); // sign getter is mAntiLambda()
+                  track.dcaXY(), childIDs,
+                  track.hasTOF(), // hasTOF getter is mLambda()
+                  track.sign());  // sign getter is mAntiLambda()
 
       tmpIDtrack.push_back(track.globalIndex());
       if (confIsDebug) {