Merge branch 'master' into A2-PR

Author: ypwangg

Common/DataModel/FwdTrackReAlignTables.h

@@ -72,6 +72,19 @@ using FwdTrackRealign = FwdTracksReAlign::iterator;
 using FwdTrkCovRealign = FwdTrksCovReAlign::iterator;
 using FullFwdTracksRealign = soa::Join<FwdTracksReAlign, FwdTrksCovReAlign>;
 using FullFwdTrackRealign = FullFwdTracksRealign::iterator;
+
+// ambiguity table for realigned muons
+namespace fwdtrackrealignambiguous
+{
+DECLARE_SOA_INDEX_COLUMN_FULL(FwdTrackRealign, fwdTrackRealign, int, FwdTracksReAlign, ""); //! FwdTracksReAlign index
+DECLARE_SOA_SLICE_INDEX_COLUMN(BC, bc);
+
+} // namespace fwdtrackrealignambiguous
+
+DECLARE_SOA_TABLE(AmbiguousFwdTrksReAlign, "AOD", "AMBIFWDREALIGN", //! Table for FwdTracksReAlign which are not associated with a collision
+                  o2::soa::Index<>, fwdtrackrealignambiguous::FwdTrackRealignId, fwdtrackrealignambiguous::BCIdSlice);
+
+using AmbiguousFwdTrkRealign = AmbiguousFwdTrksReAlign::iterator;
 } // namespace o2::aod
 
 #endif // COMMON_DATAMODEL_FWDTRACKREALIGNTABLES_H_

Common/TableProducer/fwdtrackToCollisionAssociator.cxx

@@ -16,6 +16,7 @@
 
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
 
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -44,6 +45,7 @@ struct FwdTrackToCollisionAssociation {
   CollisionAssociation<false> collisionAssociator;
 
   Preslice<FwdTracks> muonsPerCollisions = aod::fwdtrack::collisionId;
+  Preslice<FwdTracksReAlign> realignmuonsPerCollisions = aod::fwdtrack::collisionId;
   Preslice<MFTTracks> mftsPerCollisions = aod::fwdtrack::collisionId;
 
   void init(InitContext const&)
@@ -55,7 +57,7 @@ struct FwdTrackToCollisionAssociation {
       LOGP(fatal, "Exactly one process function between standard and time-based association should be enabled!");
     }
 
-    if (!(doprocessMFTAssocWithTime || doprocessMFTStandardAssoc || doprocessFwdAssocWithTime || doprocessFwdStandardAssoc)) {
+    if (!(doprocessMFTAssocWithTime || doprocessMFTStandardAssoc || doprocessFwdAssocWithTime || doprocessFwdStandardAssoc || doprocessFwdRealignAssocWithTime || doprocessFwdRealignStandardAssoc)) {
       LOGP(fatal, "At least one process function should be enabled!");
     }
 
@@ -85,6 +87,22 @@ struct FwdTrackToCollisionAssociation {
   }
   PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdStandardAssoc, "Use standard fwdtrack-to-collision association", false);
 
+  void processFwdRealignAssocWithTime(Collisions const& collisions,
+                                      FwdTracksReAlign const& muons,
+                                      AmbiguousFwdTrksReAlign const& ambiTracksFwd,
+                                      BCs const& bcs)
+  {
+    collisionAssociator.runAssocWithTime(collisions, muons, muons, ambiTracksFwd, bcs, fwdassociation, fwdreverseIndices);
+  }
+  PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdRealignAssocWithTime, "Use fwdrealigntrack-to-collision association based on time", false);
+
+  void processFwdRealignStandardAssoc(Collisions const& collisions,
+                                      FwdTracksReAlign const& muons)
+  {
+    collisionAssociator.runStandardAssoc(collisions, muons, realignmuonsPerCollisions, fwdassociation, fwdreverseIndices);
+  }
+  PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdRealignStandardAssoc, "Use standard fwdrealigntrack-to-collision association", false);
+
   void processMFTAssocWithTime(Collisions const& collisions,
                                MFTTracks const& tracks,
                                AmbiguousMFTTracks const& ambiguousTracks,

Common/Tools/EventSelectionModule.h

@@ -310,6 +310,7 @@ class BcSelectionModule
       return;
     }
     bcselbuffer.clear();
+    bcselbuffer.reserve(bcs.size());
     for (const auto& bc : bcs) {
       uint64_t timestamp = timestamps[bc.globalIndex()];
       par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
@@ -453,6 +454,7 @@ class BcSelectionModule
 
     int run = bcs.iteratorAt(0).runNumber();
 
+    bcselbuffer.reserve(bcs.size());
     // bc loop
     for (auto bc : bcs) { // o2-linter: disable=const-ref-in-for-loop (use bc as nonconst iterator)
       uint64_t timestamp = timestamps[bc.globalIndex()];

DPG/Tasks/AOTTrack/qaImpPar.cxx

@@ -116,6 +116,7 @@ struct QaImpactPar {
   Configurable<int> nCustomMinITShits{"n_customMinITShits", 0, "Minimum number of layers crossed by a track among those in \"customITShitmap\""};
   Configurable<bool> customForceITSTPCmatching{"custom_forceITSTPCmatching", false, "Consider or not only ITS-TPC macthed tracks when using custom ITS hitmap"};
   Configurable<float> downsamplingFraction{"downsamplingFraction", 1.1, "Fraction of tracks to be used to fill the output objects"};
+  Configurable<int> eventGeneratorHF{"eventGeneratorHF", -1, "If positive, enable event selection using subGeneratorId information (HF). The value indicates which events to keep (0 = MB, 4 = charm triggered, 5 = beauty triggered)"};
 
   /// Custom cut selection objects
   TrackSelection selector_ITShitmap;
@@ -201,6 +202,12 @@ struct QaImpactPar {
                  const o2::aod::McCollisions&,
                  o2::aod::BCsWithTimestamps const&)
   {
+    /// SubgeneratorID check for HF MC
+    /// Useful to select MB gap events in HF-dedicated MC productions
+    if (eventGeneratorHF >= 0 && collision.mcCollision().getSubGeneratorId() != eventGeneratorHF) {
+      return;
+    }
+
     /// here call the template processReco function
     auto bc = collision.bc_as<o2::aod::BCsWithTimestamps>();
     processReco<true, false>(collision, tracksUnfiltered, tracks, tracksIU, mcParticles, bc);
@@ -216,6 +223,12 @@ struct QaImpactPar {
                         const o2::aod::McCollisions&,
                         o2::aod::BCsWithTimestamps const&)
   {
+    /// SubgeneratorID check for HF MC
+    /// Useful to select MB gap events in HF-dedicated MC productions
+    if (eventGeneratorHF >= 0 && collision.mcCollision().getSubGeneratorId() != eventGeneratorHF) {
+      return;
+    }
+
     /// here call the template processReco function
     auto bc = collision.bc_as<o2::aod::BCsWithTimestamps>();
     processReco<true, true>(collision, tracksUnfiltered, tracks, tracksIU, mcParticles, bc);