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

Fix misleading variable names #8604

Merged
merged 1 commit into from
Apr 18, 2022
Merged

Fix misleading variable names #8604

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
12 changes: 6 additions & 6 deletions Detectors/TPC/base/include/TPCBase/Mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,24 +233,24 @@ class Mapper
return pos;
}

const PadPos padPosRegion(const int cruNumber, const int fecInRegion, const int sampaOnFEC,
const PadPos padPosRegion(const int cruNumber, const int fecInPartition, const int sampaOnFEC,
const int channelOnSAMPA) const
{
const CRU cru(cruNumber);
const PadRegionInfo& regionInfo = mMapPadRegionInfo[cru.region()];
const PartitionInfo& partInfo = mMapPartitionInfo[cru.partition()];
const int fecInSector = partInfo.getSectorFECOffset() + fecInRegion;
const int fecInSector = partInfo.getSectorFECOffset() + fecInPartition;
const GlobalPadNumber padNumber = globalPadNumber(fecInSector, sampaOnFEC, channelOnSAMPA);
PadPos pos = padPos(padNumber);
pos.setRow(pos.getRow() - regionInfo.getGlobalRowOffset());
return pos;
}

const PadROCPos padROCPos(const CRU cru, const int fecInRegion, const int sampaOnFEC,
const PadROCPos padROCPos(const CRU cru, const int fecInPartition, const int sampaOnFEC,
const int channelOnSAMPA) const
{
const PartitionInfo& partInfo = mMapPartitionInfo[cru.partition()];
const int fecInSector = partInfo.getSectorFECOffset() + fecInRegion;
const int fecInSector = partInfo.getSectorFECOffset() + fecInPartition;
const GlobalPadNumber padNumber = globalPadNumber(fecInSector, sampaOnFEC, channelOnSAMPA);
const ROC roc = cru.roc();
PadROCPos pos(roc, padPos(padNumber));
Expand All @@ -260,11 +260,11 @@ class Mapper
return pos;
}

const PadSecPos padSecPos(const CRU cru, const int fecInRegion, const int sampaOnFEC,
const PadSecPos padSecPos(const CRU cru, const int fecInPartition, const int sampaOnFEC,
const int channelOnSAMPA) const
{
const PartitionInfo& partInfo = mMapPartitionInfo[cru.partition()];
const int fecInSector = partInfo.getSectorFECOffset() + fecInRegion;
const int fecInSector = partInfo.getSectorFECOffset() + fecInPartition;
const GlobalPadNumber padNumber = globalPadNumber(fecInSector, sampaOnFEC, channelOnSAMPA);
PadSecPos pos(cru.sector(), padPos(padNumber));
return pos;
Expand Down