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

Jump to bottom

[10_0_X] Hcal TP fix ngHE saturation + switch from bare to effective pedestals #22291

Merged
merged 2 commits into from Mar 3, 2018
Merged

[10_0_X] Hcal TP fix ngHE saturation + switch from bare to effective pedestals #22291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21db65c
Do not truncate QIE11 linearization LUTs at 10 bits
christopheralanwest Feb 14, 2018
5e1d6a9
Use effective rather than bare pedestals for HCAL TP LUTs
christopheralanwest Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h
View file
Open in desktop
Expand Up @@ -61,7 +61,9 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {

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

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

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

// member variables
Expand Down
6 changes: 4 additions & 2 deletions CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ 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;


HcaluLUTTPGCoder::HcaluLUTTPGCoder(const HcalTopology* top) : topo_(top), LUTGenerationMode_(true), bitToMask_(0), allLinear_(false), linearLSB_QIE8_(1.), linearLSB_QIE11_(1.) {
Expand Down Expand Up @@ -279,7 +280,7 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {
if (LUTGenerationMode_){
const HcalCalibrations& calibrations = conditions.getHcalCalibrations(cell);
for (auto capId : {0,1,2,3}){
ped += calibrations.pedestal(capId);
ped += calibrations.effpedestal(capId);
gain += calibrations.LUTrespcorrgain(capId);
}
ped /= 4.0;
Expand Down Expand Up @@ -311,7 +312,8 @@ 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 : QIE11_LUT_BITMASK;
qieType==QIE10 ? QIE10_LUT_BITMASK :
is2018OrLater ? QIE11_LUT_BITMASK : QIE11_LUT_BITMASK_2017;
double linearLSB = linearLSB_QIE8_;
if (qieType == QIE11 and cell.ietaAbs() == topo_->lastHBRing())
linearLSB = linearLSB_QIE11Overlap_;
Expand Down
2 changes: 1 addition & 1 deletion CaloOnlineTools/HcalOnlineDb/src/WriteL1TriggerObjectsTxt.cc
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ WriteL1TriggerObjectsTxt::analyze(const edm::Event& iEvent, const edm::EventSetu

for (auto i : {0,1,2,3}){
gain += calibrations.LUTrespcorrgain(i);
ped += calibrations.pedestal(i);
ped += calibrations.effpedestal(i);
}

gain /= 4.;
Expand Down
2 changes: 1 addition & 1 deletion SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFeatureHFEMBit.h
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ HcalFeatureHFEMBit::getE(const T& f, int idx) const
CaloSamples samples;
db.adc2fC(f, samples);

auto ped = calibrations.pedestal(f[idx].capid());
auto ped = calibrations.effpedestal(f[idx].capid());
auto corr = calibrations.respcorrgain(f[idx].capid());

return (samples[idx] - ped) * corr;
Expand Down