Skip to content

Commit

Permalink
Merge pull request #38235 from thomreis/ecal-sa-issues-june2022
Browse files Browse the repository at this point in the history 
ECAL - Fix ECAL static analyzer issues in CalibCalorimetry and CondFormats packages
  • Loading branch information
@cmsbuild
cmsbuild committed Jun 5, 2022
2 parents 51e5a9a + 37567ab commit 14f8f61
Show file tree
Hide file tree
Showing 14 changed files with 105 additions and 172 deletions.
22 changes: 8 additions & 14 deletions CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h
View file
@@ -1,5 +1,5 @@
#ifndef _CALO_MISCALIB_MAP_ECAL
#define _CALO_MISCALIB_MAP_ECAL
#ifndef CalibCalorimetry_CaloMiscalibTools_CaloMiscalibMapEcal_h
#define CalibCalorimetry_CaloMiscalibTools_CaloMiscalibMapEcal_h
#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
#include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h"
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
Expand All @@ -21,23 +21,17 @@ class CaloMiscalibMapEcal : public CaloMiscalibMap {
if (iEta == 0)
continue;
for (int iPhi = EBDetId::MIN_IPHI; iPhi <= EBDetId::MAX_IPHI; ++iPhi) {
try {
EBDetId ebdetid(iEta, iPhi);
map_.setValue(ebdetid.rawId(), 1.0);
} catch (...) {
}
EBDetId ebdetid(iEta, iPhi);
map_.setValue(ebdetid.rawId(), 1.0);
}
}

for (int iX = EEDetId::IX_MIN; iX <= EEDetId::IX_MAX; ++iX) {
for (int iY = EEDetId::IY_MIN; iY <= EEDetId::IY_MAX; ++iY) {
try {
EEDetId eedetidpos(iX, iY, 1);
map_.setValue(eedetidpos.rawId(), 1.0);
EEDetId eedetidneg(iX, iY, -1);
map_.setValue(eedetidneg.rawId(), 1.0);
} catch (...) {
}
EEDetId eedetidpos(iX, iY, 1);
map_.setValue(eedetidpos.rawId(), 1.0);
EEDetId eedetidneg(iX, iY, -1);
map_.setValue(eedetidneg.rawId(), 1.0);
}
}
}
Expand Down
16 changes: 4 additions & 12 deletions CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc
View file
Expand Up @@ -9,18 +9,10 @@ DetId MiscalibReaderFromXMLEcalEndcap::parseCellEntry(XERCES_CPP_NAMESPACE::DOMN
}

