Merge branch 'master' into pwglf-antinuclei-mod

Author: FrancescaCasillo

.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/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

ALICE3/Macros/Configuration/a3geometry_v4.ini

@@ -0,0 +1,109 @@
+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
+
+ddd0.r: 0.5
+ddd0.z: 250
+ddd0.x0: 0.001
+ddd0.xrho: 1.1646e-02
+ddd0.resRPhi: 0.00025
+ddd0.resZ: 0.00025
+ddd0.eff: 1.00
+ddd0.type: 1
+
+
+ddd1.r: 1.2
+ddd1.z: 250
+ddd1.x0: 0.001
+ddd1.xrho: 1.1646e-02
+ddd1.resRPhi: 0.00025
+ddd1.resZ: 0.00025
+ddd1.eff: 1.00
+ddd1.type: 1
+
+
+ddd2.r: 2.5
+ddd2.z: 250
+ddd2.x0: 0.001
+ddd2.xrho: 1.1646e-02
+ddd2.resRPhi: 0.00025
+ddd2.resZ: 0.00025
+ddd2.eff: 1.00
+ddd2.type: 1
+
+bpipe1.r: 5.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
+
+ddd3.r: 7.
+ddd3.z: 250
+ddd3.x0: 0.005
+ddd3.xrho: 1.1646e-01
+ddd3.resRPhi: 0.001
+ddd3.resZ: 0.001
+ddd3.eff: 1.00
+ddd3.type: 1
+
+ddd4.r: 10.
+ddd4.z: 250
+ddd4.x0: 0.005
+ddd4.xrho: 1.1646e-01
+ddd4.resRPhi: 0.001
+ddd4.resZ: 0.001
+ddd4.eff: 1.00
+ddd4.type: 1
+
+ddd5.r: 13.
+ddd5.z: 250
+ddd5.x0: 0.005
+ddd5.xrho: 1.1646e-01
+ddd5.resRPhi: 0.001
+ddd5.resZ: 0.001
+ddd5.eff: 1.00
+ddd5.type: 1
+
+ddd6.r: 16.
+ddd6.z: 250
+ddd6.x0: 0.005
+ddd6.xrho: 1.1646e-01
+ddd6.resRPhi: 0.001
+ddd6.resZ: 0.001
+ddd6.eff: 1.00
+ddd6.type: 1
+
+ddd7.r: 25.
+ddd7.z: 250
+ddd7.x0: 0.005
+ddd7.xrho: 1.1646e-01
+ddd7.resRPhi: 0.001
+ddd7.resZ: 0.001
+ddd7.eff: 1.00
+ddd7.type: 1
+
+ddd8.r: 40.
+ddd8.z: 250
+ddd8.x0: 0.005
+ddd8.xrho: 1.1646e-01
+ddd8.resRPhi: 0.001
+ddd8.resZ: 0.001
+ddd8.eff: 1.00
+ddd8.type: 1
+
+ddd9.r: 45.
+ddd9.z: 250
+ddd9.x0: 0.005
+ddd9.xrho: 1.1646e-01
+ddd9.resRPhi: 0.001
+ddd9.resZ: 0.001
+ddd9.eff: 1.00
+ddd9.type: 1

ALICE3/macros/drawFastTracker.C ALICE3/Macros/drawFastTracker.CALICE3/macros/drawFastTracker.C renamed to ALICE3/Macros/drawFastTracker.C

@@ -39,7 +39,7 @@
 /PWGEM @alibuild @feisenhu @dsekihat @ivorobye @jokonig
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid @jokonig
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat @jokonig
-/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng
+/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng @singhra1994
 # PWG-LF
 /PWGLF @alibuild @sustripathy @skundu692 @mpuccio
 /PWGLF/DataModel @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter

ALICE3/macros/testFastTracker.C ALICE3/Macros/testFastTracker.CALICE3/macros/testFastTracker.C renamed to ALICE3/Macros/testFastTracker.C

@@ -25,6 +25,7 @@
 #include <Framework/RunningWorkflowInfo.h>
 
 #include <string>
+#include <vector>
 
 namespace o2::common::core
 {
@@ -89,6 +90,10 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
           value = option.defaultValue.get<ValueType>();
           if (verbose) {
             if constexpr (!std::is_same_v<ValueType, o2::framework::LabeledArray<float>>) {
+              LOG(info) << "   Found option '" << optName << " of type LabeledArray<float>";
+            } else if constexpr (!std::is_same_v<ValueType, std::vector<std::string>>) {
+              LOG(info) << "   Found option '" << optName << " of type vector<string>";
+            } else {
               LOG(info) << "   Found option '" << optName << "' with value '" << value << "'";
             }
             found = true;