Skip to content

ITS/general: added extendedTaskParameters for ITS #2501

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
Barthelemy merged 4 commits into from
Feb 11, 2025
Merged

ITS/general: added extendedTaskParameters for ITS #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e77d42
Added user defined checks for Cluster and FEE tasks
IsakovAD Jan 27, 2025
831b4d6
Clang format
IsakovAD Jan 27, 2025
26153e8
Clang2
IsakovAD Jan 27, 2025
a8896ba
Clang3
IsakovAD Jan 27, 2025
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
54 changes: 53 additions & 1 deletion Modules/ITS/itsCluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"Activity": {
"number": "42",
"type": "NONE"
"type": "PHYSICS",
"beamType" : "PbPb", "": "Beam type: `PROTON-PROTON`, `Pb-Pb`, `Pb-PROTON` "
},
"monitoring": {
"url": "infologger:///debug?qc"
Expand Down Expand Up @@ -68,6 +69,57 @@
"textMessage": ""

},
"extendedCheckParameters": {
"default": {
"default": {
"maxcluoccL0": "5",
"maxcluoccL1": "3",
"maxcluoccL2": "3",
"maxcluoccL3": "0.3",
"maxcluoccL4": "0.3",
"maxcluoccL5": "0.2",
"maxcluoccL6": "0.2"
}
},
"PHYSICS": {
"default": {
"maxcluoccL0": "5",
"maxcluoccL1": "3",
"maxcluoccL2": "3",
"maxcluoccL3": "0.3",
"maxcluoccL4": "0.3",
"maxcluoccL5": "0.2",
"maxcluoccL6": "0.2"
},
"PROTON-PROTON": {
"maxcluoccL0": "5",
"maxcluoccL1": "3",
"maxcluoccL2": "3",
"maxcluoccL3": "0.3",
"maxcluoccL4": "0.3",
"maxcluoccL5": "0.2",
"maxcluoccL6": "0.2"
},
"Pb-Pb": {
"maxcluoccL0": "65",
"maxcluoccL1": "35",
"maxcluoccL2": "25",
"maxcluoccL3": "1",
"maxcluoccL4": "1",
"maxcluoccL5": "1",
"maxcluoccL6": "1"
}
},
"COSMICS": {
"maxcluoccL0": "5",
"maxcluoccL1": "3",
"maxcluoccL2": "3",
"maxcluoccL3": "0.3",
"maxcluoccL4": "0.3",
"maxcluoccL5": "0.2",
"maxcluoccL6": "0.2"
}
},
"dataSource": [
{
"type": "Task",
Expand Down
26 changes: 24 additions & 2 deletions Modules/ITS/itsFee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
"name": "not_applicable"
},
"Activity": {
"number": "42",
"type": "NONE"
"number": "42",
"type": "PHYSICS",
"beamType" : "PbPb", "": "Beam type: `PROTON-PROTON`, `Pb-Pb`, `Pb-PROTON` "
},
"monitoring": {
"url": "infologger:///debug?qc"
Expand Down Expand Up @@ -66,6 +67,27 @@
"plotWithTextMessage": "",
"textMessage": ""
},
"extendedCheckParameters": {
"default": {
"default": {
"expectedROFperOrbit": "18"
}
},
"PHYSICS": {
"default": {
"expectedROFperOrbit": "18"
},
"PROTON-PROTON": {
"expectedROFperOrbit": "18"
},
"Pb-Pb": {
"expectedROFperOrbit": "6"
}
},
"COSMICS": {
"expectedROFperOrbit": "18"
}
},
"dataSource": [
{
"type": "Task",
Expand Down
5 changes: 4 additions & 1 deletion Modules/ITS/src/ITSClusterCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje

if (iter->second->getName().find("General_Occupancy") != std::string::npos) {
auto* hp = dynamic_cast<TH2D*>(iter->second->getObject());
auto activity = iter->second->getActivity();
if (hp == nullptr) {
ILOG(Error, Support) << "could not cast general occupancy to TH2D*" << ENDM;
continue;
Expand All @@ -90,7 +91,9 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
continue;
}

maxcluocc[ilayer] = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, Form("maxcluoccL%d", ilayer), maxcluocc[ilayer]);
// maxcluocc[ilayer] = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, Form("maxcluoccL%d", ilayer), maxcluocc[ilayer]);

maxcluocc[ilayer] = stof(mCustomParameters.at(Form("maxcluoccL%d", ilayer), activity));
if (hp->GetBinContent(ix, iy) > maxcluocc[ilayer]) {
result.set(Quality::Medium);
result.updateMetadata(Form("Layer%d%s", ilayer, tb.c_str()), "medium");
Expand Down
4 changes: 3 additions & 1 deletion Modules/ITS/src/ITSFeeCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,16 @@ Quality ITSFeeCheck::check(std::map<std::string, std::shared_ptr<MonitorObject>>
}

if (((string)mo->getName()).find("TrailerCount") != std::string::npos) {

auto activity = mo->getActivity();
auto* h = dynamic_cast<TH2I*>(mo->getObject());
if (h == nullptr) {
ILOG(Error, Support) << "could not cast TrailerCount to TH2I*" << ENDM;
continue;
}
result.set(Quality::Good);
result.addMetadata("CheckROFRate", "good");
expectedROFperOrbit = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "expectedROFperOrbit", expectedROFperOrbit);
expectedROFperOrbit = stoi(mCustomParameters.at("expectedROFperOrbit", activity));
if (h->Integral(1, 432, 1, h->GetYaxis()->FindBin(expectedROFperOrbit) - 1) > 0 || h->Integral(1, 432, h->GetYaxis()->FindBin(expectedROFperOrbit) + 1, h->GetYaxis()->GetLast()) > 0) {
result.set(Quality::Bad);
result.updateMetadata("expectedROFperOrbit", "bad");
Expand Down