Skip to content

Commit a45700b

Browse files
scannitoscannito
authored
Merge branch 'AliceO2Group:master' into Update
2 parents 905436b + b48555d commit a45700b

File tree

150 files changed

+14429
-5104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+14429
-5104
lines changed

‎ALICE3/TableProducer/OTF/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ o2physics_add_dpl_workflow(onthefly-tracker
1515
COMPONENT_NAME Analysis)
1616

1717
o2physics_add_dpl_workflow(onthefly-tofpid
18-
SOURCES onTheFlyTOFPID.cxx
18+
SOURCES onTheFlyTofPid.cxx
1919
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::ReconstructionDataFormats O2::DetectorsCommonDataFormats O2Physics::ALICE3Core
2020
COMPONENT_NAME Analysis)
2121

2222
o2physics_add_dpl_workflow(onthefly-richpid
23-
SOURCES onTheFlyRICHPID.cxx
23+
SOURCES onTheFlyRichPid.cxx
2424
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::ReconstructionDataFormats O2::DetectorsCommonDataFormats O2Physics::ALICE3Core
2525
COMPONENT_NAME Analysis)

‎ALICE3/TableProducer/OTF/onTheFlyRICHPID.cxx‎

Lines changed: 0 additions & 627 deletions
This file was deleted.

‎ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx‎

Lines changed: 943 additions & 0 deletions
Large diffs are not rendered by default.

ALICE3/TableProducer/OTF/onTheFlyTOFPID.cxx renamed to ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx

Lines changed: 151 additions & 118 deletions
Large diffs are not rendered by default.

‎ALICE3/TableProducer/OTF/onTheFlyTracker.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,9 @@ struct OnTheFlyTracker {
870870
posClusterCandidate[2] = gRandom->Gaus(posClusterCandidate[2], currentTrackingLayer.resZ);
871871
}
872872

873+
if (std::isnan(phi))
874+
continue; // Catch when getXatLabR misses layer[i]
875+
873876
// towards adding cluster: move to track alpha
874877
double alpha = cascadeTrack.getAlpha();
875878
double xyz1[3]{

‎ALICE3/TableProducer/alice3-multicharm.cxx‎

Lines changed: 115 additions & 33 deletions
Large diffs are not rendered by default.

‎CODEOWNERS‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
3939
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
4040
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
41-
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy
41+
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel
4242
# PWG-LF
43-
/PWGLF @alibuild @njacazio @skundu692
44-
/PWGLF/Tasks/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @abmodak
45-
/PWGLF/TableProducer/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @abmodak
46-
/PWGLF/Tasks/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
47-
/PWGLF/TableProducer/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
48-
/PWGLF/Tasks/Resonances @alibuild @njacazio @skundu692 @dmallick2 @smaff92
49-
/PWGLF/TableProducer/Resonances @alibuild @njacazio @skundu692 @dmallick2 @smaff92
50-
/PWGLF/Tasks/Strangeness @alibuild @njacazio @skundu692 @ercolessi @romainschotter
51-
/PWGLF/TableProducer/Strangeness @alibuild @njacazio @skundu692 @ercolessi @romainschotter
43+
/PWGLF @alibuild @sustripathy @skundu692
44+
/PWGLF/Tasks/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak
45+
/PWGLF/TableProducer/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak
46+
/PWGLF/Tasks/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @chiarapinto @maciacco
47+
/PWGLF/TableProducer/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @chiarapinto @maciacco
48+
/PWGLF/Tasks/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
49+
/PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
50+
/PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
51+
/PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
5252

5353
# PWG-MM
54-
/PWGMM @alibuild @njacazio @skundu692 @aalkin
55-
/PWGMM/Mult @alibuild @njacazio @skundu692 @aalkin @aortizve @ddobrigk @gbencedi
54+
/PWGMM @alibuild @sustripathy @skundu692 @aalkin
55+
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi
5656
/PWGMM/Lumi @alibuild @aalkin
5757
/PWGMM/UE @alibuild @aalkin @aortizve
5858

@@ -63,7 +63,7 @@
6363
/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
6464
/Tutorials/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
6565
/Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
66-
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa
66+
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa @gluparel
6767
/Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @mfasDa @fjonasALICE
6868
/Tutorials/PWGLF @alibuild @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @ercolessi @iravasen @njacazio @romainschotter @skundu692
6969
/Tutorials/PWGMM @alibuild @aalkin @ddobrigk

‎Common/CCDB/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ o2physics_target_root_dictionary(AnalysisCCDB
2121
HEADERS ctpRateFetcher.h
2222
HEADERS RCTSelectionFlags.h
2323
LINKDEF AnalysisCCDBLinkDef.h)
24+
25+
o2physics_add_header_only_library(RCTSelectionFlags
26+
HEADERS RCTSelectionFlags.h)

‎Common/Core/TableHelper.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include <string>
2222

23+
#include "Framework/Configurable.h"
2324
#include "Framework/InitContext.h"
2425
#include "Framework/RunningWorkflowInfo.h"
2526

@@ -95,4 +96,15 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
9596
return false;
9697
}
9798

