Skip to content

ITS efficiency maps protection for digitization out of range #12889

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

Merged
shahor02 merged 8 commits into from
Apr 1, 2024
Merged

ITS efficiency maps protection for digitization out of range #12889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56cc47b
ITS efficiency maps pretection for digitization out of range
nicolovalle Mar 19, 2024
ab90fe5
ITS efficiency maps pretection for digitization out of range
nicolovalle Mar 19, 2024
d33bb28
ITS efficiency maps pretection for digitization out of range
nicolovalle Mar 19, 2024
5de44bd
typo in info message
nicolovalle Mar 20, 2024
2124158
sending message at EOR to infologger
nicolovalle Mar 20, 2024
7dd01da
fix formatting
nicolovalle Mar 20, 2024
00e9c16
fix
nicolovalle Mar 20, 2024
907f5ec
fix
nicolovalle Mar 20, 2024
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
21 changes: 12 additions & 9 deletions DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TimeDeadMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ class TimeDeadMap
}
}

void decodeMap(unsigned long orbit, o2::itsmft::NoiseMap& noisemap, bool includeStaticMap = true)
{ // for time-dependent and (optionally) static part
void decodeMap(unsigned long orbit, o2::itsmft::NoiseMap& noisemap, bool includeStaticMap = true, long orbitGapAllowed = 330000)
{ // for time-dependent and (optionally) static part. Use orbitGapAllowed = -1 to ignore check on orbit difference

if (mMAP_VERSION != "3" && mMAP_VERSION != "4") {
LOG(error) << "Trying to decode time-dependent deadmap version " << mMAP_VERSION << ". Not implemented, doing nothing.";
Expand All @@ -84,14 +84,16 @@ class TimeDeadMap
if (mEvolvingDeadMap.empty()) {
LOG(warning) << "Time-dependent dead map is empty. Doing nothing.";
return;
} else if (orbit > mEvolvingDeadMap.rbegin()->first + 11000 * 300 || orbit < mEvolvingDeadMap.begin()->first - 11000 * 300) {
// the map should not leave several minutes uncovered.
LOG(warning) << "Time-dependent dead map: the requested orbit " << orbit << " seems to be out of the range stored in the map.";
}

std::vector<uint16_t> closestVec;
long dT = getMapAtOrbit(orbit, closestVec);

if (orbitGapAllowed >= 0 && std::abs(dT) > orbitGapAllowed) {
LOG(warning) << "Requested orbit " << orbit << ", found " << orbit - dT << ". Orbit gap is too high, skipping time-dependent map.";
closestVec.clear();
}

// add static part if requested. something may be masked twice
if (includeStaticMap && mMAP_VERSION != "3") {
closestVec.insert(closestVec.end(), mStaticDeadMap.begin(), mStaticDeadMap.end());
Expand Down Expand Up @@ -125,18 +127,19 @@ class TimeDeadMap
void getStaticMap(std::vector<uint16_t>& mmap) { mmap = mStaticDeadMap; };

long getMapAtOrbit(unsigned long orbit, std::vector<uint16_t>& mmap)
{ // fills mmap and returns orbit - lower_bound
{ // fills mmap and returns requested_orbit - found_orbit. Found orbit is the highest key lower or equal to the requested one
if (mEvolvingDeadMap.empty()) {
LOG(warning) << "Requested orbit " << orbit << "from an empty time-dependent map. Doing nothing";
return (long)orbit;
}
auto closest = mEvolvingDeadMap.lower_bound(orbit);
if (closest != mEvolvingDeadMap.end()) {
if (closest != mEvolvingDeadMap.begin()) {
--closest;
mmap = closest->second;
return (long)orbit - closest->first;
} else {
mmap = mEvolvingDeadMap.rbegin()->second;
return (long)(orbit)-mEvolvingDeadMap.rbegin()->first;
mmap = mEvolvingDeadMap.begin()->second;
return (long)(orbit)-mEvolvingDeadMap.begin()->first;
}
}

Expand Down
14 changes: 7 additions & 7 deletions Detectors/ITSMFT/common/workflow/src/DeadMapBuilderSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ void ITSMFTDeadMapBuilder::PrepareOutputCcdb(EndOfStreamContext* ec, std::string

if (ec != nullptr) {

LOG(info) << "Sending object " << info.getPath() << "/" << info.getFileName()
<< "to ccdb-populator, of size " << image->size() << " bytes, valid for "
<< info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
LOG(important) << "Sending object " << info.getPath() << "/" << info.getFileName()
<< "to ccdb-populator, of size " << image->size() << " bytes, valid for "
<< info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();

if (mRunMFT) {
ec->outputs().snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "TimeDeadMap", 1}, *image.get());
Expand All @@ -284,9 +284,9 @@ void ITSMFTDeadMapBuilder::PrepareOutputCcdb(EndOfStreamContext* ec, std::string

else if (!ccdburl.empty()) { // send from this workflow

LOG(info) << mSelfName << "sending object " << ccdburl << "/browse/" << info.getFileName()
<< " of size " << image->size() << " bytes, valid for "
<< info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
LOG(important) << mSelfName << "sending object " << ccdburl << "/browse/" << info.getPath() << "/" << info.getFileName()
<< " of size " << image->size() << " bytes, valid for "
<< info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();

o2::ccdb::CcdbApi mApi;
mApi.init(ccdburl);
Expand Down Expand Up @@ -335,7 +335,7 @@ void ITSMFTDeadMapBuilder::stop()
LOG(warning) << "endOfStream not processed. Sending output to ccdb from the " << detname << "deadmap builder workflow.";
PrepareOutputCcdb(nullptr, mCCDBUrl);
} else {
LOG(warning) << "endOfStream not processed. Nothing forwarded as output.";
LOG(alarm) << "endOfStream not processed. Nothing forwarded as output.";
}
isEnded = true;
}
Expand Down