Skip to content

Commit

Permalink
Merge pull request cms-sw#10214 from ianna/hcal-dd-constants-memory-c…
Browse files Browse the repository at this point in the history 
…leanup

Hcal DD Rec and Sim Constants Cleanup
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 16, 2015
2 parents 2b171f4 + ec2c9c1 commit 7ad1586
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 144 deletions.
31 changes: 10 additions & 21 deletions Geometry/HcalCommonData/interface/HcalDDDRecConstants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,57 +52,46 @@ class HcalDDDRecConstants {
else if (type == 1) return gconsHE;
else {std::vector<std::pair<double,double> > gcons; return gcons;}
}
const std::vector<int> & getDepth(const int i) const {return layerGroup[i];}
const std::vector<int> & getDepth(const unsigned int i) const;
std::vector<HcalEtaBin> getEtaBins(const int itype) const;
std::pair<double,double> getEtaPhi(int subdet, int ieta, 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;}
{return std::pair<int,int>(hpar->etaMin[i],hpar->etaMax[i]);}
const std::vector<double> & getEtaTable() const {return hpar->etaTable;}
const std::vector<double> & getEtaTableHF() const {return hpar->etaTableHF;}
std::pair<double,double> getEtaLimit(const int i) const
{return std::pair<double,double>(etaTable[i],etaTable[i+1]);}
{return std::pair<double,double>(hpar->etaTable[i],hpar->etaTable[i+1]);}
HcalID getHCID(int subdet, int ieta, int iphi, int lay,
int idepth) const;
int getMaxDepth(const int type) const {return maxDepth[type];}
int getNEta() const {return nEta;}
int getMaxDepth(const int type) const {return hpar->maxDepth[type];}
int getNEta() const {return hpar->etagroup.size();}
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;}
const std::vector<double> & getPhiTable() const {return phibin;}
const std::vector<double> & getPhiTableHF() const {return phibinHF;}
const std::vector<double> & getPhiTableHF() const {return hpar->phitable;}
double getRZ(int subdet, int ieta, int depth) const;
std::vector<HcalActiveLength> getThickActive(const int type) const;
int getTopoMode() const {return modeTopo_;}
int getTopoMode() const {return hpar->topologyMode;}
std::vector<HcalCellType> HcalCellTypes(HcalSubdetector) const;
unsigned int numberOfCells(HcalSubdetector) const;
unsigned int nCells(HcalSubdetector) const;
unsigned int nCells() const;

private:
void initialize(void);
unsigned int layerGroupSize( unsigned int eta ) const;
unsigned int layerGroup( unsigned int eta, unsigned int i ) const;

bool tobeInitialized;
static const int nEtaMax=100;
const HcalParameters *hpar;
const HcalDDDSimConstants &hcons;
int modeTopo_; // Mode for topology
std::vector<int> etaGroup; // Eta Grouping
std::vector<std::pair<int,int> > etaSimValu; // eta ranges at Sim stage
std::vector<double> etaTable; // Eta table (HB+HE)
std::vector<int> ietaMap; // Map Sim level ieta to Rec level ieta
std::vector<int> iEtaMin, iEtaMax; // Minimum and maximum eta
std::vector<int> maxDepth; // Maximum depth in HB/HE/HF/HO
int nEta; // Number of bins in eta for HB and HE
std::vector<int> phiGroup; // Eta Grouping
std::vector<double> phibin; // Phi step for all eta bins (HB, HE, HO)
std::vector<double> phibinHF; // Phi step for all eta bins (HF)
std::vector<int> phiUnitS; // Phi unit at SIM stage
std::vector<int> layerGroup[nEtaMax];
std::vector<int> nOff; // Speical eta bin #'s in barrel and endcap
std::vector<std::pair<double,double> > gconsHB; // Geometry constatnts HB
std::vector<std::pair<double,double> > gconsHE; // Geometry constatnts HE
int nModule[2], nHalves[2]; // Modules, Halves for HB/HE
enum { kHOSizePreLS1 = 2160, kHFSizePreLS1 = 1728 } ;
};

#endif
6 changes: 3 additions & 3 deletions Geometry/HcalCommonData/interface/HcalDDDSimConstants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class HcalDDDSimConstants {
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]);}
std::vector<double> getEtaTableHF() const;
unsigned int findLayer(int layer, const std::vector<HcalParameters::LayerItem>& layerGroup) const;
const std::vector<double> & getGparHF() const {return hpar->gparHF;}
const std::vector<double> & getLayer0Wt() const {return hpar->Layer0Wt;}
Expand All @@ -62,15 +61,16 @@ class HcalDDDSimConstants {
double getGain (HcalSubdetector subdet, int depth) const;
void printTileHB(int eta, int depth) const;
void printTileHE(int eta, int depth) const;
unsigned int layerGroupSize( unsigned int eta ) const;
unsigned int layerGroup( unsigned int eta, unsigned int i ) const;

const HcalParameters* hpar;
static const int nEtaMax=100;

static const int nDepthMax=9;
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
int nPhiF; // Number of bins in phitable
std::vector<int> layerGroup[nEtaMax]; // Depth index for a given layer
std::vector<int> depths[nDepthMax]; // Maximum layer number for a depth
int nDepth; // Number of bins in depth0
int nzHB, nmodHB; // Number of halves and modules in HB
Expand Down
Loading

0 comments on commit 7ad1586

Please sign in to comment.