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

Several updates to SiPixel LA PCL workflow #36538

Merged
merged 7 commits into from Dec 21, 2021
Merged

Several updates to SiPixel LA PCL workflow #36538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a4cce9
SiPixelLorentzAnglePCLWorker: add track monitoring and re-organize fo…
mmusich Dec 15, 2021
e2d2484
fix bug in SiPixelLorentzAnglePCLHarvester
mmusich Dec 16, 2021
4146235
re-organize folders by subdetector
mmusich Dec 17, 2021
4f5f7ac
do not add duplicated modules to the new BPix / FPix if already enter…
mmusich Dec 17, 2021
f2ce852
code speed-up, improve new modules finding and move SiPixelTemplate::…
mmusich Dec 17, 2021
d82ea71
furthe simplify logic
mmusich Dec 17, 2021
c54e06e
protect loading templates with ESWatcher, simplify loops, rename vari…
mmusich Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleCalibrationStruct.h
View file
Open in desktop
Expand Up @@ -30,6 +30,10 @@ struct SiPixelLorentzAngleCalibrationHistograms {
MonitorMap h_mean_;

dqm::reco::MonitorElement* h_tracks_;
dqm::reco::MonitorElement* h_trackEta_;
dqm::reco::MonitorElement* h_trackPhi_;
dqm::reco::MonitorElement* h_trackPt_;
dqm::reco::MonitorElement* h_trackChi2_;
};

#endif
97 changes: 78 additions & 19 deletions CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc
View file
Open in desktop
Expand Up @@ -83,6 +83,10 @@ void SiPixelLorentzAnglePCLHarvester::beginRun(const edm::Run& iRun, const edm::
hists.nModules_[i] = map.getPXBModules(i + 1);
}

// list of modules already filled, then return (we already entered here)
if (!hists.BPixnewDetIds_.empty() || !hists.FPixnewDetIds_.empty())
return;

