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

Revert "Do not truncate QIE11 linearization LUTs at 10 bits" #22849

Merged
merged 1 commit into from
Apr 15, 2018
+4 −8
Merged

Revert "Do not truncate QIE11 linearization LUTs at 10 bits" #22849

Show file tree
Hide file tree
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
8 changes: 3 additions & 5 deletions CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {

static const int QIE8_LUT_BITMASK = 0x3FF;
static const int QIE10_LUT_BITMASK = 0x7FF;
static const int QIE11_LUT_BITMASK = 0x7FF;
// only the lowest 10 bits were used in 2017
static const int QIE11_LUT_BITMASK_2017 = 0x3FF;
static const int QIE11_LUT_BITMASK = 0x3FF;

private:
// typedef
Expand All @@ -79,8 +77,8 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {
static const int nFi_ = 72;

static const int QIE8_LUT_MSB = 0x400;
static const int QIE11_LUT_MSB0 = 0x800;
static const int QIE11_LUT_MSB1 = 0x1000;
static const int QIE11_LUT_MSB0 = 0x400;
static const int QIE11_LUT_MSB1 = 0x800;
static const int QIE10_LUT_MSB = 0x1000;

// member variables
Expand Down
4 changes: 1 addition & 3 deletions CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const float HcaluLUTTPGCoder::lsb_=1./16;
const int HcaluLUTTPGCoder::QIE8_LUT_BITMASK;
const int HcaluLUTTPGCoder::QIE10_LUT_BITMASK;
const int HcaluLUTTPGCoder::QIE11_LUT_BITMASK;
const int HcaluLUTTPGCoder::QIE11_LUT_BITMASK_2017;

constexpr double MaximumFractionalError = 0.002; // 0.2% error allowed from this source

Expand Down Expand Up @@ -348,8 +347,7 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {

const size_t SIZE = qieType==QIE8 ? INPUT_LUT_SIZE : UPGRADE_LUT_SIZE;
const int MASK = qieType==QIE8 ? QIE8_LUT_BITMASK :
qieType==QIE10 ? QIE10_LUT_BITMASK :
is2018OrLater ? QIE11_LUT_BITMASK : QIE11_LUT_BITMASK_2017;
qieType==QIE10 ? QIE10_LUT_BITMASK : QIE11_LUT_BITMASK;
double linearLSB = linearLSB_QIE8_;
if (qieType == QIE11 and cell.ietaAbs() == topo_->lastHBRing())
linearLSB = linearLSB_QIE11Overlap_;
Expand Down