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

[ALCA] [GCC12] Fix build warnings #39520

Merged
merged 1 commit into from
Sep 28, 2022
Merged

[ALCA] [GCC12] Fix build warnings #39520

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
12 changes: 6 additions & 6 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ class TEcnaParPaths : public TObject {

Bool_t GetPaths();

TString ResultsRootFilePath();
TString ResultsAsciiFilePath();
TString HistoryRunListFilePath();
TString CMSSWBase();
TString CMSSWSubsystem();
TString SCRAMArch();
const TString &ResultsRootFilePath() const;
const TString &ResultsAsciiFilePath() const;
const TString &HistoryRunListFilePath() const;
const TString &CMSSWBase() const;
const TString &CMSSWSubsystem() const;
const TString &SCRAMArch() const;
Comment on lines +78 to +83
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just a minor issue but I think this should either be

const TString & ResultsRootFilePath()

or

const TString& ResultsRootFilePath()

Like it is now, "&" is attached to a function name which I see as a little bit confusing.


void SetResultsRootFilePath(const TString &);
void SetResultsAsciiFilePath(const TString &);
Expand Down
10 changes: 5 additions & 5 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ class TEcnaRead : public TObject {
TMatrixD ReadHighFrequencyMeanCorrelationsBetweenStins(const Int_t &); // 1 of (Stin,Stin)

//------------------------------------------------------------------------------------------------
TString GetAnalysisName();
const TString &GetAnalysisName() const;
Int_t GetNbOfSamples();
Int_t GetRunNumber();
Int_t GetFirstReqEvtNumber();
Expand All @@ -541,10 +541,10 @@ class TEcnaRead : public TObject {

time_t GetStartTime();
time_t GetStopTime();
TString GetStartDate();
TString GetStopDate();
TString GetRootFileName();
TString GetRootFileNameShort();
const TString &GetStartDate() const;
const TString &GetStopDate() const;
const TString &GetRootFileName() const;
const TString &GetRootFileNameShort() const;
Comment on lines +544 to +547
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


TString GetRunType();

Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,10 +614,10 @@ class TEcnaRun : public TObject {
void HighFrequencyMeanCorrelationsBetweenStins();

//...................................... ROOT file methods
TString GetRootFileName();
TString GetRootFileNameShort();
TString GetNewRootFileName();
TString GetNewRootFileNameShort();
const TString& GetRootFileName() const;
const TString& GetRootFileNameShort() const;
const TString& GetNewRootFileName() const;
const TString& GetNewRootFileNameShort() const;

Bool_t WriteRootFile();
Bool_t WriteNewRootFile(const TString&);
Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ class TEcnaWrite : public TObject {
void WriteAsciiHisto(const TString&, const Int_t&, const TVectorD&);

//...........................................................................
TString GetAsciiFileName();
TString GetRootFileName();
TString GetRootFileNameShort();
TString GetAnalysisName();
const TString& GetAsciiFileName() const;
const TString& GetRootFileName() const;
const TString& GetRootFileNameShort() const;
const TString& GetAnalysisName() const;

Int_t GetNbOfSamples();
Int_t GetRunNumber();
Expand Down
12 changes: 6 additions & 6 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParPaths.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,12 @@ void TEcnaParPaths::GetCMSSWParameters() {
// M E T H O D S T O R E T U R N T H E P A R A M E T E R S
//
//=======================================================================================
TString TEcnaParPaths::ResultsRootFilePath() { return fCfgResultsRootFilePath; }
TString TEcnaParPaths::ResultsAsciiFilePath() { return fCfgResultsAsciiFilePath; }
TString TEcnaParPaths::HistoryRunListFilePath() { return fCfgHistoryRunListFilePath; }
TString TEcnaParPaths::CMSSWBase() { return fCfgCMSSWBase; }
TString TEcnaParPaths::CMSSWSubsystem() { return fCfgCMSSWSubsystem; }
TString TEcnaParPaths::SCRAMArch() { return fCfgSCRAMArch; }
const TString &TEcnaParPaths::ResultsRootFilePath() const { return fCfgResultsRootFilePath; }
const TString &TEcnaParPaths::ResultsAsciiFilePath() const { return fCfgResultsAsciiFilePath; }
const TString &TEcnaParPaths::HistoryRunListFilePath() const { return fCfgHistoryRunListFilePath; }
const TString &TEcnaParPaths::CMSSWBase() const { return fCfgCMSSWBase; }
const TString &TEcnaParPaths::CMSSWSubsystem() const { return fCfgCMSSWSubsystem; }
const TString &TEcnaParPaths::SCRAMArch() const { return fCfgSCRAMArch; }
Comment on lines +352 to +357
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


//.....................................................................................
TString TEcnaParPaths::PathModulesData() {
Expand Down
10 changes: 5 additions & 5 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRead.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ void TEcnaRead::FileParameters(const TString &typ_ana,
// GetLastReqEvtNumber, GetReqNbOfEvts, GetStexNumber
//
//=========================================================================
TString TEcnaRead::GetAnalysisName() { return fFileHeader->fTypAna; }
const TString &TEcnaRead::GetAnalysisName() const { return fFileHeader->fTypAna; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Int_t TEcnaRead::GetNbOfSamples() { return fFileHeader->fNbOfSamples; }
Int_t TEcnaRead::GetRunNumber() { return fFileHeader->fRunNumber; }
Int_t TEcnaRead::GetFirstReqEvtNumber() { return fFileHeader->fFirstReqEvtNumber; }
Expand All @@ -829,8 +829,8 @@ Int_t TEcnaRead::GetStexNumber() { return fFileHeader->fStex; }
//=========================================================================
time_t TEcnaRead::GetStartTime() { return fFileHeader->fStartTime; }
time_t TEcnaRead::GetStopTime() { return fFileHeader->fStopTime; }
TString TEcnaRead::GetStartDate() { return fFileHeader->fStartDate; }
TString TEcnaRead::GetStopDate() { return fFileHeader->fStopDate; }
const TString &TEcnaRead::GetStartDate() const { return fFileHeader->fStartDate; }
const TString &TEcnaRead::GetStopDate() const { return fFileHeader->fStopDate; }
Comment on lines +832 to +833
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

TString TEcnaRead::GetRunType() {
TString cType = "run type not defined";
Int_t numtype = fFileHeader->fRunType;
Expand Down Expand Up @@ -4209,8 +4209,8 @@ TString TEcnaRead::GetTypeOfQuantity(const CnaResultTyp arg_typ) {
// Get the ROOT file name (long and short)
//
//-------------------------------------------------------------------------
TString TEcnaRead::GetRootFileName() { return fCnaWrite->GetRootFileName(); }
TString TEcnaRead::GetRootFileNameShort() { return fCnaWrite->GetRootFileNameShort(); }
const TString &TEcnaRead::GetRootFileName() const { return fCnaWrite->GetRootFileName(); }
const TString &TEcnaRead::GetRootFileNameShort() const { return fCnaWrite->GetRootFileNameShort(); }
Comment on lines +4212 to +4213
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

//-------------------------------------------------------------------------
//
// GetStexStinFromIndex
Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,8 +1326,8 @@ Bool_t TEcnaRun::ReadSampleAdcValues(const Int_t& nb_samp_for_calc) {
// Get the ROOT file name (long and short)
//
//-------------------------------------------------------------------------
TString TEcnaRun::GetRootFileName() { return fRootFileName; }
TString TEcnaRun::GetRootFileNameShort() { return fRootFileNameShort; }
const TString& TEcnaRun::GetRootFileName() const { return fRootFileName; }
const TString& TEcnaRun::GetRootFileNameShort() const { return fRootFileNameShort; }

//###################################################################################################
//
Expand Down Expand Up @@ -3426,8 +3426,8 @@ Bool_t TEcnaRun::WriteNewRootFile(const TString& TypAna) {
// (called by TEcnaGui in Calculations method)
//
//-------------------------------------------------------------------------
TString TEcnaRun::GetNewRootFileName() { return fNewRootFileName; }
TString TEcnaRun::GetNewRootFileNameShort() { return fNewRootFileNameShort; }
const TString& TEcnaRun::GetNewRootFileName() const { return fNewRootFileName; }
const TString& TEcnaRun::GetNewRootFileNameShort() const { return fNewRootFileNameShort; }

//--------------------------------------------------------------------
//
Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaWrite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,10 @@ void TEcnaWrite::SetEcalSubDetector(const TString& SubDet, TEcnaParEcal* pEcal,
// Int_t fStexNumber = super_module
//
//-------------------------------------------------------------------------
TString TEcnaWrite::GetAsciiFileName() { return fAsciiFileName; }
TString TEcnaWrite::GetRootFileName() { return fRootFileName; }
TString TEcnaWrite::GetRootFileNameShort() { return fRootFileNameShort; }
TString TEcnaWrite::GetAnalysisName() { return fAnaType; }
const TString& TEcnaWrite::GetAsciiFileName() const { return fAsciiFileName; }
const TString& TEcnaWrite::GetRootFileName() const { return fRootFileName; }
const TString& TEcnaWrite::GetRootFileNameShort() const { return fRootFileNameShort; }
const TString& TEcnaWrite::GetAnalysisName() const { return fAnaType; }
Int_t TEcnaWrite::GetNbOfSamples() { return fNbOfSamples; }
Int_t TEcnaWrite::GetRunNumber() { return fRunNumber; }
Int_t TEcnaWrite::GetFirstReqEvtNumber() { return fFirstReqEvtNumber; }
Expand Down