Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

.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

@@ -958,14 +958,14 @@ void* CcdbApi::extractFromLocalFile(std::string const& filename, std::type_info
 
 bool CcdbApi::initTGrid() const
 {
-  if (mNeedAlienToken && !mAlienInstance) {
+  if (mNeedAlienToken && !gGrid) {
     static bool allowNoToken = getenv("ALICEO2_CCDB_NOTOKENCHECK") && atoi(getenv("ALICEO2_CCDB_NOTOKENCHECK"));
     if (!allowNoToken && !checkAlienToken()) {
       LOG(fatal) << "Alien Token Check failed - Please get an alien token before running with https CCDB endpoint, or alice-ccdb.cern.ch!";
     }
-    mAlienInstance = TGrid::Connect("alien");
+    TGrid::Connect("alien");
     static bool errorShown = false;
-    if (!mAlienInstance && errorShown == false) {
+    if (!gGrid && errorShown == false) {
       if (allowNoToken) {
         LOG(error) << "TGrid::Connect returned nullptr. May be due to missing alien token";
       } else {
@@ -974,7 +974,7 @@ bool CcdbApi::initTGrid() const
       errorShown = true;
     }
   }
-  return mAlienInstance != nullptr;
+  return gGrid != nullptr;
 }
 
 void* CcdbApi::downloadFilesystemContent(std::string const& url, std::type_info const& tinfo, std::map<string, string>* headers) const

Algorithm/doc/algorithm_parser.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

CCDB/src/CcdbApi.cxx

@@ -142,6 +142,8 @@ class DCAFitterN
     FailInv2ndDeriv, // inversion of 2nd derivatives failed
     FailCorrTracks,  // correction of tracks to updated x failed
     FailCloserAlt,   // alternative PCA is closer
+    //
+    NStatusesDefined
   };
 
   static constexpr int getNProngs() { return N; }
@@ -989,7 +991,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2()
   }
 
   if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference
-    mFitStatus[mCurHyp] = FitStatus::RejTrackX;
+    mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;
     return false;
   }
 
@@ -1063,7 +1065,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2NoErr()
     setTrackPos(mTrPos[mCurHyp][i], mCandTr[mCurHyp][i]); // prepare positions
   }
   if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference
-    mFitStatus[mCurHyp] = FitStatus::RejTrackX;
+    mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;
     return false;
   }
 

CMakeLists.txt

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

Common/DCAFitter/include/DCAFitter/DCAFitterN.h

@@ -265,7 +265,7 @@ void BarrelAlignmentSpec::updateTimeDependentParams(ProcessingContext& pc)
       prevField = newField;
       if (mDetMask[DetID::TPC]) {
         mTPCParam.reset(new o2::gpu::GPUParam);
-        mTPCParam->SetDefaults(o2::base::Propagator::Instance()->getNominalBz());
+        mTPCParam->SetDefaults(o2::base::Propagator::Instance()->getNominalBz(), false);
         mController->setTPCParam(mTPCParam.get());
       }
     }

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h

@@ -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()