if (!newmodulelist_.empty()) {
for (auto const& modulename : newmodulelist_) {
if (modulename.find("BPix_") != std::string::npos) {
Expand All @@ -103,6 +107,17 @@ void SiPixelLorentzAnglePCLHarvester::beginRun(const edm::Run& iRun, const edm::
}
}

uint count = 0;
for (const auto& id : hists.BPixnewDetIds_) {
LogDebug("SiPixelLorentzAnglePCLHarvester") << id << std::endl;
count++;
}
LogDebug("SiPixelLorentzAnglePCLHarvester") << "Stored a total of " << count << " new detIds." << std::endl;

// list of modules already filled, return (we already entered here)
if (!hists.detIdsList.empty())
return;

std::vector<uint32_t> treatedIndices;

for (auto det : geom->detsPXB()) {
Expand All @@ -114,13 +129,26 @@ void SiPixelLorentzAnglePCLHarvester::beginRun(const edm::Run& iRun, const edm::

uint32_t rawId = pixelDet->geographicalId().rawId();

// if the detId is already accounted for in the special class, do not attach it
if (std::find(hists.BPixnewDetIds_.begin(), hists.BPixnewDetIds_.end(), rawId) != hists.BPixnewDetIds_.end())
continue;

if (std::find(treatedIndices.begin(), treatedIndices.end(), i_index) != treatedIndices.end()) {
hists.detIdsList.at(i_index).push_back(rawId);
} else {
hists.detIdsList.insert(std::pair<uint32_t, std::vector<uint32_t>>(i_index, {rawId}));
treatedIndices.push_back(i_index);
}
}

count = 0;
for (const auto& i : treatedIndices) {
for (const auto& id : hists.detIdsList.at(i)) {
LogDebug("SiPixelLorentzAnglePCLHarvester") << id << std::endl;
count++;
};
}
LogDebug("SiPixelLorentzAnglePCLHarvester") << "Stored a total of " << count << " detIds." << std::endl;
}

//------------------------------------------------------------------------------
Expand All @@ -129,12 +157,18 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
iGetter.cd();
iGetter.setCurrentFolder(dqmDir_);

// B-field value
GlobalPoint center(0.0, 0.0, 0.0);
float theMagField = magField->inTesla(center).mag();

// fetch the 2D histograms
for (int i_layer = 1; i_layer <= hists.nlay; i_layer++) {
const auto& prefix_ = fmt::sprintf("%s/BPix/BPixLayer%i", dqmDir_, i_layer);
for (int i_module = 1; i_module <= hists.nModules_[i_layer - 1]; i_module++) {
int i_index = i_module + (i_layer - 1) * hists.nModules_[i_layer - 1];

hists.h_drift_depth_[i_index] =
iGetter.get(fmt::format("{}/h_drift_depth_layer{}_module{}", dqmDir_, i_layer, i_module));
iGetter.get(fmt::format("{}/h_drift_depth_layer{}_module{}", prefix_, i_layer, i_module));

if (hists.h_drift_depth_[i_index] == nullptr) {
edm::LogError("SiPixelLorentzAnglePCLHarvester::dqmEndJob")
Expand All @@ -143,13 +177,13 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
}

hists.h_drift_depth_adc_[i_index] =
iGetter.get(fmt::format("{}/h_drift_depth_adc_layer{}_module{}", dqmDir_, i_layer, i_module));
iGetter.get(fmt::format("{}/h_drift_depth_adc_layer{}_module{}", prefix_, i_layer, i_module));

hists.h_drift_depth_adc2_[i_index] =
iGetter.get(fmt::format("{}/h_drift_depth_adc2_layer{}_module{}", dqmDir_, i_layer, i_module));
iGetter.get(fmt::format("{}/h_drift_depth_adc2_layer{}_module{}", prefix_, i_layer, i_module));

hists.h_drift_depth_noadc_[i_index] =
iGetter.get(fmt::format("{}/h_drift_depth_noadc_layer{}_module{}", dqmDir_, i_layer, i_module));
iGetter.get(fmt::format("{}/h_drift_depth_noadc_layer{}_module{}", prefix_, i_layer, i_module));

hists.h_mean_[i_index] = iGetter.get(fmt::format("{}/h_mean_layer{}_module{}", dqmDir_, i_layer, i_module));

Expand All @@ -158,26 +192,27 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
}
}

// fetch the new modules 2D histograms
for (int i = 0; i < (int)hists.BPixnewDetIds_.size(); i++) {
int new_index = i + 1 + hists.nModules_[hists.nlay - 1] + (hists.nlay - 1) * hists.nModules_[hists.nlay - 1];

hists.h_drift_depth_adc_[new_index] =
iGetter.get(fmt::format("{}/h_BPixnew_drift_depth_{}", dqmDir_, hists.BPixnewmodulename_[i]));
hists.h_drift_depth_adc_[new_index] = iGetter.get(
fmt::format("{}/h_BPixnew_drift_depth_{}", dqmDir_ + "/BPix/NewModules", hists.BPixnewmodulename_[i]));

if (hists.h_drift_depth_adc_[new_index] == nullptr) {
edm::LogError("SiPixelLorentzAnglePCLHarvester::dqmEndJob")
<< "Failed to retrieve electron drift over depth for new module " << hists.BPixnewmodulename_[i] << ".";
continue;
}

hists.h_drift_depth_adc2_[new_index] =
iGetter.get(fmt::format("{}/h_BPixnew_drift_depth_adc_{}", dqmDir_, hists.BPixnewmodulename_[i]));
hists.h_drift_depth_adc2_[new_index] = iGetter.get(
fmt::format("{}/h_BPixnew_drift_depth_adc_{}", dqmDir_ + "/BPix/NewModules", hists.BPixnewmodulename_[i]));

hists.h_drift_depth_noadc_[new_index] =
iGetter.get(fmt::format("{}/h_BPixnew_drift_depth_adc2_{}", dqmDir_, hists.BPixnewmodulename_[i]));
hists.h_drift_depth_noadc_[new_index] = iGetter.get(
fmt::format("{}/h_BPixnew_drift_depth_adc2_{}", dqmDir_ + "/BPix/NewModules", hists.BPixnewmodulename_[i]));

hists.h_drift_depth_[new_index] =
iGetter.get(fmt::format("{}/h_BPixnew_drift_depth_noadc_{}", dqmDir_, hists.BPixnewmodulename_[i]));
hists.h_drift_depth_[new_index] = iGetter.get(
fmt::format("{}/h_BPixnew_drift_depth_noadc_{}", dqmDir_ + "/BPix/NewModules", hists.BPixnewmodulename_[i]));

hists.h_mean_[new_index] = iGetter.get(fmt::format("{}/h_BPixnew_mean_{}", dqmDir_, hists.BPixnewmodulename_[i]));

Expand Down Expand Up @@ -234,6 +269,7 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
double half_width = width_ * 10000 / 2; // pixel half thickness in units of micro meter

for (int j = 0; j < (int)hists.BPixnewDetIds_.size(); j++) {
uint32_t rawId = hists.BPixnewDetIds_[j];
int new_index = j + 1 + hists.nModules_[hists.nlay - 1] + (hists.nlay - 1) * hists.nModules_[hists.nlay - 1];
if (hists.h_drift_depth_adc_[new_index] == nullptr)
continue;
Expand Down Expand Up @@ -290,7 +326,25 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
<< "\t" << e2 << "\t" << p3 << "\t" << e3 << "\t" << p4 << "\t" << e4 << "\t" << p5
<< "\t" << e5 << "\t" << chi2 << "\t" << prob << "\t" << hists.BPixnewDetIds_[j]
<< "\t" << tan_LA << "\t" << error_LA << std::endl;
}

float bPixLorentzAnglePerTesla_;
// if the fit quality is OK
if (prob > fitProbCut_) {
bPixLorentzAnglePerTesla_ = tan_LA / theMagField;
if (!LorentzAngle->putLorentzAngle(rawId, bPixLorentzAnglePerTesla_)) {
edm::LogError("SiPixelLorentzAnglePCLHarvester")
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] filling new modules: detid already exists" << std::endl;
}
} else {
// just copy the values from the existing payload
bPixLorentzAnglePerTesla_ = currentLorentzAngle->getLorentzAngle(rawId);
if (!LorentzAngle->putLorentzAngle(rawId, bPixLorentzAnglePerTesla_)) {
edm::LogError("SiPixelLorentzAnglePCLHarvester")
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] filling new modules (from current): detid already exists"
<< std::endl;
}
}
} // loop on BPix new modules

