Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
czangela committed Sep 13, 2021
1 parent 9d489ad commit 8dc085a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef DATAFORMATS_PIXELCHANMNELIDENTIFIER_H
#define DATAFORMATS_PIXELCHANMNELIDENTIFIER_H
#ifndef DataFormats_SiPixelDetId_interface_PixelChannelIdentifier_h
#define DataFormats_SiPixelDetId_interface_PixelChannelIdentifier_h

#include <utility>
#include <cstdint>

namespace pixelchanelidentifierimpl {
namespace pixelchannelidentifierimpl {
/**
* Pack the pixel information to use less memory
*/
Expand Down Expand Up @@ -50,7 +50,7 @@ namespace pixelchanelidentifierimpl {
const int max_column;
const int max_adc;
};
} // namespace pixelchanelidentifierimpl
} // namespace pixelchannelidentifierimpl

class PixelChannelIdentifier {
public:
Expand All @@ -65,12 +65,12 @@ class PixelChannelIdentifier {

static int pixelToChannel(int row, int col) { return (row << thePacking.column_width) | col; }

using Packing = pixelchanelidentifierimpl::Packing;
using Packing = pixelchannelidentifierimpl::Packing;

public:
constexpr static Packing packing() { return Packing(8, 9, 4, 11); }

constexpr static Packing thePacking = {11, 10, 1, 10};
};

#endif
#endif // DataFormats_SiPixelDetId_interface_PixelChannelIdentifier_h
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ namespace pixelgpudetails {
uint32_t col;
};

inline constexpr pixelchanelidentifierimpl::Packing packing() { return PixelChannelIdentifier::thePacking; }
inline constexpr pixelchannelidentifierimpl::Packing packing() { return PixelChannelIdentifier::thePacking; }

inline constexpr uint32_t pack(uint32_t row, uint32_t col, uint32_t adc, uint32_t flag = 0) {
constexpr pixelchanelidentifierimpl::Packing thePacking = packing();
constexpr pixelchannelidentifierimpl::Packing thePacking = packing();
adc = std::min(adc, uint32_t(thePacking.max_adc));

return (row << thePacking.row_shift) | (col << thePacking.column_shift) | (adc << thePacking.adc_shift);
}

constexpr uint32_t pixelToChannel(int row, int col) {
constexpr pixelchanelidentifierimpl::Packing thePacking = packing();
constexpr pixelchannelidentifierimpl::Packing thePacking = packing();
return (row << thePacking.column_width) | col;
}

Expand Down

0 comments on commit 8dc085a

Please sign in to comment.