Skip to content

Commit

Permalink
Merge pull request #22425 from gartung/CalibCalorimetry-clang-warning…
Browse files Browse the repository at this point in the history 
…-cleanup

Calibcalorimetry packages: clang warning cleanup
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 5, 2018
2 parents c0867ee + 8aa0fa2 commit b298817
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
12 changes: 6 additions & 6 deletions CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaNArrayD.cc
View file
Expand Up @@ -357,25 +357,25 @@ Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5,
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1) const
{
return (Double_t&)(this->operator()(i1));
return const_cast< TEcnaNArrayD *>(this)->operator()(i1);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2) const
{
return (Double_t&)(this->operator()(i1,i2));
return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2);
}
const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3) const
{
return (Double_t&)(this->operator()(i1,i2,i3));
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 (Double_t&)(this->operator()(i1,i2,i3,i4));
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 (Double_t&)(this->operator()(i1,i2,i3,i4,i5));
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 (Double_t&)(this->operator()(i1,i2,i3,i4,i5,i6));
return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2,i3,i4,i5,i6);
}
7 changes: 4 additions & 3 deletions CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc
View file
Expand Up @@ -10,6 +10,7 @@
#include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"

#include "TFile.h"
#include "TString.h"

#include "CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h"

Expand All @@ -25,9 +26,9 @@ testChannel::testChannel (const edm::ParameterSet& paramSet) :
m_bestPed (paramSet.getParameter<int> ("bestPed")) ,
m_xtal (paramSet.getParameter<int> ("xtal")) ,
m_pedVSDAC ("pedVSDAC","pedVSDAC",100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
m_singlePedVSDAC_1 ("singlePedVSDAC_1","pedVSDAC (g1) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
m_singlePedVSDAC_2 ("singlePedVSDAC_2","pedVSDAC (g2) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
m_singlePedVSDAC_3 ("singlePedVSDAC_3","pedVSDAC (g3) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax)
m_singlePedVSDAC_1 ("singlePedVSDAC_1","pedVSDAC (g1) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
m_singlePedVSDAC_2 ("singlePedVSDAC_2","pedVSDAC (g2) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
m_singlePedVSDAC_3 ("singlePedVSDAC_3","pedVSDAC (g3) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax)
{
edm::LogInfo ("testChannel") << " reading "
<< " m_DACmin: " << m_DACmin
Expand Down
22 changes: 11 additions & 11 deletions CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc
View file
Expand Up @@ -176,7 +176,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
mappingFile_ = ps.getUntrackedParameter<std::string>("mappingFile","");

if ( producedEcalMappingElectronics_ ) {
if ( mappingFile_ != "" ) { // if file provided read channel map
if ( !mappingFile_.empty() ) { // if file provided read channel map
setWhatProduced( this, &EcalTrivialConditionRetriever::getMappingFromConfiguration );
} else {
setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalMappingElectronics );
Expand Down Expand Up @@ -229,7 +229,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
linearCorrectionsFile_ = ps.getUntrackedParameter<std::string>("linearCorrectionsFile","") ;

if (producedEcalLinearCorrections_) { // user asks to produce constants
if(linearCorrectionsFile_ != "") { // if file provided read constants
if(!linearCorrectionsFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLinearCorrections );
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLinearCorrections ) ;
Expand All @@ -246,7 +246,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
intercalibConstantsMCFile_ = ps.getUntrackedParameter<std::string>("intercalibConstantsMCFile","") ;

if (producedEcalIntercalibConstants_) { // user asks to produce constants
if(intercalibConstantsFile_ != "") { // if file provided read constants
if(!intercalibConstantsFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration ) ;
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibConstants ) ;
Expand All @@ -257,7 +257,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
producedEcalIntercalibConstantsMC_ = ps.getUntrackedParameter<bool>("producedEcalIntercalibConstantsMC",true);

if (producedEcalIntercalibConstantsMC_) { // user asks to produce constants
if(intercalibConstantsMCFile_ != "") { // if file provided read constants
if(!intercalibConstantsMCFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration ) ;
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibConstantsMC ) ;
Expand All @@ -270,7 +270,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
intercalibErrorsFile_ = ps.getUntrackedParameter<std::string>("intercalibErrorsFile","") ;

if (producedEcalIntercalibErrors_) { // user asks to produce constants
if(intercalibErrorsFile_ != "") { // if file provided read constants
if(!intercalibErrorsFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibErrorsFromConfiguration ) ;
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibErrors ) ;
Expand All @@ -283,7 +283,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
timeCalibConstantsFile_ = ps.getUntrackedParameter<std::string>("timeCalibConstantsFile","") ;

if (producedEcalTimeCalibConstants_) { // user asks to produce constants
if(timeCalibConstantsFile_ != "") { // if file provided read constants
if(!timeCalibConstantsFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::getTimeCalibConstantsFromConfiguration ) ;
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalTimeCalibConstants ) ;
Expand All @@ -296,7 +296,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
timeCalibErrorsFile_ = ps.getUntrackedParameter<std::string>("timeCalibErrorsFile","") ;

if (producedEcalTimeCalibErrors_) { // user asks to produce constants
if(timeCalibErrorsFile_ != "") { // if file provided read constants
if(!timeCalibErrorsFile_.empty()) { // if file provided read constants
setWhatProduced (this, &EcalTrivialConditionRetriever::getTimeCalibErrorsFromConfiguration ) ;
} else { // set all constants to 1. or smear as specified by user
setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalTimeCalibErrors ) ;
Expand Down Expand Up @@ -372,7 +372,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
channelStatusFile_ = ps.getUntrackedParameter<std::string>("channelStatusFile","");

if ( producedEcalChannelStatus_ ) {
if ( channelStatusFile_ != "" ) { // if file provided read channel map
if ( !channelStatusFile_.empty() ) { // if file provided read channel map
setWhatProduced( this, &EcalTrivialConditionRetriever::getChannelStatusFromConfiguration );
} else { // set all channels to working -- FIXME might be changed
setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalChannelStatus );
Expand Down Expand Up @@ -409,7 +409,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
trgChannelStatusFile_ = ps.getUntrackedParameter<std::string>("trgChannelStatusFile","");

if ( producedEcalTrgChannelStatus_ ) {
if ( trgChannelStatusFile_ != "" ) { // if file provided read channel map
if ( !trgChannelStatusFile_.empty() ) { // if file provided read channel map
setWhatProduced( this, &EcalTrivialConditionRetriever::getTrgChannelStatusFromConfiguration );
} else { // set all channels to working -- FIXME might be changed
setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalTrgChannelStatus );
Expand Down Expand Up @@ -1101,7 +1101,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd&
}
ical->setValue( ebdetid, alpha );

if((ic==1650 )){
if( ic==1650 ){
std::cout << " ic/alpha "<<ic<<"/"<<alpha<<std::endl;
}

Expand All @@ -1124,7 +1124,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd&
ical->setValue( ebid, alpha );
std::cout << " ieta/iphi/alpha "<<ieta<<"/"<<iphi<<"/"<<alpha<<std::endl;
}
if((ieta==10)){
if( ieta==10 ){
std::cout << "I will print some alphas from the file... ieta/iphi/alpha "<<ieta<<"/"<<iphi<<"/"<<alpha<<std::endl;
}
}
Expand Down
3 changes: 1 addition & 2 deletions CalibCalorimetry/HcalAlgos/src/HcalLogicalMapGenerator.cc
View file
Expand Up @@ -1659,10 +1659,9 @@ void HcalLogicalMapGenerator::buildCALIBMap(const HcalTopology* topo,
}
}
}
ic++;

/*HO calibration channels*/
for(ic=ic; ic<NCALIBCR; ic++){
for(ic=ic+1 ; ic<NCALIBCR; ic++){
icrate=calibcrate[ic];
irm_fi = 1;// everything other than he is on A
ifed=fedcalibnum[ic][idcc-1];
Expand Down

0 comments on commit b298817

Please sign in to comment.