Skip to content

Commit aeebdb8

Browse files
authored
Merge branch 'AliceO2Group:dev' into new-detector4
2 parents a8e4a0d + ed07815 commit aeebdb8

File tree

195 files changed

+3960
-1041
lines changed

Some content is hidden

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

195 files changed

+3960
-1041
lines changed

CCDB/include/CCDB/BasicCCDBManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber
333333
auto [start, stop] = getRunDuration(runNumber);
334334
if (start < 0 || stop < 0) {
335335
if (mFatalWhenNull) {
336-
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber));
336+
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber) + std::string(" from CCDB"));
337337
}
338338
return nullptr;
339339
}

Common/Constants/include/CommonConstants/PhysicsConstants.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ enum Pdg {
5252
kDS1 = 10433,
5353
kDS2Star = 435,
5454
kDStar = 413,
55+
kDStar0 = 423,
5556
kChiC1 = 20443,
5657
kJPsi = 443,
5758
kLambdaB0 = 5122,
@@ -101,6 +102,7 @@ constexpr double MassDSStar = 2.1122;
101102
constexpr double MassDS1 = 2.53511;
102103
constexpr double MassDS2Star = 2.5691;
103104
constexpr double MassDStar = 2.01026;
105+
constexpr double MassDStar0 = 2.00685;
104106
constexpr double MassChiC1 = 3.51067;
105107
constexpr double MassJPsi = 3.0969;
106108
constexpr double MassLambdaB0 = 5.6196;

Common/Constants/include/CommonConstants/make_pdg_header.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class Pdg(Enum):
107107
kDS1 = 10433
108108
kDS2Star = 435
109109
kDStar = 413
110+
kDStar0 = 423
110111
kChiC1 = 20443
111112
kJPsi = 443
112113
kLambdaB0 = 5122

0 commit comments

Comments
 (0)