from master

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

Author: dongjokim

CODEOWNERS

@@ -25,9 +25,9 @@
 /EventFiltering/PWGCF @alibuild @lauraser
 /EventFiltering/PWGMM @alibuild @aortizve
 /EventFiltering/PWGJE @alibuild @fkrizek
-/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez
-/PWGDQ @alibuild @iarsene @dsekihat
-/PWGEM @alibuild @mikesas @rbailhac
+/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
+/PWGDQ @alibuild @iarsene @dsekihat @feisenhu
+/PWGEM @alibuild @mikesas @rbailhac @feisenhu
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky
 /PWGHF @alibuild @ginnocen @vkucera @fcolamar @cterrevo

Common/CCDB/macros/upload_event_selection_params.C

@@ -255,28 +255,28 @@ void upload_event_selection_params()
     ccdb.storeAsTFileAny(par[i], "EventSelection/EventSelectionParams", metadata, sor, eor);
   }
 
-  if (0) { // Default Run 3 object
+  if (1) { // Default Run 3 object
     ULong64_t sorRun3 = 1543767116001;
     ULong64_t eorRun3 = 1893445200000;
     metadata["period"] = "Default Run 3";
     n++;
     par[n] = new EventSelectionParams();
-    par[n]->fV0ABBlower = -4.0; // ns
-    par[n]->fV0ABBupper = +4.0; // ns
-    par[n]->fV0ABGlower = 32.7; // ns
-    par[n]->fV0ABGupper = 32.8; // ns
-    par[n]->fFDABBlower = -4.0; // ns
-    par[n]->fFDABBupper = +4.0; // ns
-    par[n]->fFDABGlower = 32.7; // ns
-    par[n]->fFDABGupper = 32.8; // ns
-    par[n]->fFDCBBlower = -4.0; // ns
-    par[n]->fFDCBBupper = +4.0; // ns
-    par[n]->fFDCBGlower = 32.7; // ns
-    par[n]->fFDCBGupper = 32.8; // ns
-    par[n]->fT0ABBlower = -1.0; // ns
-    par[n]->fT0ABBupper = +1.0; // ns
-    par[n]->fT0CBBlower = -1.0; // ns
-    par[n]->fT0CBBupper = +1.0; // ns
+    par[n]->fV0ABBlower = -3.0;  // ns
+    par[n]->fV0ABBupper = +2.0;  // ns
+    par[n]->fV0ABGlower = 2.0;   // ns
+    par[n]->fV0ABGupper = 5.0;   // ns
+    par[n]->fFDABBlower = -3.0;  // ns
+    par[n]->fFDABBupper = +3.0;  // ns
+    par[n]->fFDABGlower = 10.0;  // ns
+    par[n]->fFDABGupper = 13.0;  // ns
+    par[n]->fFDCBBlower = -3.0;  // ns
+    par[n]->fFDCBBupper = +3.0;  // ns
+    par[n]->fFDCBGlower = -10.0; // ns
+    par[n]->fFDCBGupper = -3.0;  // ns
+    par[n]->fT0ABBlower = -1.0;  // ns
+    par[n]->fT0ABBupper = +1.0;  // ns
+    par[n]->fT0CBBlower = -1.0;  // ns
+    par[n]->fT0CBBupper = +1.0;  // ns
 
     ccdb.storeAsTFileAny(par[n], "EventSelection/EventSelectionParams", metadata, sorRun3, eorRun3);
   }

Common/Core/TrackSelection.h

@@ -46,6 +46,12 @@ class TrackSelection
     kNCuts
   };
 
+  enum GlobalTrackRun3ITSMatching {
+    Run3ITSibAny,
+    Run3ITSallAny,
+    Run3ITSall7Layers
+  };
+
   static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
 
   // Temporary function to check if track passes selection criteria. To be replaced by framework filters.

Common/Core/TrackSelectionDefaults.h

@@ -19,6 +19,7 @@
 #define TrackSelectionDefaults_H
 
 #include "Framework/DataTypes.h"
