Skip to content

Commit

Permalink
Fix some const's
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Aug 28, 2017
1 parent c6f583e commit 83019df
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 183 deletions.
60 changes: 31 additions & 29 deletions Geometry/HcalCommonData/interface/HcalDDDRecConstants.h
View file
Expand Up @@ -58,49 +58,51 @@ class HcalDDDRecConstants {
nPhi(nfi), rMin(r1), rMax(r2) {}
};

std::vector<std::pair<double,double> > getConstHBHE(int type) const {
std::vector<std::pair<double,double> > getConstHBHE(const int& type) const {
if (type == 0) return gconsHB;
else if (type == 1) return gconsHE;
else {std::vector<std::pair<double,double> > gcons; return gcons;}
}
std::vector<int> getDepth(int det, int phi,
int zside, unsigned int eta) const;
std::vector<int> getDepth(unsigned int eta, bool extra) const;
int getDepthEta16(const int det, const int iphi,
const int zside) const {return hcons.getDepthEta16(det,iphi,zside);}
std::vector<HcalEtaBin> getEtaBins(int itype) const;
std::pair<double,double> getEtaPhi(int subdet, int ieta, int iphi) const;
std::pair<int,int> getEtaRange(int i) const
std::vector<int> getDepth(const int& det, const int& phi,
const int& zside, const unsigned int& eta) const;
std::vector<int> getDepth(const unsigned int& eta, const bool& extra) const;
int getDepthEta16(const int& det, const int& iphi,
const int& zside) const {return hcons.getDepthEta16(det,iphi,zside);}
std::vector<HcalEtaBin> getEtaBins(const int& itype) const;
std::pair<double,double> getEtaPhi(const int& subdet, const int& ieta, const int& iphi) const;
std::pair<int,int> getEtaRange(const int& i) const
{return std::pair<int,int>(iEtaMin[i],iEtaMax[i]);}
const std::vector<double> & getEtaTable() const {return etaTable;}
const std::vector<double> & getEtaTableHF() const {return hpar->etaTableHF;}
std::pair<double,double> getEtaLimit(int i) const
std::pair<double,double> getEtaLimit(const int& i) const
{return std::pair<double,double>(etaTable[i],etaTable[i+1]);}
HcalID getHCID(int subdet, int ieta, int iphi, int lay,
int idepth) const;
HcalID getHCID(int subdet, int ieta, int iphi, int lay, int idepth) const;
std::vector<HFCellParameters> getHFCellParameters() const;
void getLayerDepth(const int ieta, std::map<int,int>& layers) const;
int getLayerFront(const int det, const int eta, const int phi, const int depth) const;
double getLayer0Wt(const int det, const int phi, const int zside) const {return hcons.getLayer0Wt(det,phi,zside);}
int getMaxDepth(const int type) const {return maxDepth[type];}
int getMaxDepth(int itype, int ieta,
int iphi, int zside) const;
int getMinDepth(int itype, int ieta,
int iphi, int zside) const;
void getLayerDepth(const int& ieta, std::map<int,int>& layers) const;
int getLayerFront(const int& det, const int& eta, const int& phi,
const int& depth) const;
double getLayer0Wt(const int& det, const int& phi,
const int& zside) const {return hcons.getLayer0Wt(det,phi,zside);}
int getMaxDepth(const int& type) const {return maxDepth[type];}
int getMaxDepth(const int& itype, const int& ieta,
const int& iphi, const int& zside) const;
int getMinDepth(const int& itype, const int& ieta,
const int& iphi, const int& zside) const;
int getNEta() const {return hpar->etagroup.size();}
int getNoff(int i) const {return hpar->noff[i];}
int getNPhi(int type) const {return nPhiBins[type];}
double getPhiBin(int i) const {return phibin[i];}
double getPhiOff(int i) const {return hpar->phioff[i];}
int getNoff(const int& i) const {return hpar->noff[i];}
int getNPhi(const int& type) const {return nPhiBins[type];}
double getPhiBin(const int& i) const {return phibin[i];}
double getPhiOff(const int& i) const {return hpar->phioff[i];}
const std::vector<double> & getPhiOffs() const {return hpar->phioff;}
std::vector<std::pair<int,double> > getPhis(int subdet, int ieta) const;
std::vector<std::pair<int,double> > getPhis(const int& subdet, const int& ieta) const;
const std::vector<double> & getPhiTable() const {return phibin;}
const std::vector<double> & getPhiTableHF() const {return hpar->phitable;}
int getPhiZOne(std::vector<std::pair<int,int> >& phiz) const;
double getRZ(int subdet, int ieta, int depth) const;
double getRZ(int subdet, int ieta, int iphi, int depth) const;
double getRZ(int subdet, int layer) const;
std::vector<HcalActiveLength> getThickActive(int type) const;
double getRZ(const int& subdet, const int& ieta, const int& depth) const;
double getRZ(const int& subdet, const int& ieta, const int& iphi,
const int& depth) const;
double getRZ(const int& subdet, const int& layer) const;
std::vector<HcalActiveLength> getThickActive(const int& type) const;
int getTopoMode() const {return ((hpar->topologyMode)&0xFF);}
int getTriggerMode() const {return (((hpar->topologyMode)>>8)&0xFF);}
std::vector<HcalCellType> HcalCellTypes(HcalSubdetector) const;
Expand Down
126 changes: 61 additions & 65 deletions Geometry/HcalCommonData/interface/HcalDDDSimConstants.h
View file
Expand Up @@ -28,80 +28,80 @@ class HcalDDDSimConstants {
HcalDDDSimConstants(const HcalParameters* hp);
~HcalDDDSimConstants();

HcalCellType::HcalCell cell(int det, int zside,
int depth, int etaR,
int iphi) const;
int findDepth(int det, int eta,
int phi, int zside,
int lay) const;
unsigned int findLayer(int layer, const std::vector<HcalParameters::LayerItem>& layerGroup) const;
std::vector<std::pair<double,double> > getConstHBHE(int type) const;
int getDepthEta16(int det, int phi,
int zside) const;
int getDepthEta16M(int det) const;
int getDepthEta29(int phi, int zside, int i) const;
int getDepthEta29M(int i, bool planOne) const;
std::pair<int,double> getDetEta(double eta, int depth);
int getEta(int det, int lay, double hetaR);
std::pair<int,int> getEtaDepth(int det, int etaR, int phi,
int zside, int depth, int lay);
double getEtaHO(double& etaR, double& x, double& y,
double& z) const;
std::pair<int,int> getiEtaRange(const int i) const {return std::pair<int,int>(hpar->etaMin[i],hpar->etaMax[i]);}
HcalCellType::HcalCell cell(const int& det, const int& zside, const int& depth,
const int& etaR, const int& iphi) const;
int findDepth(const int& det, const int& eta, const int& phi,
const int& zside, const int& lay) const;
unsigned int findLayer(const int& layer, const std::vector<HcalParameters::LayerItem>& layerGroup) const;
std::vector<std::pair<double,double> > getConstHBHE(const int& type) const;
int getDepthEta16(const int& det, const int& phi,
const int& zside) const;
int getDepthEta16M(const int& det) const;
int getDepthEta29(const int& phi, const int& zside, const int& i) const;
int getDepthEta29M(const int& i, const bool& planOne) const;
std::pair<int,double> getDetEta(const double& eta, const int& depth);
int getEta(const int& det, const int& lay, const double& hetaR);
std::pair<int,int> getEtaDepth(const int& det, int etaR, const int& phi,
const int& zside, int depth, const int& lay);
double getEtaHO(const double& etaR, const double& x, const double& y,
const double& z) const;
std::pair<int,int> getiEtaRange(const int& i) const {return std::pair<int,int>(hpar->etaMin[i],hpar->etaMax[i]);}
const std::vector<double> & getEtaTableHF() const {return hpar->etaTableHF;}
const std::vector<double> & getGparHF() const {return hpar->gparHF;}
const std::vector<HcalDetId> & getIdHF2QIE() const {return idHF2QIE;}
double getLayer0Wt(const int det, const int phi,
const int zside) const;
int getFrontLayer(const int det, const int eta) const;
int getLastLayer(const int det, const int eta) const;
int getLayerFront(const int det, const int eta,
const int phi, const int zside,
const int depth) const;
int getLayerBack(const int det, const int eta,
const int phi, const int zside,
const int depth) const;
int getLayerMax(const int eta, const int depth) const;
int getMaxDepth(const int type) const {return maxDepth[type];}
int getMaxDepth(int det, int eta,
int phi, int zside,
bool partialOnly) const;
std::pair<int,int> getMaxDepthDet(const int i) const {return ((i==1) ? depthMaxDf_ : depthMaxSp_);}
int getMinDepth(int det, int eta,
int phi, int zside,
bool partialOnly) const;
std::pair<int,int> getModHalfHBHE(int type) const;
std::pair<double,double> getPhiCons(int det, int ieta) const;
std::vector<std::pair<int,double> > getPhis(int subdet, int ieta) const;
double getLayer0Wt(const int& det, const int& phi,
const int& zside) const;
int getFrontLayer(const int& det, const int& eta) const;
int getLastLayer(const int& det, const int& eta) const;
int getLayerFront(const int& det, const int& eta,
const int& phi, const int& zside,
const int& depth) const;
int getLayerBack(const int& det, const int& eta,
const int& phi, const int& zside,
const int& depth) const;
int getLayerMax(const int& eta, const int& depth) const;
int getMaxDepth(const int& type) const {return maxDepth[type];}
int getMaxDepth(const int& det, const int& eta,
const int& phi, const int& zside,
const bool& partialOnly) const;
std::pair<int,int> getMaxDepthDet(const int& i) const {return ((i==1) ? depthMaxDf_ : depthMaxSp_);}
int getMinDepth(const int& det, const int& eta,
const int& phi, const int& zside,
const bool& partialOnly) const;
std::pair<int,int> getModHalfHBHE(const int& type) const;
std::pair<double,double> getPhiCons(const int& det, const int& ieta) const;
std::vector<std::pair<int,double> > getPhis(const int& subdet, const int& ieta) const;
const std::vector<double> & getPhiTableHF() const {return hpar->phitable;}
const std::vector<double> & getRTableHF() const {return hpar->rTable;}
std::vector<HcalCellType> HcalCellTypes() const;
std::vector<HcalCellType> HcalCellTypes(HcalSubdetector, int ieta=-1,
std::vector<HcalCellType> HcalCellTypes(const HcalSubdetector&, int ieta=-1,
int depth=-1) const;
bool isBH() const {return isBH_;}
const HcalLayerDepthMap* ldMap() const {return &ldmap_;}
int maxHFDepth(int ieta, int iphi) const;
unsigned int numberOfCells(HcalSubdetector) const;
int phiNumber(int phi, int unit) const;
int maxHFDepth(const int& ieta, const int& iphi) const;
unsigned int numberOfCells(const HcalSubdetector&) const;
int phiNumber(const int& phi, const int& unit) const;
void printTiles() const;
int unitPhi(int det, int etaR) const;
int unitPhi(double dphi) const;
int unitPhi(const int& det, const int& etaR) const;
int unitPhi(const double& dphi) const;

private:

static const int nDepthMax=9;
static const int maxLayer_=18;
static const int maxLayerHB_=16;

void initialize();
double deltaEta(int det, int eta,
int depth) const;
double getEta(int det, int etaR,
int zside, int depth=1) const;
double getEta(double r, double z) const;
int getShift(HcalSubdetector subdet,
int depth) const;
double getGain (HcalSubdetector subdet,
int depth) const;
void printTileHB(int eta, int phi,
int zside, int depth) const;
void printTileHE(int eta, int phi,
int zside, int depth) const;
double deltaEta(const int& det, const int& eta, const int& depth) const;
double getEta(const int& det, const int& etaR,
const int& zside, int depth=1) const;
double getEta(const double& r, const double& z) const;
int getShift(const HcalSubdetector& subdet, const int& depth) const;
double getGain (const HcalSubdetector& subdet, const int& depth) const;
void printTileHB(const int& eta, const int& phi,
const int& zside, const int& depth) const;
void printTileHE(const int& eta, const int& phi,
const int& zside, const int& depth) const;
unsigned int layerGroupSize(int eta) const;
unsigned int layerGroup(int eta, int i) const;
unsigned int layerGroup(int det, int eta,
Expand All @@ -111,10 +111,6 @@ class HcalDDDSimConstants {
const HcalParameters* hpar;
HcalLayerDepthMap ldmap_;

static const int nDepthMax=9;
static const int maxLayer_=18;
static const int maxLayerHB_=16;

std::vector<int> maxDepth; // Maximum depths in HB/HE/HF/HO
int nEta; // Number of bins in eta for HB and HE
int nR; // Number of bins in r
Expand Down
39 changes: 20 additions & 19 deletions Geometry/HcalCommonData/src/HcalDDDRecConstants.cc
View file
Expand Up @@ -26,8 +26,8 @@ HcalDDDRecConstants::~HcalDDDRecConstants() {
#endif
}

std::vector<int> HcalDDDRecConstants::getDepth(unsigned int eta,
bool extra) const {
std::vector<int> HcalDDDRecConstants::getDepth(const unsigned int& eta,
const bool& extra) const {

if (!extra) {
std::vector<HcalParameters::LayerItem>::const_iterator last = hpar->layerGroupEtaRec.begin();
Expand All @@ -47,8 +47,8 @@ std::vector<int> HcalDDDRecConstants::getDepth(unsigned int eta,
}
}

std::vector<int> HcalDDDRecConstants::getDepth(int det, int phi, int zside,
unsigned int eta) const {
std::vector<int> HcalDDDRecConstants::getDepth(const int& det, const int& phi, const int& zside,
const unsigned int& eta) const {
std::map<int,int> layers;
hcons.ldMap()->getLayerDepth(det, eta+1, phi, zside, layers);
if (layers.empty()) {
Expand All @@ -62,7 +62,7 @@ std::vector<int> HcalDDDRecConstants::getDepth(int det, int phi, int zside,
}

std::vector<HcalDDDRecConstants::HcalEtaBin>
HcalDDDRecConstants::getEtaBins(int itype) const {
HcalDDDRecConstants::getEtaBins(const int& itype) const {

std::vector<HcalDDDRecConstants::HcalEtaBin> bins;
unsigned int type = (itype == 0) ? 0 : 1;
Expand Down Expand Up @@ -132,7 +132,7 @@ HcalDDDRecConstants::getEtaBins(int itype) const {
}

std::pair<double,double>
HcalDDDRecConstants::getEtaPhi(int subdet, int ieta, int iphi) const {
HcalDDDRecConstants::getEtaPhi(const int& subdet, const int& ieta, const int& iphi) const {
int ietaAbs = (ieta > 0) ? ieta : -ieta;
double eta(0), phi(0);
if ((subdet == static_cast<int>(HcalBarrel)) ||
Expand Down Expand Up @@ -271,7 +271,7 @@ HcalDDDRecConstants::getHFCellParameters() const {
return cells;
}

void HcalDDDRecConstants::getLayerDepth(int ieta, std::map<int,int>& layers) const {
void HcalDDDRecConstants::getLayerDepth(const int& ieta, std::map<int,int>& layers) const {

layers.clear();
for (unsigned int l=0; l<layerGroupSize(ieta-1); ++l) {
Expand All @@ -287,8 +287,8 @@ void HcalDDDRecConstants::getLayerDepth(int ieta, std::map<int,int>& layers) con
#endif
}

int HcalDDDRecConstants::getLayerFront(int idet, int ieta,
int iphi, int depth) const {
int HcalDDDRecConstants::getLayerFront(const int& idet, const int& ieta,
const int& iphi, const int& depth) const {
int subdet = (idet == 1) ? 1 : 2;
int zside = (ieta > 0) ? 1 : -1;
int eta = zside*ieta;
Expand All @@ -315,8 +315,8 @@ int HcalDDDRecConstants::getLayerFront(int idet, int ieta,
return layFront;
}

int HcalDDDRecConstants::getMaxDepth (int itype, int ieta,
int iphi, int zside) const {
int HcalDDDRecConstants::getMaxDepth (const int& itype, const int& ieta,
const int& iphi, const int& zside) const {

unsigned int type = (itype == 0) ? 0 : 1;
int lmax = hcons.getMaxDepth(type+1, ieta, iphi, zside, true);
Expand All @@ -337,8 +337,8 @@ int HcalDDDRecConstants::getMaxDepth (int itype, int ieta,
return lmax;
}

int HcalDDDRecConstants::getMinDepth (int itype, int ieta,
int iphi, int zside) const {
int HcalDDDRecConstants::getMinDepth (const int& itype, const int& ieta,
const int& iphi, const int& zside) const {

int lmin = hcons.getMinDepth(itype+1, ieta, iphi, zside, true);
if (lmin < 0) {
Expand All @@ -360,7 +360,7 @@ int HcalDDDRecConstants::getMinDepth (int itype, int ieta,
}

std::vector<std::pair<int,double> >
HcalDDDRecConstants::getPhis(int subdet, int ieta) const {
HcalDDDRecConstants::getPhis(const int& subdet, const int& ieta) const {

std::vector<std::pair<int,double> > phis;
int ietaAbs = (ieta > 0) ? ieta : -ieta;
Expand Down Expand Up @@ -407,13 +407,14 @@ int HcalDDDRecConstants::getPhiZOne(std::vector<std::pair<int,int>>& phiz) const
return subdet;
}

double HcalDDDRecConstants::getRZ(int subdet, int ieta, int depth) const {
double HcalDDDRecConstants::getRZ(const int& subdet, const int& ieta,
const int& depth) const {

return getRZ(subdet, ieta, 1, depth);
}

double HcalDDDRecConstants::getRZ(int subdet, int ieta, int iphi,
int depth) const {
double HcalDDDRecConstants::getRZ(const int& subdet, const int& ieta, const int& iphi,
const int& depth) const {
int layf = getLayerFront(subdet,ieta,iphi,depth);
double rz = (layf < 0) ? 0.0 :
((subdet == static_cast<int>(HcalBarrel)) ? (gconsHB[layf].first) :
Expand All @@ -426,7 +427,7 @@ double HcalDDDRecConstants::getRZ(int subdet, int ieta, int iphi,
return rz;
}

double HcalDDDRecConstants::getRZ(int subdet, int layer) const {
double HcalDDDRecConstants::getRZ(const int& subdet, const int& layer) const {

double rz(0);
if (layer > 0 && layer <= (int)(layerGroupSize(0)))
Expand All @@ -441,7 +442,7 @@ double HcalDDDRecConstants::getRZ(int subdet, int layer) const {


std::vector<HcalDDDRecConstants::HcalActiveLength>
HcalDDDRecConstants::getThickActive(int type) const {
HcalDDDRecConstants::getThickActive(const int& type) const {

std::vector<HcalDDDRecConstants::HcalActiveLength> actives;
std::vector<HcalDDDRecConstants::HcalEtaBin> bins = getEtaBins(type);
Expand Down

0 comments on commit 83019df

Please sign in to comment.