Merge branch 'master' into fixes-PWGEM

Author: vkucera

ALICE3/DataModel/OTFMCParticle.h

@@ -21,6 +21,8 @@
 
 #include <Framework/AnalysisDataModel.h>
 
+#include <cstdint>
+
 namespace o2::aod
 {
 

ALICE3/Macros/drawFastTracker.C

@@ -14,16 +14,25 @@
 
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DetectorsBase/Propagator.h>
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/Vertex.h>
 
 #include <TAxis.h>
 #include <TCanvas.h>
 #include <TDatabasePDG.h>
 #include <TEfficiency.h>
 #include <TGraph.h>
-#include <TH1F.h>
+#include <TH1.h>
 #include <TLatex.h>
 #include <TLorentzVector.h>
+#include <TParticlePDG.h>
+#include <TString.h>
+
+#include <RtypesCore.h>
+
+#include <cstddef>
+#include <vector>
 
 void drawFastTracker(float magneticField = 5.f, // in units of kGauss
                      const int nch = 100,       // number of charged particles per unit rapidity

ALICE3/Macros/testFastTracker.C

@@ -15,10 +15,10 @@
 
 #include "ALICE3/Core/FastTracker.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPLHCIFData.h>
 #include <Framework/Logger.h>
 
+#include <string>
+
 void testFastTracker(std::string geometryFile = "a3geo.ini")
 {
 

DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx

@@ -16,15 +16,30 @@
 ///
 
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include <CCDB/BasicCCDBManager.h>
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
+#include <Framework/Configurable.h>
+#include <Framework/Expressions.h>
 #include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/InitContext.h>
+#include <Framework/OutputObjHeader.h>
 #include <Framework/StaticFor.h>
 #include <Framework/runDataProcessing.h>
+#include <PID/PIDTOFParamService.h>
+#include <ReconstructionDataFormats/PID.h>
+
+#include <TH1.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;

DPG/Tasks/AOTTrack/qaEfficiency.cxx

@@ -201,6 +201,7 @@ struct QaEfficiency {
   Configurable<bool> numSameCollision{"numSameCollision", false, "Flag to ask that the numerator is in the same collision as the denominator"};
   Configurable<bool> noFakesHits{"noFakesHits", false, "Flag to reject tracks that have fake hits"};
   Configurable<bool> skipEventsWithoutTPCTracks{"skipEventsWithoutTPCTracks", false, "Flag to reject events that have no tracks reconstructed in the TPC"};
+  Configurable<bool> skipParticlesFromBackgroundEvents{"skipParticlesFromBackgroundEvents", false, "Flag to reject particles from background events (for embedded MC)"};
   Configurable<float> maxProdRadius{"maxProdRadius", 9999.f, "Maximum production radius of the particle under study"};
   Configurable<float> nsigmaTPCDe{"nsigmaTPCDe", 3.f, "Value of the Nsigma TPC cut for deuterons PID"};
   // Charge selection
@@ -1548,6 +1549,9 @@ struct QaEfficiency {
         histos.fill(countingHisto, trkCutIdxHasMcPart); // Tracks with particles (i.e. no fakes)
       }
       const auto mcParticle = track.mcParticle();
+      if (skipParticlesFromBackgroundEvents && mcParticle.fromBackgroundEvent()) {
+        return false;
+      }
       if (!isInAcceptance<true, doFillHisto>(mcParticle, countingHisto, trkCutIdxHasMcPart)) {
         // 3: pt cut 4: eta cut 5: phi cut 6: y cut
         return false;
@@ -1913,6 +1917,9 @@ struct QaEfficiency {
 
         /// only to fill denominator of ITS-TPC matched primary tracks only in MC events with at least 1 reco. vtx
         for (const auto& particle : groupedMcParticles) { // Particle loop
+          if (skipParticlesFromBackgroundEvents && particle.fromBackgroundEvent()) {
+            continue;
+          }
 
           /// require generated particle in acceptance
           if (!isInAcceptance<true, false>(particle, nullptr)) {
@@ -1968,6 +1975,9 @@ struct QaEfficiency {
       // Loop on particles to fill the denominator
       float dNdEta = 0; // Multiplicity
       for (const auto& mcParticle : groupedMcParticles) {
+        if (skipParticlesFromBackgroundEvents && mcParticle.fromBackgroundEvent()) {
+          continue;
+        }
         if (TMath::Abs(mcParticle.eta()) <= 2.f && !mcParticle.has_daughters()) {
           dNdEta += 1.f;
         }

PWGCF/DataModel/CorrelationsDerived.h

@@ -46,6 +46,14 @@ DECLARE_SOA_TABLE(CFMcParticles, "AOD", "CFMCPARTICLE", //! Reduced MC particle
                   mcparticle::IsPhysicalPrimary<mcparticle::Flags>);
 using CFMcParticle = CFMcParticles::iterator;
 
+namespace cfmultiplicity
+{
+DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
+}
+DECLARE_SOA_TABLE(CFMultiplicities, "AOD", "CFMULTIPLICITY", cfmultiplicity::Multiplicity);
+
+using CFMultiplicity = CFMultiplicities::iterator;
+
 namespace cfcollision
 {
 DECLARE_SOA_INDEX_COLUMN(CFMcCollision, cfMcCollision); //! Index to reduced MC collision
@@ -157,7 +165,8 @@ enum ParticleDecay {
   LambdaToPPiTight,
   AntiLambdaToPiPLoose,
   AntiLambdaToPiPTight,
-  D0barToKPiExclusive
+  D0barToKPiExclusive,
+  PhiToKKPID3Mixed
 };
 } // namespace cf2prongtrack
 DECLARE_SOA_TABLE(CF2ProngTracks, "AOD", "CF2PRONGTRACK", //! Reduced track table

PWGCF/EbyEFluctuations/Tasks/netprotcumulants.cxx

@@ -101,6 +101,7 @@ struct NetProtCumulants {
   Configurable<bool> cfgIfRejectElectron{"cfgIfRejectElectron", true, "Remove electrons"};
   Configurable<bool> cfgIfMandatoryTOF{"cfgIfMandatoryTOF", true, "Mandatory TOF requirement to remove pileup"};
   Configurable<bool> cfgEvSelkIsVertexTOFmatched{"cfgEvSelkIsVertexTOFmatched", true, "If matched with TOF, for pileup"};
+  Configurable<bool> cfgEvSelkIsGoodZvtxFT0vsPV{"cfgEvSelkIsGoodZvtxFT0vsPV", false, "Apply kIsGoodZvtxFT0vsPV event selection"};
   ConfigurableAxis cfgCentralityBins{"cfgCentralityBins", {90, 0., 90.}, "Centrality/Multiplicity percentile bining"};
 
   // Connect to ccdb
@@ -1078,7 +1079,7 @@ struct NetProtCumulants {
     }
     //-------------------------------------------------------------------------------------------
   }
-  PROCESS_SWITCH(NetProtCumulants, processMCGen, "Process Generated", false);
+  PROCESS_SWITCH(NetProtCumulants, processMCGen, "Process Generated", true);
 
   void processMCRec(MyMCRecCollision const& collision, MyMCTracks const& tracks, aod::McCollisions const&, aod::McParticles const&)
   {
@@ -1097,7 +1098,9 @@ struct NetProtCumulants {
     }
     if (cfgEvSelkIsVertexTOFmatched && !(collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched))) {
       return;
-      ;
+    }
+    if (cfgEvSelkIsGoodZvtxFT0vsPV && !(collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV))) {
+      return;
     }
 
     auto cent = collision.centFT0C();
@@ -2026,7 +2029,7 @@ struct NetProtCumulants {
       histos.get<TProfile2D>(HIST("Prof2D_Q112221_111"))->Fill(cent, sampleIndex, fQ112221_111);
     }
   }
-  PROCESS_SWITCH(NetProtCumulants, processMCRec, "Process Generated", false);
+  PROCESS_SWITCH(NetProtCumulants, processMCRec, "Process Generated", true);
 
   void processDataRec(AodCollisions::iterator const& coll, aod::BCsWithTimestamps const&, AodTracks const& inputTracks)
   {
@@ -2044,7 +2047,10 @@ struct NetProtCumulants {
 
     if (cfgEvSelkIsVertexTOFmatched && !(coll.selection_bit(o2::aod::evsel::kIsVertexTOFmatched))) {
       return;
-      ;
+    }
+
+    if (cfgEvSelkIsGoodZvtxFT0vsPV && !(coll.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV))) {
+      return;
     }
 
     histos.fill(HIST("hZvtx_after"), coll.posZ());
@@ -2978,7 +2984,7 @@ struct NetProtCumulants {
       histos.get<TProfile2D>(HIST("Prof2D_Q112221_111"))->Fill(cent, sampleIndex, fQ112221_111);
     }
   }
-  PROCESS_SWITCH(NetProtCumulants, processDataRec, "Process real data", true);
+  PROCESS_SWITCH(NetProtCumulants, processDataRec, "Process real data", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)