Skip to content

Fixe TPC clusters extraction for millepede, decrease verbosity of RootTreeReader #13033

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 3 commits into from
Apr 16, 2024
Merged

Fixe TPC clusters extraction for millepede, decrease verbosity of RootTreeReader #13033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d128863
decrease verbosity of RootTreeReader
shahor02 Apr 16, 2024
43ed956
Check for ITS clusters ordering
shahor02 Apr 16, 2024
4f952f4
Fix TPC clusters extraction for millepede
shahor02 Apr 16, 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
11 changes: 11 additions & 0 deletions Detectors/Align/src/AlignableDetectorITS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,19 @@ int AlignableDetectorITS::processPoints(GIndex gid, int npntCut, bool inv)
const auto& clusIdx = recoData->getITSTracksClusterRefs();
// do we want to apply some cuts?
int clEntry = track.getFirstClusterEntry();
int preevSensID = -1;
bool errReported = false;
for (int icl = track.getNumberOfClusters(); icl--;) { // clusters refs are stored from outer to inner layers, we loop in inner -> outer direction
const auto& clus = mITSClustersArray[(clusIDs[npoints] = clusIdx[clEntry + icl])];
if (clus.getSensorID() < preevSensID && !errReported) { // clusters are ordered from outer to inner layer, hence decreasing sensorID
std::string errstr{};
for (int ie = track.getNumberOfClusters(); ie--;) {
errstr += fmt::format(" {}", mITSClustersArray[clusIdx[clEntry + ie]].getSensorID());
}
LOGP(error, "wrong ITS clusters order? : chips {}", errstr);
errReported = true;
}
preevSensID = clus.getSensorID();
if (clus.getBits()) { // overlapping clusters will have bit set
if (clus.isBitSet(EdgeFlags::Biased)) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Align/src/AlignableDetectorTPC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int AlignableDetectorTPC::processPoints(GIndex gid, int npntCut, bool inv)
break;
}
}
mController->getTPCCorrMaps()->Transform(sector, row, cl->getPad(), cl->getTime(), xTmp, yTmp, zTmp, tOffset);
mController->getTPCCorrMaps()->Transform(sector, row, clTmp->getPad(), clTmp->getTime(), xTmp, yTmp, zTmp, tOffset);
if (algConf.discardSectorEdgeDepth > 0) {
if (std::abs(yTmp) + algConf.discardSectorEdgeDepth > xTmp * TAN10) {
if (i + direction != stop) {
Expand Down
2 changes: 1 addition & 1 deletion Framework/Utils/include/DPLUtils/RootTreeReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class GenericRootTreeReader
mSizeBranch->GetEntry(entry);
auto* buffer = reinterpret_cast<BinaryDataStoreType*>(data);
if (buffer->size() == datasize) {
LOG(info) << "branch " << mName << ": publishing binary chunk of " << datasize << " bytes(s)";
LOG(debug) << "branch " << mName << ": publishing binary chunk of " << datasize << " bytes(s)";
snapshot(mKey, std::move(*buffer));
} else {
LOG(error) << "branch " << mName << ": inconsitent size of binary chunk "
Expand Down