double p1_simul[hists.nlay][hists.nModules_[hists.nlay - 1]];
for (int i_layer = 1; i_layer <= hists.nlay; i_layer++) {
Expand Down Expand Up @@ -374,8 +428,12 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS

const auto& detIdsToFill = hists.detIdsList.at(i_index);

GlobalPoint center(0.0, 0.0, 0.0);
float theMagField = magField->inTesla(center).mag();
LogDebug("SiPixelLorentzAnglePCLHarvester")
<< "index: " << i_index << " i_module: " << i_module << " i_layer: " << i_layer << std::endl;
for (const auto& id : detIdsToFill) {
LogDebug("SiPixelLorentzAnglePCLHarvester") << id << ",";
}
LogDebug("SiPixelLorentzAnglePCLHarvester") << std::endl;

float bPixLorentzAnglePerTesla_;
// if the fit quality is OK
Expand All @@ -384,7 +442,7 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
bPixLorentzAnglePerTesla_ = tan_LA / theMagField;
if (!LorentzAngle->putLorentzAngle(id, bPixLorentzAnglePerTesla_)) {
edm::LogError("SiPixelLorentzAnglePCLHarvester")
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] detid already exists" << std::endl;
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] filling BPix: detid already exists" << std::endl;
}
}
} else {
Expand All @@ -393,7 +451,8 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
bPixLorentzAnglePerTesla_ = currentLorentzAngle->getLorentzAngle(id);
if (!LorentzAngle->putLorentzAngle(id, bPixLorentzAnglePerTesla_)) {
edm::LogError("SiPixelLorentzAnglePCLHarvester")
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] detid already exists" << std::endl;
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] filling BPix (from current): detid already exists"
<< std::endl;
}
}
}
Expand Down Expand Up @@ -424,7 +483,7 @@ void SiPixelLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS
float fPixLorentzAnglePerTesla_ = currentLorentzAngle->getLorentzAngle(id);
if (!LorentzAngle->putLorentzAngle(id, fPixLorentzAnglePerTesla_)) {
edm::LogError("SiPixelLorentzAnglePCLHarvester")
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] detid already exists" << std::endl;
<< "[SiPixelLorentzAnglePCLHarvester::dqmEndRun] filling rest of payload: detid already exists" << std::endl;
}
}

Expand Down Expand Up @@ -496,7 +555,7 @@ void SiPixelLorentzAnglePCLHarvester::fillDescriptions(edm::ConfigurationDescrip
desc.setComment("Harvester module of the SiPixel Lorentz Angle PCL monitoring workflow");
desc.add<std::vector<std::string>>("newmodulelist", {})->setComment("the list of DetIds for new sensors");
desc.add<std::string>("dqmDir", "AlCaReco/SiPixelLorentzAngle")->setComment("the directory of PCL Worker output");
desc.add<double>("fitProbCut", 0.5)->setComment("cut on fit chi2 probabiblity to accept measurement");
desc.add<double>("fitProbCut", 0.1)->setComment("cut on fit chi2 probabiblity to accept measurement");
desc.add<std::string>("record", "SiPixelLorentzAngleRcd")->setComment("target DB record");
descriptions.addWithDefaultLabel(desc);
}
Expand Down