Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Please consider the following formatting changes to #13356 #3

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Please consider the following formatting changes to #13356 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/NoiseMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ class NoiseMap
int incre = 0;
for (size_t i = 0; i < (int)mNoisyPixels.size(); ++i) {
for (const auto& prev_np : prev->mNoisyPixels[i]) { // only enters this for loop if the "i" chip exists.
if (mNoisyPixels[i].find(prev_np.first) == mNoisyPixels[i].end()) {
mNoisyPixels[i][prev_np.first] = prev_np.second;
incre++;
}
if (mNoisyPixels[i].find(prev_np.first) == mNoisyPixels[i].end()) {
mNoisyPixels[i][prev_np.first] = prev_np.second;
incre++;
}
} // end of for loop on elements of previous noise map
} // end of for loop on i (chip ID)
} // end of for loop on i (chip ID)
return (mNoisyPixels);
} // end of void merge

Expand Down
13 changes: 6 additions & 7 deletions Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,12 @@ void NoiseCalibratorSpec::sendOutputCcdbMerge(DataAllocator& output)
auto* payloadPrev1 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, -1, &headers);
long validtime = std::stol(headers["Valid-From"]);
auto mergedPL = payload;
if(validtime>0)
{
validtime = validtime - 60;
auto* payloadPrev2 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, validtime, &headers);
auto bufferPL = payloadPrev2->merge(payloadPrev1);
mergedPL = payload.merge(&bufferPL);
}
if (validtime > 0) {
validtime = validtime - 60;
auto* payloadPrev2 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, validtime, &headers);
auto bufferPL = payloadPrev2->merge(payloadPrev1);
mergedPL = payload.merge(&bufferPL);
}
o2::ccdb::CcdbObjectInfo info(mPathMerge, "NoiseMap", "noise.root", meta, tstart, tend);
auto flName = o2::ccdb::CcdbApi::generateFileName("noise");
auto image = o2::ccdb::CcdbApi::createObjectImage(&mergedPL, &info);
Expand Down