Skip to content

Revert "MFT: digit task edit to display dead chips (#1891)" #1896

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
knopers8 merged 1 commit into from
Jul 28, 2023
Merged

Revert "MFT: digit task edit to display dead chips (#1891)" #1896

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
21 changes: 0 additions & 21 deletions Modules/MFT/include/MFT/QcMFTDigitCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,6 @@ class QcMFTDigitCheck : public o2::quality_control::checker::CheckInterface
int mZoneThresholdMedium;
int mZoneThresholdBad;

// masked chips part
bool mFirstCall;
std::vector<int> mMaskedChips;
std::vector<string> mChipMapName;

void readMaskedChips();
void createMaskedChipsNames();

// to form the name of the masked chips histograms
int mHalf[936] = { 0 };
int mDisk[936] = { 0 };
int mFace[936] = { 0 };
int mZone[936] = { 0 };
int mSensor[936] = { 0 };
int mTransID[936] = { 0 };
int mLayer[936] = { 0 };
int mLadder[936] = { 0 };
float mX[936] = { 0 };
float mY[936] = { 0 };
void getChipMapData();

ClassDefOverride(QcMFTDigitCheck, 2);
};

Expand Down
1 change: 1 addition & 0 deletions Modules/MFT/include/MFT/QcMFTDigitTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class QcMFTDigitTask final : public TaskInterface
std::unique_ptr<TH2F> mDigitDoubleColumnSensorIndices = nullptr;

std::unique_ptr<TH1F> mDigitsROFSize = nullptr;
std::unique_ptr<TH1F> mNOfDigitsTime = nullptr;
std::unique_ptr<TH1F> mDigitsBC = nullptr;

std::vector<std::unique_ptr<TH2F>> mDigitChipOccupancyMap;
Expand Down
22 changes: 1 addition & 21 deletions Modules/MFT/mft-digits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,7 @@
"dataSource" : [ {
"type" : "Task",
"name" : "Digits",
"MOs" : ["ChipOccupancyMaps/Half_0/Disk_0/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_0/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_1/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_1/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_2/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_2/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_3/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_3/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_4/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_0/Disk_4/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_0/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_0/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_1/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_1/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_2/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_2/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_3/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_3/Face_0/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_4/Face_1/mDigitChipOccupancyMap",
"ChipOccupancyMaps/Half_1/Disk_4/Face_0/mDigitChipOccupancyMap",
"mDigitChipOccupancy","mDigitOccupancySummary","mDigitChipStdDev"]
"MOs" : ["mDigitChipOccupancy","mDigitOccupancySummary","mDigitChipStdDev"]
} ]
}
}
Expand Down
77 changes: 1 addition & 76 deletions Modules/MFT/src/QcMFTDigitCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
/// \author Katarina Krizkova Gajdosova
/// \author Diana Maria Krupova

// C++
#include <string>
// Fair
#include <fairlogger/Logger.h>
// ROOT
Expand All @@ -26,17 +24,11 @@
#include <TLatex.h>
#include <TList.h>
#include <TPaveText.h>
// O2
#include <DataFormatsITSMFT/NoiseMap.h>
#include "CCDB/CcdbApi.h"
#include <ITSMFTReconstruction/ChipMappingMFT.h>

// Quality Control
#include "MFT/QcMFTDigitCheck.h"
#include "QualityControl/MonitorObject.h"
#include "QualityControl/Quality.h"
#include "QualityControl/QcInfoLogger.h"
#include "MFT/QcMFTUtilTables.h"

using namespace std;

Expand All @@ -45,6 +37,7 @@ namespace o2::quality_control_modules::mft

void QcMFTDigitCheck::configure()
{

// this is how to get access to custom parameters defined in the config file at qc.tasks.<task_name>.taskParameters
if (auto param = mCustomParameters.find("ZoneThresholdMedium"); param != mCustomParameters.end()) {
ILOG(Info, Support) << "Custom parameter - ZoneThresholdMedium: " << param->second << ENDM;
Expand All @@ -54,9 +47,6 @@ void QcMFTDigitCheck::configure()
ILOG(Info, Support) << "Custom parameter - ZoneThresholdBad: " << param->second << ENDM;
mZoneThresholdBad = stoi(param->second);
}

// no call to beautifier yet
mFirstCall = true;
}

