Merge branch 'AliceO2Group:master' into master

Author: prchakra

.github/labeler.yml

@@ -1,69 +1,89 @@
 ---
-alice3:
+infrastructure:
   - changed-files:
-      - any-glob-to-any-file: ['ALICE3/**']
+      - any-glob-to-any-file:
+          - ".checkov.yml"
+          - ".clang-format"
+          - ".clang-tidy"
+          - ".flake8"
+          - ".git-blame-ignore-revs"
+          - ".github/**"
+          - ".gitignore"
+          - ".mega-linter.yml"
+          - ".pre-commit-config.yaml"
+          - "cmake/**"
+          - "CMakeLists.txt"
+          - "CODEOWNERS"
+          - "COPYING"
+          - "cppcheck_config"
+          - "CPPLINT.cfg"
+          - "dependencies/**"
+          - "o2linter_config"
+          - "packaging/**"
+          - "pyproject.toml"
+          - "README.md"
 
-common:
+datamodel:
   - changed-files:
-      - any-glob-to-any-file: ['Common/**']
+      - any-glob-to-any-file: ["DataModel/**", "**/DataModel/**"]
 
-infrastructure:
+alice3:
   - changed-files:
-      - any-glob-to-any-file:
-          - '.clang-format'
-          - '.clang-tidy'
-          - '.flake8'
-          - '.github/**'
-          - '.checkov.yml'
-          - '.mega-linter.yml'
-          - '.pre-commit-config.yaml'
-          - 'cmake/**'
-          - 'CODEOWNERS'
-          - 'CPPLINT.cfg'
-          - 'dependencies/**'
-          - 'packaging/**'
-          - 'pyproject.toml'
+      - any-glob-to-any-file: ["ALICE3/**"]
 
-datamodel:
+common:
   - changed-files:
-      - any-glob-to-any-file: ['DataModel/**', '**/DataModel/**']
+      - any-glob-to-any-file: ["Common/**"]
 
 dpg:
   - changed-files:
-      - any-glob-to-any-file: ['DPG/**']
+      - any-glob-to-any-file: ["DPG/**"]
 
 pwgcf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGCF/**', '*/PWGCF/**']
+      - any-glob-to-any-file: ["PWGCF/**", "*/PWGCF/**"]
 
 pwgdq:
   - changed-files:
-      - any-glob-to-any-file: ['PWGDQ/**', '*/PWGDQ/**']
+      - any-glob-to-any-file: ["PWGDQ/**", "*/PWGDQ/**"]
 
 pwgem:
   - changed-files:
-      - any-glob-to-any-file: ['PWGEM/**', '*/PWGEM/**']
+      - any-glob-to-any-file: ["PWGEM/**", "*/PWGEM/**"]
 
 pwghf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGHF/**', '*/PWGHF/**']
+      - any-glob-to-any-file: ["PWGHF/**", "*/PWGHF/**"]
 
 pwgje:
   - changed-files:
-      - any-glob-to-any-file: ['PWGJE/**', '*/PWGJE/**']
+      - any-glob-to-any-file: ["PWGJE/**", "*/PWGJE/**"]
 
 pwglf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGLF/**', '*/PWGLF/**', 'PWGMM/**', '*/PWGMM/**']
+      - any-glob-to-any-file:
+          ["PWGLF/**", "*/PWGLF/**", "PWGMM/**", "*/PWGMM/**"]
+
+pwgmm:
+  - changed-files:
+      - any-glob-to-any-file: ["PWGMM/**", "*/PWGMM/**"]
 
 pwgud:
   - changed-files:
-      - any-glob-to-any-file: ['PWGUD/**', '*/PWGUD/**']
+      - any-glob-to-any-file: ["PWGUD/**", "*/PWGUD/**"]
+
+scripts:
+  - changed-files:
+      - any-glob-to-any-file: ["Scripts/**"]
+
+tools:
+  - changed-files:
+      - any-glob-to-any-file: ["Tools/**"]
 
 trigger:
   - changed-files:
-      - any-glob-to-any-file: ['EventFiltering/**']
+      - any-glob-to-any-file: ["EventFiltering/**"]
 
 tutorial:
   - changed-files:
-      - any-glob-to-any-file: ['Tutorials/**']
+      - any-glob-to-any-file: ["Tutorials/**"]

.github/workflows/mega-linter.yml

@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v9.1.0
+        uses: oxsecurity/megalinter@v9.2.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.5 # clang-format version
+    rev: v21.1.8 # clang-format version
     hooks:
       - id: clang-format
   - repo: https://github.com/cpplint/cpplint

ALICE3/CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory(Core)
 # add_subdirectory(DataModel)
 add_subdirectory(Tasks)
 add_subdirectory(TableProducer)
-# add_subdirectory(Tools)
+add_subdirectory(Macros)

ALICE3/Core/FastTracker.h

@@ -19,6 +19,7 @@
 
 #include <fairlogger/Logger.h>
 
+#include <map>
 #include <string>
 #include <vector>
 

ALICE3/Macros/CMakeLists.txt

@@ -0,0 +1,17 @@
+# 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.
+
+install(FILES Configuration/a3geo.ini
+        Configuration/a3geometry_v2.ini
+        Configuration/a3geometry_v4.ini
+        PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ
+        DESTINATION share/alice3/)
+

ALICE3/macros/a3geo.ini ALICE3/Macros/Configuration/a3geo.iniALICE3/macros/a3geo.ini renamed to ALICE3/Macros/Configuration/a3geo.ini

@@ -1,4 +1,20 @@
 # Example of the ALICE3 geometry file in TEnv format
+# Example of layers configuration for FastTracker
+# Each layer is defined by a set of parameters
+# Format:
+# <layer_name>.<parameter>: <value>
+# Example:
+# layer1.r: 0.5 # radius in cm
+# layer1.z: 250 # half-length in cm
+# layer1.x0: 0.001 # radiation length
+# layer1.xrho: 0 # density in g/cm^2
+# layer1.resRPhi: 0.0001 # resolution in R-Phi in cm
+# layer1.resZ: 0.0001 # resolution in Z in cm
+# layer1.eff: 1.0 # efficiency (0 to 1)
+# layer1.type: 1 #  type of layer (0: passive, 1: active)
+# layer1.deadPhiRegions: /path/to/dead_regions.root # optional dead regions file
+
+
 bpipe0.r: 0.48
 bpipe0.z: 250
 bpipe0.x0: 0.001592
@@ -7,7 +23,6 @@ bpipe0.resRPhi: 0.0
 bpipe0.resZ: 0.0
 bpipe0.eff: 0.0
 bpipe0.type: 0
-bpipe0.deadPhiRegions: /tmp/asd.root
 
 B00.r: 0.5
 B00.z: 250
@@ -144,5 +159,4 @@ B10.resZ: 0.001
 B10.eff: 1.
 B10.type: 1
 
-
-
+global.lutEl: /tmp/lutCovm.el.20kG.rmin20.geometry_v2.dat

ALICE3/Macros/Configuration/a3geometry_v2.ini

@@ -0,0 +1,119 @@
+
+
+bpipe0.r: 0.48
+bpipe0.z: 250
+bpipe0.x0: 0.00042
+bpipe0.xrho: 2.772e-02
+bpipe0.resRPhi: 0.0f
+bpipe0.resZ: 0.0f
+bpipe0.eff: 0.0f
+bpipe0.type: 0
+
+
+B00.r: 0.5
+B00.z: 250
+B00.x0: 0.001
+B00.xrho: 2.3292e-02
+B00.resRPhi: 0.00025
+B00.resZ: 0.00025
+B00.eff: 1.00
+B00.type: 1
+
+B01.r: 1.2
+B01.z: 250
+B01.x0: 0.001
+B01.xrho: 2.3292e-02
+B01.resRPhi: 0.00025
+B01.resZ: 0.00025
+B01.eff: 1.00
+B01.type: 1
+
+B02.r: 2.5
+B02.z: 250
+B02.x0: 0.001
+B02.xrho: 2.3292e-02
+B02.resRPhi: 0.00025
+B02.resZ: 0.00025
+B02.eff: 1.00
+B02.type: 1
+
+bpipe1.r: 3.7
+bpipe1.z: 250
+bpipe1.x0: 0.0014
+bpipe1.xrho: 9.24e-02
+bpipe1.resRPhi: 0.0f
+bpipe1.resZ: 0.0f
+bpipe1.eff: 0.0f
+bpipe1.type: 0
+
+B03.r: 3.75
+B03.z: 250
+B03.x0: 0.01
+B03.xrho: 2.3292e-01
+B03.resRPhi: 0.001
+B03.resZ: 0.001
+B03.eff: 1.00
+B03.type: 1
+
+B04.r: 7.
+B04.z: 250
+B04.x0: 0.01
+B04.xrho: 2.3292e-01
+B04.resRPhi: 0.001
+B04.resZ: 0.001
+B04.eff: 1.00
+B04.type: 1
+
+B05.r: 12.
+B05.z: 250
+B05.x0: 0.01
+B05.xrho: 2.3292e-01
+B05.resRPhi: 0.001
+B05.resZ: 0.001
+B05.eff: 1.00
+B05.type: 1
+
+B06.r: 20.
+B06.z: 250
+B06.x0: 0.01
+B06.xrho: 2.3292e-01
+B06.resRPhi: 0.001
+B06.resZ: 0.001
+B06.eff: 1.00
+B06.type: 1
+
+B07.r: 30.
+B07.z: 250
+B07.x0: 0.01
+B07.xrho: 2.3292e-01
+B07.resRPhi: 0.001
+B07.resZ: 0.001
+B07.eff: 1.00
+B07.type: 1
+
+B08.r: 45.
+B08.z: 250
+B08.x0: 0.01
+B08.xrho: 2.3292e-01
+B08.resRPhi: 0.001
+B08.resZ: 0.001
+B08.eff: 1.00
+B08.type: 1
+
+B09.r: 60.
+B09.z: 250
+B09.x0: 0.01
+B09.xrho: 2.3292e-01
+B09.resRPhi: 0.001
+B09.resZ: 0.001
+B09.eff: 1.00
+B09.type: 1
+
+B10.r: 80.
+B10.z: 250
+B10.x0: 0.01
+B10.xrho: 2.3292e-01
+B10.resRPhi: 0.001
+B10.resZ: 0.001
+B10.eff: 1.00
+B10.type: 1