+#include "Common/Core/TrackSelection.h"
 
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
@@ -40,6 +41,43 @@ TrackSelection getGlobalTrackSelection()
   return selectedTracks;
 }
 
+// Default track selection requiring a particular Run 3 ITS matching
+TrackSelection getGlobalTrackSelectionITSMatch(int matching)
+{
+  std::pair<int8_t, std::set<unsigned char>> itsMatching;
+  switch (matching) {
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny:
+      itsMatching = std::make_pair((int8_t)1, (std::set<unsigned char>){0, 1, 2});
+      break;
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSallAny:
+      itsMatching = std::make_pair((int8_t)1, (std::set<unsigned char>){0, 1, 2, 3, 4, 5, 6});
+      break;
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSall7Layers:
+      itsMatching = std::make_pair((int8_t)7, (std::set<unsigned char>){0, 1, 2, 3, 4, 5, 6});
+      break;
+
+    default:
+      LOG(fatal) << "getGlobalTrackSelectionITSMatch with undefined ITS matching";
+      break;
+  }
+
+  TrackSelection selectedTracks;
+  selectedTracks.SetTrackType(o2::aod::track::Run2Track);
+  selectedTracks.SetPtRange(0.1f, 1e10f);
+  selectedTracks.SetEtaRange(-0.8f, 0.8f);
+  selectedTracks.SetRequireITSRefit(true);
+  selectedTracks.SetRequireTPCRefit(true);
+  selectedTracks.SetRequireGoldenChi2(true);
+  selectedTracks.SetMinNCrossedRowsTPC(70);
+  selectedTracks.SetMinNCrossedRowsOverFindableClustersTPC(0.8f);
+  selectedTracks.SetMaxChi2PerClusterTPC(4.f);
+  selectedTracks.SetRequireHitsInITSLayers(itsMatching.first, itsMatching.second);
+  selectedTracks.SetMaxChi2PerClusterITS(36.f);
+  selectedTracks.SetMaxDcaXYPtDep([](float pt) { return 0.0105f + 0.0350f / pow(pt, 1.1f); });
+  selectedTracks.SetMaxDcaZ(2.f);
+  return selectedTracks;
+}
+
 // Default track selection requiring no hit in the SPD and one in the innermost
 // SDD -> complementary tracks to global selection
 TrackSelection getGlobalTrackSelectionSDD()

Common/Core/aodMerger.cxx

@@ -98,7 +98,7 @@ int main(int argc, char* argv[])
       printf("AO2D merging tool. Options: \n");
       printf("  --input <inputfile.txt>      Contains path to files to be merged. Default: %s\n", inputCollection.c_str());
       printf("  --output <outputfile.root>   Target output ROOT file. Default: %s\n", outputFileName.c_str());
-      printf("  --max-size <size in Bytes>   Target directory size. Default: %ld\n", maxDirSize);
+      printf("  --max-size <size in Bytes>   Target directory size. Default: %ld. Set to 0 if file is not self-contained.\n", maxDirSize);
       printf("  --skip-non-existing-files    Flag to allow skipping of non-existing files in the input list.\n");
       return -1;
     } else {
@@ -127,6 +127,7 @@ int main(int argc, char* argv[])
   TString line;
   bool connectedToAliEn = false;
   TMap* metaData = nullptr;
+  TMap* parentFiles = nullptr;
   int totalMergedDFs = 0;
   int mergedDFs = 0;
   while (in.good() && exitCode == 0) {
@@ -183,6 +184,17 @@ int main(int argc, char* argv[])
         }
       }
 
+      if (((TObjString*)key1)->GetString().EqualTo("parentFiles")) {
+        auto parentFilesCurrentFile = (TMap*)inputFile->Get("parentFiles");
+        if (parentFiles == nullptr) {
+          parentFiles = new TMap;
+        }
+        for (auto pair : *parentFilesCurrentFile) {
+          parentFiles->Add(((TPair*)pair)->Key(), ((TPair*)pair)->Value());
+        }
+        delete parentFilesCurrentFile;
+      }
+
       if (!((TObjString*)key1)->GetString().BeginsWith("DF_")) {
         continue;
       }
