Skip to content

Commit

Permalink
Merge pull request #40732 from zhokin2/CMTRMTforRun3_CMSSW_13_0_X_202…
Browse files Browse the repository at this point in the history 
…3-02-08-1100

HCAL: bug fixed in DPGAnalysis/HcalTools for 2023 Run3
  • Loading branch information
@cmsbuild
cmsbuild committed Feb 11, 2023
2 parents 2f899a2 + 301c6e6 commit 69a0aee
Showing 1 changed file with 21 additions and 32 deletions.
53 changes: 21 additions & 32 deletions DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc
View file
@@ -1,6 +1,5 @@
// -*- C++ -*-
//
//
// Package: CMTRawAnalyzer
//
#include <fstream>
Expand All @@ -9,7 +8,6 @@
#include <iosfwd>
#include <bitset>
#include <memory>

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/PluginManager/interface/ModuleDef.h"
Expand All @@ -18,7 +16,6 @@
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "CommonTools/UtilAlgos/interface/TFileService.h"
#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
Expand Down Expand Up @@ -67,8 +64,7 @@
#include "TF1.h"

#define NUMADCS 256
double adc2fC_QIE10[NUMADCS] = {
// - - - - - - - range 0 - - - - - - - -
double const adc2fC_QIE10[NUMADCS] = {
//subrange0
1.58,
4.73,
Expand Down Expand Up @@ -8798,23 +8794,23 @@ void CMTRawAnalyzer::fillDigiAmplitude(HBHEDigiCollection::const_iterator& digiI
pedestalaver4 /= c4;
pedestalwaver9 = sqrt(pedestalwaver9 / TSsize);
pedestalwaver4 = sqrt(pedestalwaver4 / c4);
if (ts_with_max_signal > -1 && ts_with_max_signal < 10)
if (ts_with_max_signal > -1 && ts_with_max_signal < TSsize)
ampl = tool[ts_with_max_signal];
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < 10)
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < TSsize)
ampl += tool[ts_with_max_signal + 2];
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < 10)
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < TSsize)
ampl += tool[ts_with_max_signal + 1];
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < 10)
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < TSsize)
ampl += tool[ts_with_max_signal - 1];

///---------------------------------------------------------------------------------------------------- for raddam:
if (ts_with_max_signal > -1 && ts_with_max_signal < 10)
if (ts_with_max_signal > -1 && ts_with_max_signal < TSsize)
linamplitudewithoutPedSubtr = lintoolwithoutPedSubtr[ts_with_max_signal];
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < 10)
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < TSsize)
linamplitudewithoutPedSubtr += lintoolwithoutPedSubtr[ts_with_max_signal + 2];
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < 10)
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < TSsize)
linamplitudewithoutPedSubtr += lintoolwithoutPedSubtr[ts_with_max_signal + 1];
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < 10)
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < TSsize)
linamplitudewithoutPedSubtr += lintoolwithoutPedSubtr[ts_with_max_signal - 1];

double ratio = 0.;
Expand Down Expand Up @@ -9498,13 +9494,13 @@ void CMTRawAnalyzer::fillDigiAmplitude(HBHEDigiCollection::const_iterator& digiI
double amplitudewithPedSubtr = 0.;

//for cut on A_channel:
if (ts_with_max_signal > -1 && ts_with_max_signal < 10)
if (ts_with_max_signal > -1 && ts_with_max_signal < TSsize)
amplitudewithPedSubtr = toolwithPedSubtr[ts_with_max_signal];
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < 10)
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < TSsize)
amplitudewithPedSubtr += toolwithPedSubtr[ts_with_max_signal + 2];
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < 10)
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < TSsize)
amplitudewithPedSubtr += toolwithPedSubtr[ts_with_max_signal + 1];
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < 10)
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < TSsize)
amplitudewithPedSubtr += toolwithPedSubtr[ts_with_max_signal - 1];

h_AamplitudewithPedSubtr_RADDAM_HE->Fill(amplitudewithPedSubtr);
Expand Down Expand Up @@ -9639,7 +9635,6 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
double amplitude345 = 0.;
double ampl = 0.;
double ampl3ts = 0.;
double amplmaxts = 0.;
double timew = 0.;
double timeww = 0.;
double max_signal = -100.;
Expand Down Expand Up @@ -9763,20 +9758,19 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
pedestalwaver4 = sqrt(pedestalwaver4 / c4);

