Skip to content

Update TICLTiles.h #2

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

Open
felicepantaleo wants to merge 1 commit into
base: ticlv5_14_0_0_pre0_refactoring
Choose a base branch
from
Open

Update TICLTiles.h #2

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
16 changes: 7 additions & 9 deletions DataFormats/TICL/interface/TICLTiles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Tiles {
* @return computed bin
*/
int getDim2Bin(float dim2) const {
if constexpr (T::wrapped) {
if constexpr (not T::wrapped) {
constexpr float dimRange = T::maxDim2 - T::minDim2;
static_assert(dimRange >= 0.);
constexpr float r = nRows / dimRange;
Expand Down Expand Up @@ -97,10 +97,10 @@ class Tiles {
return std::array<int, 4>({{0, 0, 0, 0}});
}
}
int dim1BinMin = getDim1Bin(dim1Min);
int dim1BinMax = getDim1Bin(dim1Max);
int dim2BinMin = getDim2Bin(dim2Min);
int dim2BinMax = getDim2Bin(dim2Max);
int dim1BinMin = getDim1Bin(dim1Min); assert(dim1BinMin >= 0);
int dim1BinMax = getDim1Bin(dim1Max); assert(dim1BinMax >= 0);
int dim2BinMin = getDim2Bin(dim2Min); assert(dim2BinMin >= 0);
int dim2BinMax = getDim2Bin(dim2Max); assert(dim2BinMax >= 0);
if constexpr (T::wrapped) {
if (dim2BinMax < dim2BinMin) {
dim2BinMax += nRows;
Expand All @@ -116,18 +116,16 @@ class Tiles {
}

const std::vector<objType>& operator[](int globalBinId) const { return tiles_[globalBinId]; }

private:
static constexpr int nColumns = reco::ceil((T::maxDim1 - T::minDim1) / T::tileSize);
static constexpr int nRows = reco::ceil((T::maxDim2 - T::minDim2) / T::tileSize);
static constexpr int nTiles = nColumns * nRows;
private:

std::array<std::vector<objType>, nTiles> tiles_;


};

} // namespace ticl



#endif