Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ALICE3/Core/FastTracker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
LOG(fatal) << "CCDB manager is null, cannot retrieve file " << ccdbPath;
return;
}
TGraph* g = ccdbManager->getForTimeStamp<TGraph>(ccdbPath, -1);
TGraph* g = ccdbManager->getForTimeStamp<TGraph>(ccdbPath, 1);
addedLayer->setDeadPhiRegions(g);
} else {
// Taking it as local file
Expand Down Expand Up @@ -221,7 +221,7 @@
index = 1;
z0 = -4 * sigmaD + i * dz0;
dist += index * (dz0 / 3.) * (1 / o2::math_utils::sqrt(o2::constants::math::TwoPI) / sigmaD) * std::exp(-z0 * z0 / 2. / sigmaD / sigmaD) * (1 / o2::math_utils::sqrt((z - z0) * (z - z0) + r * r));
if (index != 4)

Check failure on line 224 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
index = 4;
else
index = 2;
Expand Down Expand Up @@ -359,7 +359,7 @@
// check if layer is reached
float targetX = 1e+3;
inputTrack.getXatLabR(layers[il].getRadius(), targetX, magneticField);
if (targetX > 999.f) {

Check failure on line 362 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGF(debug, "Failed to find intercept for layer %d at radius %.2f cm", il, layers[il].getRadius());
break; // failed to find intercept
}
Expand Down Expand Up @@ -443,7 +443,7 @@

float targetX = 1e+3;
inputTrack.getXatLabR(layers[il].getRadius(), targetX, magneticField);
if (targetX > 999)

Check failure on line 446 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue; // failed to find intercept

if (!inputTrack.propagateTo(targetX, magneticField)) {
Expand Down Expand Up @@ -518,7 +518,7 @@
// backpropagate to original radius
float finalX = 1e+3;
bool inPropStatus = inwardTrack.getXatLabR(initialRadius, finalX, magneticField);
if (finalX > 999) {

Check failure on line 521 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOG(debug) << "Failed to find intercept for initial radius " << initialRadius << " cm, x = " << finalX << " and status " << inPropStatus << " and sn = " << inwardTrack.getSnp() << " r = " << inwardTrack.getY() * inwardTrack.getY();
return -3; // failed to find intercept
}
Expand All @@ -528,7 +528,7 @@
}

// only attempt to continue if intercepts are at least four
if (nIntercepts < 4) {

Check failure on line 531 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return nIntercepts;
}

Expand Down Expand Up @@ -559,7 +559,7 @@
TMatrixDSym m(5);
double fcovm[5][5]; // double precision is needed for regularisation

for (int ii = 0, k = 0; ii < 5; ++ii) {

Check failure on line 562 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
for (int j = 0; j < ii + 1; ++j, ++k) {
fcovm[ii][j] = covMat[k];
fcovm[j][ii] = covMat[k];
Expand All @@ -567,7 +567,7 @@
}

// evaluate ruben's conditional, regularise
const bool makePositiveDefinite = (covMatFactor > -1e-5); // apply fix

Check failure on line 570 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
bool rubenConditional = false;
for (int ii = 0; ii < 5; ii++) {
for (int jj = 0; jj < 5; jj++) {
Expand All @@ -576,7 +576,7 @@
if (fcovm[ii][jj] * fcovm[ii][jj] > std::abs(fcovm[ii][ii] * fcovm[jj][jj])) {
rubenConditional = true;
if (makePositiveDefinite) {
fcovm[ii][jj] = TMath::Sign(1, fcovm[ii][jj]) * covMatFactor * sqrt(std::abs(fcovm[ii][ii] * fcovm[jj][jj]));

Check failure on line 579 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
}
}
}
Expand Down Expand Up @@ -614,7 +614,7 @@
for (int j = 0; j < 5; ++j)
val += eigVec[j][ii] * outputTrack.getParam(j);
// smear parameters according to eigenvalues
params_[ii] = gRandom->Gaus(val, sqrt(eigVal[ii]));

Check failure on line 617 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
}

// invert eigenvector matrix
Expand All @@ -627,7 +627,7 @@
outputTrack.setParam(val, ii);
}
// should make a sanity check that par[2] sin(phi) is in [-1, 1]
if (fabs(outputTrack.getParam(2)) > 1.) {

Check failure on line 630 in ALICE3/Core/FastTracker.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
LOG(info) << " --- smearTrack failed sin(phi) sanity check: " << outputTrack.getParam(2);
return -2;
}
Expand Down
2 changes: 1 addition & 1 deletion ALICE3/TableProducer/alice3-centrality.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct ALICE3Centrality {
void process(const o2::aod::Collision& collision, const soa::Join<aod::Tracks, aod::TracksDCA>& tracks)
{
if (!centralityLoaded) {
hCumMultALICE3 = ccdb->getForTimeStamp<TH1D>("Analysis/ALICE3/Centrality", -1);
hCumMultALICE3 = ccdb->getForTimeStamp<TH1D>("Analysis/ALICE3/Centrality", 1);
centralityLoaded = true;
LOGF(info, "ALICE 3 centrality calibration loaded!");
}
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ struct EventMeanPtId {
ccdb->setLocalObjectValidityChecking();
// ccdb->setCreatedNotAfter(ccdbNoLaterThan.value);
// LOGF(info, "Getting object %s", ccdbPath.value.data());
TList* lst = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, -1);
TList* lst = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, 1);
ptHistogramAllchargeRec = reinterpret_cast<TH2D*>(lst->FindObject("hPtEta_rec"));
}
std::vector<double> ptBinning = {0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0};
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ struct MeanPtFlucId {
ccdb->setURL(cfgUrlCCDB.value);
ccdb->setCaching(true);

TList* lst = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, -1);
TList* lst = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, 1);
hWeightPt = reinterpret_cast<TH1D*>(lst->FindObject("hWeightPt"));
hWeightPtPi = reinterpret_cast<TH1D*>(lst->FindObject("hWeightPtPi"));
hWeightPtKa = reinterpret_cast<TH1D*>(lst->FindObject("hWeightPtKa"));
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/EbyEFluctuations/Tasks/netchargeFluctuations.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ struct NetchargeFluctuations {
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();

TList* list = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, -1);
TList* list = ccdb->getForTimeStamp<TList>(cfgPathCCDB.value, 1);
efficiencyPos = reinterpret_cast<TH1D*>(list->FindObject("efficiency_Pos_Run3"));
efficiencyNeg = reinterpret_cast<TH1D*>(list->FindObject("efficiency_Neg_Run3"));
// Log fatal error if efficiency histogram is not found
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Flow/Tasks/flowEventPlane.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ struct SpectatorPlaneTableProducer {
// Load ZDC gain calibration
if (cDoGainCalib) {
std::string ccdbPath = static_cast<std::string>(cCcdbPath) + "/GainCalib" + "/Run" + std::to_string(cRunNum);
auto ccdbObj = ccdbService->getForTimeStamp<TList>(ccdbPath, -1);
auto ccdbObj = ccdbService->getForTimeStamp<TList>(ccdbPath, 1);
CorrectionHistContainer.hGainCalib[0] = reinterpret_cast<TH2F*>(ccdbObj->FindObject("hZNASignal"));
CorrectionHistContainer.hGainCalib[1] = reinterpret_cast<TH2F*>(ccdbObj->FindObject("hZNCSignal"));
}
Expand Down Expand Up @@ -407,7 +407,7 @@ struct SpectatorPlaneTableProducer {
std::string ccdbPath = static_cast<std::string>(cCcdbPath) + "/CorrItr_" + std::to_string(i + 1) + "/Run" + std::to_string(cRunNum);

// Get object from CCDB
auto ccdbObject = ccdbService->getForTimeStamp<TList>(ccdbPath, -1);
auto ccdbObject = ccdbService->getForTimeStamp<TList>(ccdbPath, 1);

// Check CCDB Object
if (!ccdbObject) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ struct LambdaTableProducer {
}

// Get from CCDB
auto ccdbObj = ccdb->getForTimeStamp<TList>(cPathCCDB.value, -1);
auto ccdbObj = ccdb->getForTimeStamp<TList>(cPathCCDB.value, 1);

// Check CCDB Object
if (!ccdbObj) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ struct LambdaTableProducer {
return 1.;

// Get from CCDB
auto ccdbObj = ccdb->getForTimeStamp<TList>(cPathCCDB.value, -1);
auto ccdbObj = ccdb->getForTimeStamp<TList>(cPathCCDB.value, 1);
if (!ccdbObj) {
LOGF(warning, "CCDB OBJECT NOT FOUND");
return 1.;
Expand Down
Loading