@@ -371,7 +383,10 @@ int main(int argc, char* argv[])
       // check for not found tables
       for (auto& offset : offsets) {
         if (offset.second < 0) {
-          printf("ERROR: Index on %s but no tree found\n", offset.first.c_str());
+          if (maxDirSize > 0) {
+            // if maxDirSize is 0 then we do not merge DFs and this error is not an error actually (e.g. for not self-contained derived data)
+            printf("ERROR: Index on %s but no tree found\n", offset.first.c_str());
+          }
           offset.second = 0;
         }
       }
@@ -393,6 +408,11 @@ int main(int argc, char* argv[])
     inputFile->Close();
   }
 
+  if (parentFiles) {
+    outputFile->cd();
+    parentFiles->Write("parentFiles", TObject::kSingleKey);
+  }
+
   outputFile->Write();
   outputFile->Close();
 

Common/TableProducer/eventSelection.cxx

@@ -410,42 +410,80 @@ struct EventSelectionTask {
   void processRun3(aod::Collision const& col, BCsWithBcSels const& bcs)
   {
     auto bc = col.bc_as<BCsWithBcSels>();
-    uint64_t apprBC = bc.globalBC();
-    int64_t meanBC = apprBC - std::lround(col.collisionTime() / o2::constants::lhc::LHCBunchSpacingNS);
+    int64_t shift = 0;
+
+    // temporary workaround for apass1. Might be included in CCDB in the future
+    if (bc.runNumber() > 520143) {
+      shift = col.collisionTimeRes() < 12 ? -2 : -15;
+    } else if (bc.runNumber() >= 523141) {
+      shift = col.collisionTimeRes() < 12 ? -2 : 0;
+    }
+
+    int64_t meanBC = bc.globalBC() + shift;
     int64_t deltaBC = std::ceil(col.collisionTimeRes() / o2::constants::lhc::LHCBunchSpacingNS * 4);
+
     // use custom delta
     if (customDeltaBC > 0) {
       deltaBC = customDeltaBC;
     }
 
-    if (!bc.has_foundFT0()) { // search in +/-4 sigma around meanBC
-      // search forward
-      int forwardMoveCount = 0;
-      int64_t forwardBcDist = deltaBC + 1;
-      for (; bc != bcs.end() && int64_t(bc.globalBC()) <= meanBC + deltaBC; ++bc, ++forwardMoveCount) {
-        if (bc.has_foundFT0()) {
-          forwardBcDist = bc.globalBC() - meanBC;
-          break;
-        }
+    uint64_t minBC = meanBC - deltaBC;
+    uint64_t maxBC = meanBC + deltaBC;
+
+    // temporary workaround for apass1. Might be included in CCDB in the future
+    if (bc.runNumber() >= 520143 && col.collisionTimeRes() < 12) { // collisions with TOF-matched tracks
+      minBC = meanBC - 13;
+      maxBC = meanBC;
+    } else if (bc.runNumber() >= 523141 && col.collisionTimeRes() < 12) { // collisions with TOF-matched tracks
+      minBC = meanBC - 2;
+      maxBC = meanBC + 4;
+    }
+    if (bc.runNumber() == 505600) { // pilot run without TOF - using custom delta bc to improve matching
+      minBC = meanBC - 400;
+      maxBC = meanBC + 400;
+    }
+
+    int forwardMoveCount = 0, backwardMoveCount = 0;
+    uint64_t backwardBC = minBC - 1;
+    uint64_t forwardBC = maxBC + 1;
+    // search in forward direction starting from the current bc
+    while (bc != bcs.end() && bc.globalBC() <= maxBC && bc.globalBC() >= minBC) {
+      if (bc.selection()[kIsBBT0A] || bc.selection()[kIsBBT0C]) {
+        forwardBC = bc.globalBC();
+        break;
       }
-      bc.moveByIndex(-forwardMoveCount);
-      // search backward
-      int backwardMoveCount = 0;
-      int64_t backwardBcDist = deltaBC + 1;
-      for (; int64_t(bc.globalBC()) >= meanBC - deltaBC; --bc, ++backwardMoveCount) {
-        if (bc.has_foundFT0()) {
-          backwardBcDist = meanBC - bc.globalBC();
-          break;
-        }
-        if (bc == bcs.begin()) {
-          break;
-        }
+      bc++;
+      forwardMoveCount++;
+    }
+    bc.moveByIndex(-forwardMoveCount);
+
+    // search in backward direction
+    while (bc.globalIndex() > 0 && bc.globalBC() >= minBC) {
+      bc--;
+      backwardMoveCount--;
+      if (bc.globalBC() > maxBC || bc.globalBC() < minBC) {
+        continue;
+      }
+      if (bc.selection()[kIsBBT0A] || bc.selection()[kIsBBT0C]) {
+        backwardBC = bc.globalBC();
+        break;
       }
-      if (forwardBcDist > deltaBC && backwardBcDist > deltaBC) {
-        bc.moveByIndex(backwardMoveCount); // return to nominal bc if neighbouring ft0 is not found
-      } else if (forwardBcDist < backwardBcDist) {
-        bc.moveByIndex(backwardMoveCount + forwardMoveCount); // move forward
-      }                                                       // else keep backward bc
+    }
+    bc.moveByIndex(-backwardMoveCount);
+
+    if (forwardBC <= maxBC && backwardBC >= minBC) {
+      // if FT0 is found on both sides from meanBC, move to closest one
+      if (labs(int64_t(forwardBC) - meanBC) < labs(int64_t(backwardBC) - meanBC)) {
+        bc.moveByIndex(forwardMoveCount);
+      } else {
+        bc.moveByIndex(backwardMoveCount);
+      }
+    } else if (forwardBC <= maxBC) {
+      // if FT0 is found only in forward, move forward
+      bc.moveByIndex(forwardMoveCount);
+    } else if (backwardBC >= minBC) {
+      // if FT0 is found only in backward, move backward
+      bc.moveByIndex(backwardMoveCount);
     }
 
     int32_t foundBC = bc.globalIndex();

Common/TableProducer/trackselection.cxx

@@ -37,6 +37,7 @@ using namespace o2::framework::expressions;
 struct TrackSelectionTask {
   // FIXME: this will be removed once we can get this via meta data
   Configurable<bool> isRun3{"isRun3", false, "temp option to enable run3 mode"};
+  Configurable<int> itsMatching{"itsMatching", 0, "condition for ITS matching (0: Run2 SPD kAny, 1: Run3ITSibAny, 2: Run3ITSallAny, 3: Run3ITSall7Layers)"};
 
   Produces<aod::TrackSelection> filterTable;
 
@@ -45,7 +46,34 @@ struct TrackSelectionTask {
 
   void init(InitContext&)
   {
-    globalTracks = getGlobalTrackSelection();
+    switch (itsMatching) {
+      case 0:
+        // Run 2 SPD kAny
+        globalTracks = getGlobalTrackSelection();
+        break;
+      case 1:
+        // Run 3 kAny on 3 IB layers of ITS
+        if (isRun3) {
+          globalTracks = getGlobalTrackSelectionITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny);
+        }
+        break;
+      case 2:
+        // Run 3 kAny on all 7 layers of ITS
+        if (isRun3) {
+          globalTracks = getGlobalTrackSelectionITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSallAny);
+        }
+        break;
+      case 3:
+        // Run 3 kAll on all 7 layers of ITS
+        if (isRun3) {
+          globalTracks = getGlobalTrackSelectionITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSall7Layers);
+        }
+        break;
+
+      default:
+        LOG(fatal) << "TrackSelectionTask with undefined cuts. Fix it!";
+        break;
+    }
     globalTracksSDD = getGlobalTrackSelectionSDD();
 
     if (isRun3) {