EEDetId MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(int ix, int iy, int iz) {
try {
if (EEDetId::validDetId(ix, iy, iz)) {
EEDetId cell(ix, iy, iz);
return cell;
} else {
return EEDetId(0);
}
}

catch (...)

{
if (EEDetId::validDetId(ix, iy, iz)) {
EEDetId cell(ix, iy, iz);
return cell;
} else {
std::cout << "Null coordinates = " << ix << "," << iy << "," << iz << std::endl;
return EEDetId(0);
}
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h
View file
Expand Up @@ -86,11 +86,11 @@ class TEcnaNumbering : public TObject {

TEcnaNumbering();
TEcnaNumbering(TEcnaObject*, const TString&);
TEcnaNumbering(const TString&, const TEcnaParEcal*);
TEcnaNumbering(const TString&, TEcnaParEcal*);
~TEcnaNumbering() override;

void SetEcalSubDetector(const TString&);
void SetEcalSubDetector(const TString&, const TEcnaParEcal*);
void SetEcalSubDetector(const TString&, TEcnaParEcal*);

//================================== BARREL

Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParHistos.h
View file
Expand Up @@ -79,12 +79,12 @@ class TEcnaParHistos : public TObject {

TEcnaParHistos();
TEcnaParHistos(TEcnaObject*, const TString&);
TEcnaParHistos(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
TEcnaParHistos(const TString&, TEcnaParEcal*, TEcnaNumbering*);
~TEcnaParHistos() override;

void Init();
void SetEcalSubDetector(const TString&);
void SetEcalSubDetector(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
void SetEcalSubDetector(const TString&, TEcnaParEcal*, TEcnaNumbering*);

//...................................................... PLOT methods
UInt_t SetCanvasWidth(const TString&, const TString&);
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h
View file
Expand Up @@ -145,13 +145,13 @@ class TEcnaWrite : public TObject {

TEcnaWrite();
TEcnaWrite(TEcnaObject*, const TString&);
TEcnaWrite(const TString&, const TEcnaParPaths*, const TEcnaParCout*, const TEcnaParEcal*, const TEcnaNumbering*);
TEcnaWrite(const TString&, TEcnaParPaths*, TEcnaParCout*, TEcnaParEcal*, TEcnaNumbering*);

~TEcnaWrite() override;

void Init();
void SetEcalSubDetector(const TString&);
void SetEcalSubDetector(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
void SetEcalSubDetector(const TString&, TEcnaParEcal*, TEcnaNumbering*);

//...................................................... making file name method
void fMakeResultsFileName(); // => default: arg = fCodeRoot
Expand Down
92 changes: 47 additions & 45 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc
View file
Expand Up @@ -3037,13 +3037,15 @@ void TEcnaHistos::ViewTowerGrid(const Int_t& SMNumber,
fCnewRoot++;
}

sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
if (sup_axis_x != nullptr) {
sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
}

//...................................................... Axe phi (y right) (ViewTowerGrid)
Float_t tit_siz_y = fCnaParHistos->AxisTitleSize();
Expand Down Expand Up @@ -3083,13 +3085,15 @@ void TEcnaHistos::ViewTowerGrid(const Int_t& SMNumber,
fCnewRoot++;
}

sup_axis_y->SetTitle(y_var_name);
sup_axis_y->SetTitleSize(tit_siz_y);
sup_axis_y->SetTitleOffset(tit_off_y);
sup_axis_y->SetLabelSize(lab_siz_y);
sup_axis_y->SetLabelOffset(lab_off_y);
sup_axis_y->SetTickSize(tic_siz_y);
sup_axis_y->Draw("SAME");
if (sup_axis_y != nullptr) {
sup_axis_y->SetTitle(y_var_name);
sup_axis_y->SetTitleSize(tit_siz_y);
sup_axis_y->SetTitleOffset(tit_off_y);
sup_axis_y->SetLabelSize(lab_siz_y);
sup_axis_y->SetLabelOffset(lab_off_y);
sup_axis_y->SetTickSize(tic_siz_y);
sup_axis_y->Draw("SAME");
}
}
//...................................................... Axe j(phi) (y left) (ViewTowerGrid)

Expand Down Expand Up @@ -4437,13 +4441,15 @@ void TEcnaHistos::ViewSMGrid(const Int_t& SMNumber, const TString& c_option) {
fCnewRoot++;
}

sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
if (sup_axis_x != nullptr) {
sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
}

//...................................................... Axe phi (y) ViewSMGrid
Double_t phi_min = fEcalNumbering->GetPhiMin(SMNumber);
Expand Down Expand Up @@ -4488,13 +4494,15 @@ void TEcnaHistos::ViewSMGrid(const Int_t& SMNumber, const TString& c_option) {
fCnewRoot++;
}

sup_axis_y->SetTitle(y_var_name);
sup_axis_y->SetTitleSize(tit_siz_y);
sup_axis_y->SetTitleOffset(tit_off_y);
sup_axis_y->SetLabelSize(lab_siz_y);
sup_axis_y->SetLabelOffset(lab_off_y);
sup_axis_y->SetTickSize(tic_siz_y);
sup_axis_y->Draw("SAME");
if (sup_axis_y != nullptr) {
sup_axis_y->SetTitle(y_var_name);
sup_axis_y->SetTitleSize(tit_siz_y);
sup_axis_y->SetTitleOffset(tit_off_y);
sup_axis_y->SetLabelSize(lab_siz_y);
sup_axis_y->SetLabelOffset(lab_off_y);
sup_axis_y->SetTickSize(tic_siz_y);
sup_axis_y->Draw("SAME");
}

//...................................................... Axe jphi (jy) ViewSMGrid
Double_t jphi_min = fEcalNumbering->GetJPhiMin(SMNumber);
Expand Down Expand Up @@ -5042,8 +5050,8 @@ void TEcnaHistos::ViewDeeGrid(const Int_t& DeeNumber, const TString& c_option) {
Double_t yline_haut_bot = (Double_t)ymid_bid;
Double_t yline_haut_top = (Double_t)ysup_bid;

Double_t yline_bas_bot = (Double_t)yinf_bid;
Double_t yline_bas_top = (Double_t)ymid_bid;
Double_t yline_bas_bot;
Double_t yline_bas_top;

// coordonnees demi-lignes
// l = 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10
Expand Down Expand Up @@ -5841,13 +5849,15 @@ void TEcnaHistos::ViewEBGrid() {
Float_t tit_off_x = fCnaParHistos->AxisTitleOffset("EBx");
Float_t lab_off_x = fCnaParHistos->AxisLabelOffset("EBx");

sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
if (sup_axis_x != nullptr) {
sup_axis_x->SetTitle(x_var_name);
sup_axis_x->SetTitleSize(tit_siz_x);
sup_axis_x->SetTitleOffset(tit_off_x);
sup_axis_x->SetLabelSize(lab_siz_x);
sup_axis_x->SetLabelOffset(lab_off_x);
sup_axis_x->SetTickSize(tic_siz_x);
sup_axis_x->Draw("SAME");
}

//...................................................... Axe eta (y) ViewEBGrid
MatSize = fEcal->MaxTowEtaInSM();
Expand Down Expand Up @@ -6268,7 +6278,6 @@ void TEcnaHistos::EEDataSectors(const Float_t& coefcc_x,
}

//............................ numeros des dee's
ngmax = 4;
Float_t xg_coord_dee[4] = {0, 0, 0, 0};
Float_t yg_coord_dee[4] = {48, 48, 48, 48};

Expand Down Expand Up @@ -6310,7 +6319,6 @@ void TEcnaHistos::EEDataSectors(const Float_t& coefcc_x,
//..................................... Numeros des Dee et indication EE+- (option "EE" seulement)
if (opt_plot == "EE") {
//............................ indication EE+-
ngmax = 4;
Float_t xg_coord_eepm[4] = {0, 0, 0, 0};
Float_t yg_coord_eepm[4] = {95, 95, 95, 95};

Expand Down Expand Up @@ -6761,7 +6769,6 @@ void TEcnaHistos::XtalSamplesEv(const TVectorD& arg_read_histo,
ViewHisto(read_histo_samps, xAlreadyRead, StexStin_A, i0_stin_echa, fZerv, "D_MSp_SpNb", fAllXtalsInStinPlot);
xAlreadyRead++;
}
xAlreadyRead = 0;
} else {
std::cout << "!TEcnaHistos::XtalSamplesEv(...)> Data not available." << std::endl;
}
Expand Down Expand Up @@ -6854,7 +6861,6 @@ void TEcnaHistos::EvSamplesXtals(const TVectorD& arg_read_histo,
ViewHisto(read_histo_samps, xAlreadyRead, StexStin_A, i0_stin_echa, fZerv, "D_MSp_SpDs", fAllXtalsInStinPlot);
xAlreadyRead++;
}
xAlreadyRead = 0;
} else {
std::cout << "!TEcnaHistos::EvSamplesXtals(...)> Data not available." << std::endl;
}
Expand Down Expand Up @@ -6947,7 +6953,6 @@ void TEcnaHistos::XtalSamplesSigma(const TVectorD& arg_read_histo,
ViewHisto(read_histo_samps, xAlreadyRead, StexStin_A, i0StinEcha, fZerv, "D_SSp_SpNb", fAllXtalsInStinPlot);
xAlreadyRead++;
}
xAlreadyRead = 0;
} else {
std::cout << "!TEcnaHistos::XtalSamplesSigma(...)> Data not available." << std::endl;
}
Expand Down Expand Up @@ -7040,7 +7045,6 @@ void TEcnaHistos::SigmaSamplesXtals(const TVectorD& arg_read_histo,
ViewHisto(read_histo_samps, xAlreadyRead, StexStin_A, i0StinEcha, fZerv, "D_SSp_SpDs", fAllXtalsInStinPlot);
xAlreadyRead++;
}
xAlreadyRead = 0;
} else {
std::cout << "!TEcnaHistos::SigmaSamplesXtals(...)> Data not available." << std::endl;
}
Expand Down Expand Up @@ -11272,7 +11276,6 @@ void TEcnaHistos::HistoPlot(TH1D* h_his0,
<< std::endl;

ReInitCanvas(HistoCode, opt_plot);
xMemoPlotSame = 0;
}

// delete MainCanvas; fCdeleteRoot++;
Expand Down Expand Up @@ -12158,7 +12161,6 @@ void TEcnaHistos::HistimePlot(TGraph* g_graph0,
<< std::endl;

ReInitCanvas(HistoCode, opt_plot);
xMemoPlotSame = 0;
}

// delete MainCanvas; fCdeleteRoot++;
Expand Down
16 changes: 0 additions & 16 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaNArrayD.cc
View file
Expand Up @@ -366,19 +366,3 @@ Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2, Int_t i3, Int_t i4, Int_t
i = OneDim(i1, i2, i3, i4, i5, i6);
return fA[i];
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1) const { return const_cast<TEcnaNArrayD *>(this)->operator()(i1); }
const Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2) const {
return const_cast<TEcnaNArrayD *>(this)->operator()(i1, i2);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2, Int_t i3) const {
return const_cast<TEcnaNArrayD *>(this)->operator()(i1, i2, i3);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2, Int_t i3, Int_t i4) const {
return const_cast<TEcnaNArrayD *>(this)->operator()(i1, i2, i3, i4);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2, Int_t i3, Int_t i4, Int_t i5) const {
return const_cast<TEcnaNArrayD *>(this)->operator()(i1, i2, i3, i4, i5);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1, Int_t i2, Int_t i3, Int_t i4, Int_t i5, Int_t i6) const {
return const_cast<TEcnaNArrayD *>(this)->operator()(i1, i2, i3, i4, i5, i6);
}
7 changes: 3 additions & 4 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaNumbering.cc
View file
Expand Up @@ -60,7 +60,7 @@ TEcnaNumbering::TEcnaNumbering(TEcnaObject* pObjectManager, const TString& SubDe
SetEcalSubDetector(SubDet.Data());
}

TEcnaNumbering::TEcnaNumbering(const TString& SubDet, const TEcnaParEcal* pEcal) {
TEcnaNumbering::TEcnaNumbering(const TString& SubDet, TEcnaParEcal* pEcal) {
// Constructor with argument: call to methods Init() and SetEcalSubDetector(const TString&)

// std::cout << "[Info Management] CLASS: TEcnaNumbering. CREATE OBJECT: this = " << this << std::endl;
Expand Down Expand Up @@ -219,15 +219,14 @@ void TEcnaNumbering::Init() {
}
// end of Init()
//------------------------------------------------------------- SetEcalSubDetector(...)
void TEcnaNumbering::SetEcalSubDetector(const TString& SubDet, const TEcnaParEcal* pEcal) {
void TEcnaNumbering::SetEcalSubDetector(const TString& SubDet, TEcnaParEcal* pEcal) {
//Set the current subdetector flag and the current subdetector parameters

fEcal = nullptr;
if (pEcal == nullptr) {
fEcal = new TEcnaParEcal(SubDet.Data()); /*fCnew++*/
;
} else {
fEcal = (TEcnaParEcal*)pEcal;
fEcal = pEcal;
}

Int_t MaxCar = fgMaxCar;
Expand Down

0 comments on commit 14f8f61

Please sign in to comment.