Merge e08220e into sapling-pr-archive-ktf

Author: ktf

.cmake-format.py

@@ -66,12 +66,6 @@
             "HEADERS": '*',
         }
     },
-    "o2_target_man_page": {
-        "kwargs": {
-            "NAME": '+',
-            "SECTION": '*',
-        }
-    },
     "add_root_dictionary": {
         "kwargs": {
             "LINKDEF": '+',

Algorithm/CMakeLists.txt

@@ -11,9 +11,6 @@
 
 o2_add_header_only_library(Algorithm INTERFACE_LINK_LIBRARIES O2::Headers)
 
-o2_target_man_page(Algorithm NAME Algorithm SECTION 3)
-o2_target_man_page(Algorithm NAME algorithm_parser SECTION 3)
-
 o2_add_test(o2formatparser
             SOURCES test/o2formatparser.cxx
             COMPONENT_NAME Algorithm

Algorithm/doc/Algorithm.3.in

@@ -86,7 +86,6 @@ include(O2AddTestRootMacro)
 include(O2ReportNonTestedMacros)
 include(O2TargetRootDictionary)
 include(O2DataFile)
-include(O2TargetManPage)
 include(O2AddWorkflow)
 include(O2SetROOTPCMDependencies)
 include(O2AddHipifiedExecutable)
@@ -117,10 +116,6 @@ endif()
 
 add_subdirectory(config)
 
-add_custom_target(man ALL)
-o2_target_man_page(man NAME o2)
-o2_target_man_page(man NAME FairMQDevice)
-
 # Testing and packaging only needed if we are the top level directory
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   # Documentation

Algorithm/doc/algorithm_parser.3.in

@@ -29,7 +29,6 @@
 #include "GPUCommonDef.h"
 #include "GPUCommonRtypes.h"
 #include "GPUCommonMath.h"
-#include "GPUCommonArray.h"
 #include "GPUROOTCartesianFwd.h"
 
 #ifndef GPUCA_GPUCODE_DEVICE

CMakeLists.txt

@@ -12,6 +12,7 @@
 #add_compile_options(-O0 -g -fPIC)
 
 o2_add_library(GlobalTrackingStudy
+               TARGETVARNAME targetName
                SOURCES src/TPCTrackStudy.cxx
                        src/TrackingStudy.cxx
                        src/SVStudy.cxx
@@ -23,6 +24,7 @@ o2_add_library(GlobalTrackingStudy
                        src/TrackInfoExt.cxx
                        src/TrackMCStudyConfig.cxx
                        src/TrackMCStudyTypes.cxx
+                       src/TPCClusSelector.cxx
                PUBLIC_LINK_LIBRARIES O2::GlobalTracking
                                      O2::GlobalTrackingWorkflowReaders
                                      O2::GlobalTrackingWorkflowHelpers
@@ -73,3 +75,8 @@ o2_add_executable(dump-workfow
                   COMPONENT_NAME bc-tracks
                   SOURCES src/track-dump-workflow.cxx
                   PUBLIC_LINK_LIBRARIES O2::GlobalTrackingStudy)
+
+if (OpenMP_CXX_FOUND)
+    target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
+    target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
+endif()

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h

@@ -0,0 +1,92 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// helper class for TPC clusters selection
+
+#ifndef ALICEO2_TPCCLUSSELECTOR_H
+#define ALICEO2_TPCCLUSSELECTOR_H
+
+#include <vector>
+#include <array>
+#include <Rtypes.h>
+
+namespace o2::tpc
+{
+class ClusterNativeAccess;
+
+class TPCClusSelector
+{
+  // helper to select TPC cluster matching to certain timebin and optionally pads range
+  // example of usage:
+  /*
+    TPCClusSelector clSel;
+    o2::tpc::ClusterNativeHelper::Reader tcpClusterReader;
+    tcpClusterReader.init(native_clusters_file.c_str());
+    o2::tpc::ClusterNativeAccess tpcClusterIdxStruct;
+    std::unique_ptr<o2::tpc::ClusterNative[]> tpcClusterBuffer;       ///< buffer for clusters in tpcClusterIdxStruct
+    o2::tpc::ClusterNativeHelper::ConstMCLabelContainerViewWithBuffer tpcClusterMCBuffer;  ///< buffer for mc labels
+
+    tcpClusterReader.read(iTF);
+    tcpClusterReader.fillIndex(tpcClusterIdxStruct, tpcClusterBuffer, tpcClusterMCBuffer);
+
+    clSel.fill(tpcClusterIdxStruct); // Create sorted index
+    // to get i-th cluster in orderer timebins:
+    const auto& clus = tpcClusterIdxStruct.clusters[sector][row][  clSel.getIndex(sector, row, i)];
+
+    // to get sorted indices range of clusters in the tbmin:tbmax range
+    auto rng = clSel.findClustersRange(sector, row, tbmin, tbmax, tpcClusterIdxStruct);
+    if (rng.first>rng.second) { // nothing is found }
+    const auto& cln = tpcClusterIdxStruct.clusters[sector][row][clSel.getIndex(sector, row, rng.first )]; /...
+
+    // to get number of clusters in tbmin:tbmax, padmin:padmax range (and optionally get the list)
+    std::vector<int> cllist; // optional list
+    int nfnd = clSel.findClustersEntries(sector, row, tbmin, tbmax, padmin, padmax, tpcClusterIdxStruct, &cllist);
+    for (int i=0;i<nfnd;i++) {
+      const auto& cln = tpcClusterIdxStruct.clusters[sector][row][cllist[i]]; /...  direct indices!
+    }
+   */
+
+ public:
+  void clear()
+  {
+    for (auto& s : mSectors)
+      s.clear();
+  }
+  size_t getIndex(int sec, int row, uint32_t icl) const { return mSectors[sec].rows[row][icl]; }
+
+  std::pair<int, int> findClustersRange(int sec, int row, float tbmin, float tbmax, const o2::tpc::ClusterNativeAccess& tpcClusterIdxStruct);
+  int findClustersEntries(int sec, int row, float tbmin, float tbmax, float padmin, float padmax, const o2::tpc::ClusterNativeAccess& tpcClusterIdxStruct, std::vector<int>* clIDDirect = nullptr);
+  void fill(const o2::tpc::ClusterNativeAccess& tpcClusterIdxStruct);
+
+  int getNThreads() const { return mNThreads; }
+  void setNThreads(int n);
+
+ private:
+  struct Sector {
+    static constexpr int NRows = 152;
+    std::array<std::vector<uint16_t>, NRows> rows;
+    void clear()
+    {
+      for (auto& r : rows)
+        r.clear();
+    }
+  };
+
+  static constexpr int NSectors = 36;
+  std::array<Sector, NSectors> mSectors{};
+  int mNThreads = 1;
+
+  ClassDefNV(TPCClusSelector, 1);
+};
+
+} // namespace o2::tpc
+
+#endif

Detectors/GlobalTrackingWorkflow/study/CMakeLists.txt

@@ -38,5 +38,6 @@
 #pragma link C++ class std::vector < o2::trackstudy::ClResTPCCont> + ;
 #pragma link C++ class o2::trackstudy::TrackPairInfo + ;
 #pragma link C++ class std::vector < o2::trackstudy::TrackPairInfo> + ;
+#pragma ling C++ class o2::tpc::TPCClusSelector + ;
 
 #endif