// ------------ to get signal in TS: -2 max +1 ------------
if (ts_with_max_signal > -1 && ts_with_max_signal < 10) {
if (ts_with_max_signal > -1 && ts_with_max_signal < TSsize) {
ampl = tool[ts_with_max_signal];
ampl3ts = tool[ts_with_max_signal];
amplmaxts = tool[ts_with_max_signal];
}
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < 10) {
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < TSsize) {
ampl += tool[ts_with_max_signal - 1];
ampl3ts += tool[ts_with_max_signal - 1];
}
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < 10) {
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < TSsize) {
ampl += tool[ts_with_max_signal + 1];
ampl3ts += tool[ts_with_max_signal + 1];
}
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < 10) {
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < TSsize) {
ampl += tool[ts_with_max_signal + 2];
}
// HE charge correction for SiPMs:
Expand All @@ -9786,7 +9780,6 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
double xb = ampl / 40.;
double xc = amplitude345 / 40.;
double xd = ampl3ts / 40.;
double xe = amplmaxts / 40.;
double txa = tocampl / 40.;
// ADDI case:
if (((ieta == -16 || ieta == 15) && mdepth == 4) ||
Expand All @@ -9799,15 +9792,13 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
double corrforxb = a2 * xb * xb + b1 * xb + c0;
double corrforxc = a2 * xc * xc + b1 * xc + c0;
double corrforxd = a2 * xd * xd + b1 * xd + c0;
double corrforxe = a2 * xe * xe + b1 * xe + c0;
double corrfortxa = a2 * txa * txa + b1 * txa + c0;
h_corrforxaADDI_HE->Fill(amplitude, corrforxa);
h_corrforxaADDI0_HE->Fill(amplitude, 1.);
amplitude *= corrforxa;
ampl *= corrforxb;
amplitude345 *= corrforxc;
ampl3ts *= corrforxd;
amplmaxts *= corrforxe;
tocampl *= corrfortxa;
}
// MAIN case:
Expand All @@ -9819,15 +9810,13 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
double corrforxb = a2 * xb * xb + b1 * xb + c0;
double corrforxc = a2 * xc * xc + b1 * xc + c0;
double corrforxd = a2 * xd * xd + b1 * xd + c0;
double corrforxe = a2 * xe * xe + b1 * xe + c0;
double corrfortxa = a2 * txa * txa + b1 * txa + c0;
h_corrforxaMAIN_HE->Fill(amplitude, corrforxa);
h_corrforxaMAIN0_HE->Fill(amplitude, 1.);
amplitude *= corrforxa;
ampl *= corrforxb;
amplitude345 *= corrforxc;
ampl3ts *= corrforxd;
amplmaxts *= corrforxe;
tocampl *= corrfortxa;
}
} // sub == 2 HE charge correction end
Expand Down Expand Up @@ -11910,13 +11899,13 @@ void CMTRawAnalyzer::fillDigiAmplitudeHO(HODigiCollection::const_iterator& digiI
pedestalaver4 /= c4;
pedestalwaver9 = sqrt(pedestalwaver9 / TSsize);
pedestalwaver4 = sqrt(pedestalwaver4 / c4);
if (ts_with_max_signal > -1 && ts_with_max_signal < 10)
if (ts_with_max_signal > -1 && ts_with_max_signal < TSsize)
ampl = tool[ts_with_max_signal];
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < 10)
if (ts_with_max_signal + 2 > -1 && ts_with_max_signal + 2 < TSsize)
ampl += tool[ts_with_max_signal + 2];
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < 10)
if (ts_with_max_signal + 1 > -1 && ts_with_max_signal + 1 < TSsize)
ampl += tool[ts_with_max_signal + 1];
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < 10)
if (ts_with_max_signal - 1 > -1 && ts_with_max_signal - 1 < TSsize)
ampl += tool[ts_with_max_signal - 1];
double ratio = 0.;
if (amplitude != 0.)
Expand Down

0 comments on commit 69a0aee

Please sign in to comment.