Quality QcMFTDigitCheck::check(std::map<std::string, std::shared_ptr<MonitorObject>>* moMap)
Expand Down Expand Up @@ -115,73 +105,8 @@ Quality QcMFTDigitCheck::check(std::map<std::string, std::shared_ptr<MonitorObje

std::string QcMFTDigitCheck::getAcceptedType() { return "TH1"; }

void QcMFTDigitCheck::readMaskedChips()
{
o2::ccdb::CcdbApi api;
api.init("alice-ccdb.cern.ch");
long timestamp = -1;
map<string, string> headers;
map<std::string, std::string> filter;
auto calib = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>("MFT/Calib/DeadMap/", filter, timestamp, &headers);
for (int i = 0; i < calib->size(); i++) {
if (calib->isFullChipMasked(i)) {
mMaskedChips.push_back(i);
}
}
}

void QcMFTDigitCheck::getChipMapData()
{
const o2::itsmft::ChipMappingMFT mapMFT;
auto chipMapData = mapMFT.getChipMappingData();
QcMFTUtilTables MFTTable;

for (int i = 0; i < 936; i++) {
mHalf[i] = chipMapData[i].half;
mDisk[i] = chipMapData[i].disk;
mLayer[i] = chipMapData[i].layer;
mFace[i] = mLayer[i] % 2;
mZone[i] = chipMapData[i].zone;
mSensor[i] = chipMapData[i].localChipSWID;
mTransID[i] = chipMapData[i].cable;
mLadder[i] = MFTTable.mLadder[i];
mX[i] = MFTTable.mX[i];
mY[i] = MFTTable.mY[i];
}
}

void QcMFTDigitCheck::createMaskedChipsNames()
{
for (int i = 0; i < mMaskedChips.size(); i++) {
mChipMapName.push_back(Form("ChipOccupancyMaps/Half_%d/Disk_%d/Face_%d/mDigitChipOccupancyMap",
mHalf[mMaskedChips[i]], mDisk[mMaskedChips[i]], mFace[mMaskedChips[i]]));
}
}

void QcMFTDigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult)
{
// set up masking of dead chips once
if (mFirstCall) {
mFirstCall = false;
readMaskedChips();
getChipMapData();
createMaskedChipsNames();
}
// print skull in maps to display dead chips
int nMaskedChips = mMaskedChips.size();
for (int i = 0; i < nMaskedChips; i++) {
if (mo->getName().find(mChipMapName[i]) != std::string::npos) {
auto* hMap = dynamic_cast<TH2F*>(mo->getObject());
int binCx = hMap->GetXaxis()->FindBin(mX[mMaskedChips[i]]);
int binCy = hMap->GetYaxis()->FindBin(mY[mMaskedChips[i]]);
// the -0.5 is a shift to centre better the skulls
TLatex* tl = new TLatex(hMap->GetXaxis()->GetBinCenter(binCx) - 0.5, hMap->GetYaxis()->GetBinCenter(binCy), "N");
tl->SetTextFont(142);
tl->SetTextSize(0.08);
hMap->GetListOfFunctions()->Add(tl);
tl->Draw();
}
}

if (mo->getName().find("mDigitOccupancySummary") != std::string::npos) {
auto* hOccupancySummary = dynamic_cast<TH2F*>(mo->getObject());
Expand Down
6 changes: 6 additions & 0 deletions Modules/MFT/src/QcMFTDigitTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ void QcMFTDigitTask::initialize(o2::framework::InitContext& /*ctx*/)
getObjectsManager()->startPublishing(mDigitsROFSize.get());
getObjectsManager()->setDisplayHint(mDigitsROFSize.get(), "logx logy");

mNOfDigitsTime = std::make_unique<TH1F>("mNOfDigitsTime", "Number of Digits per time bin; time (s); # entries", NofTimeBins, 0, maxDuration);
mNOfDigitsTime->SetMinimum(0.1);
getObjectsManager()->startPublishing(mNOfDigitsTime.get());

mDigitsBC = std::make_unique<TH1F>("mDigitsBC", "Digits per BC; BCid; # entries", o2::constants::lhc::LHCMaxBunches, 0, o2::constants::lhc::LHCMaxBunches);
mDigitsBC->SetMinimum(0.1);
getObjectsManager()->startPublishing(mDigitsBC.get());
Expand Down Expand Up @@ -260,6 +264,7 @@ void QcMFTDigitTask::monitorData(o2::framework::ProcessingContext& ctx)
for (const auto& rof : rofs) {
mDigitsROFSize->Fill(rof.getNEntries());
float seconds = orbitToSeconds(rof.getBCData().orbit, mRefOrbit) + rof.getBCData().bc * o2::constants::lhc::LHCBunchSpacingNS * 1e-9;
mNOfDigitsTime->Fill(seconds, rof.getNEntries());
mDigitsBC->Fill(rof.getBCData().bc, rof.getNEntries());
}

Expand Down Expand Up @@ -319,6 +324,7 @@ void QcMFTDigitTask::reset()
mDigitChipStdDev->Reset();
mDigitOccupancySummary->Reset();
mDigitsROFSize->Reset();
mNOfDigitsTime->Reset();
mDigitsBC->Reset();

// maps
Expand Down