Merge branch 'master' into mcfinder

Author: ddobrigk

.mega-linter.yml

@@ -18,6 +18,7 @@ DISABLE_LINTERS:
   - YAML_PRETTIER
   - REPOSITORY_DEVSKIM
   - REPOSITORY_SECRETLINT
+  - REPOSITORY_TRIVY
 DISABLE_ERRORS_LINTERS: # If errors are found by these linters, they will be considered as non blocking.
   - PYTHON_BANDIT # The bandit check is overly broad and complains about subprocess usage in Scripts/update_ccdb.py.
 SHOW_ELAPSED_TIME: true

Common/TableProducer/PID/pidTOFBase.cxx

@@ -141,6 +141,7 @@ struct tofEventTime {
   Configurable<int64_t> timestamp{"ccdb-timestamp", -1, "timestamp of the object"};
   Configurable<bool> loadResponseFromCCDB{"loadResponseFromCCDB", false, "Flag to load the response from the CCDB"};
   Configurable<bool> fatalOnPassNotAvailable{"fatalOnPassNotAvailable", true, "Flag to throw a fatal if the pass is not available in the retrieved CCDB object"};
+  Configurable<bool> sel8TOFEvTime{"sel8TOFEvTime", false, "Flag to compute the ev. time only for events that pass the sel8 ev. selection"};
 
   void init(o2::framework::InitContext& initContext)
   {
@@ -181,6 +182,9 @@ struct tofEventTime {
       LOG(info) << "Table EvTimeTOFOnly enabled!";
     }
 
+    if (sel8TOFEvTime.value == true) {
+      LOG(info) << "TOF event time will be computed for collisions that pass the event selection only!";
+    }
     // Getting the parametrization parameters
     ccdb->setURL(url.value);
     ccdb->setTimestamp(timestamp.value);
@@ -267,8 +271,9 @@ struct tofEventTime {
   Preslice<TrksEvTime> perCollision = aod::track::collisionId;
   template <o2::track::PID::ID pid>
   using ResponseImplementationEvTime = o2::pid::tof::ExpTimes<TrksEvTime::iterator, pid>;
+  using EvTimeCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::FT0sCorrected>;
   void processNoFT0(TrksEvTime const& tracks,
-                    aod::Collisions const&)
+                    EvTimeCollisions const&)
   {
     if (!enableTable) {
       return;
@@ -280,9 +285,9 @@ struct tofEventTime {
       tableEvTimeTOFOnly.reserve(tracks.size());
     }
 
-    int lastCollisionId = -1;      // Last collision ID analysed
-    for (auto const& t : tracks) { // Loop on collisions
-      if (!t.has_collision()) {    // Track was not assigned, cannot compute event time
+    int lastCollisionId = -1;                                                                                    // Last collision ID analysed
+    for (auto const& t : tracks) {                                                                               // Loop on collisions
+      if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
         tableFlags(0);
         tableEvTime(0.f, 999.f);
         if (enableTableTOFOnly) {
@@ -327,7 +332,6 @@ struct tofEventTime {
 
   ///
   /// Process function to prepare the event for each track on Run 3 data with the FT0
-  using EvTimeCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::FT0sCorrected>;
   void processFT0(TrksEvTime& tracks,
                   aod::FT0s const&,
                   EvTimeCollisions const&)
@@ -342,9 +346,9 @@ struct tofEventTime {
       tableEvTimeTOFOnly.reserve(tracks.size());
     }
 
-    int lastCollisionId = -1;      // Last collision ID analysed
-    for (auto const& t : tracks) { // Loop on collisions
-      if (!t.has_collision()) {    // Track was not assigned, cannot compute event time
+    int lastCollisionId = -1;                                                                                    // Last collision ID analysed
+    for (auto const& t : tracks) {                                                                               // Loop on collisions
+      if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
         tableFlags(0);
         tableEvTime(0.f, 999.f);
         if (enableTableTOFOnly) {

Common/Tasks/eventSelectionQa.cxx

@@ -451,7 +451,7 @@ struct EventSelectionQaTask {
   PROCESS_SWITCH(EventSelectionQaTask, processRun2, "Process Run2 event selection QA", true);
 
   Preslice<FullTracksIU> perCollision = aod::track::collisionId;
-  Preslice<ColEvSels> perFoundBC = aod::evsel::foundBCId;
+  // Preslice<ColEvSels> perFoundBC = aod::evsel::foundBCId;
 
   void processRun3(
     ColEvSels const& cols,
@@ -1020,7 +1020,7 @@ struct EventSelectionQaTask {
       histos.fill(HIST("hMultZNCacc"), multZNC);
       histos.fill(HIST("hNcontribAcc"), nContributors);
     } // collisions
-
+    /*
     // pileup checks
     for (auto const& bc : bcs) {
       auto collisionsGrouped = cols.sliceBy(perFoundBC, bc.globalIndex());
@@ -1035,6 +1035,7 @@ struct EventSelectionQaTask {
       }
       histos.fill(HIST("hMultT0Mpup"), multT0M);
     }
+    */
   }
   PROCESS_SWITCH(EventSelectionQaTask, processRun3, "Process Run3 event selection QA", false);