99+
/// Function to check for a specific configurable from another task in the current workflow and fetch its value. Useful for tasks that need to know the value of a configurable in another task.
100+
/// @param initContext initContext of the init function
101+
/// @param taskName name of the task to check for
102+
/// @param value Task configurable to inherit from (name and values are used)
103+
/// @param verbose if true, print debug messages
104+
template <typename ValueType>
105+
bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::string& taskName, ValueType& configurable, const bool verbose = true)
106+
{
107+
return getTaskOptionValue(initContext, taskName, configurable.name, configurable.value, verbose);
108+
}
109+
98110
#endif // COMMON_CORE_TABLEHELPER_H_

‎Common/DataModel/PIDResponseITS.h‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ struct ITSResponse {
7373
// static constexpr float charge = static_cast<float>(o2::track::pid_constants::sCharges[id]);
7474
const float bg = momentum * inverseMass;
7575
if (id == o2::track::PID::Helium3 || id == o2::track::PID::Alpha) {
76-
return mResolutionParamsZ2[0] * std::erf((bg - mResolutionParamsZ2[1]) / mResolutionParamsZ2[2]);
76+
return mResolutionParamsZ2[1] > -999.0 ? mResolutionParamsZ2[0] * std::erf((bg - mResolutionParamsZ2[1]) / mResolutionParamsZ2[2]) : mResolutionParamsZ2[0];
7777
}
78-
return mResolutionParams[0] * std::erf((bg - mResolutionParams[1]) / mResolutionParams[2]);
78+
return mResolutionParams[1] > -999.0 ? mResolutionParams[0] * std::erf((bg - mResolutionParams[1]) / mResolutionParams[2]) : mResolutionParams[0];
7979
}
8080

8181
template <o2::track::PID::ID id>
@@ -117,6 +117,14 @@ struct ITSResponse {
117117
mResolutionParamsZ2[2] = p2_res_Z2;
118118
}
119119

120+
static void setMCDefaultParameters()
121+
{
122+
setParameters(1.63806, 1.58847, 2.52275,
123+
2.66505, 1.48405, 6.90453,
124+
1.40487e-01, -4.31078e-01, 1.50052,
125+
0.09, -999., -999.);
126+
}
127+
120128
private:
121129
static std::array<float, 3> mITSRespParams;
122130
static std::array<float, 3> mITSRespParamsZ2;
@@ -129,7 +137,7 @@ std::array<float, 3> ITSResponse::mITSRespParams = {1.18941, 1.53792, 1.69961};
129137
std::array<float, 3> ITSResponse::mITSRespParamsZ2 = {2.35117, 1.80347, 5.14355};
130138
// relative resolution is modelled with an erf function: [0]*TMath::Erf((x-[1])/[2])
131139
std::array<float, 3> ITSResponse::mResolutionParams = {1.94669e-01, -2.08616e-01, 1.30753};
132-
std::array<float, 3> ITSResponse::mResolutionParamsZ2 = {8.74371e-02, -1.82804, 5.06449e-01};
140+
std::array<float, 3> ITSResponse::mResolutionParamsZ2 = {0.09, -999., -999.};
133141
bool ITSResponse::mIsInitialized = false;
134142

135143
namespace pidits

0 commit comments

Comments
 (0)