Skip to content

Commit

Permalink
Merge pull request #21803 from bsunanda/Phase2-hgx94
Browse files Browse the repository at this point in the history
Phase2-hgx94 Remove the sqaure cell option for HGCal
  • Loading branch information
cmsbuild committed Jan 9, 2018
2 parents fab869c + 197956e commit 52b0706
Show file tree
Hide file tree
Showing 43 changed files with 79 additions and 14,214 deletions.
20 changes: 2 additions & 18 deletions Geometry/CaloTopology/src/HGCalTopology.cc
Expand Up @@ -198,29 +198,13 @@ DetId HGCalTopology::encode(const HGCalTopology::DecodedDetId& id_) const {
DetId HGCalTopology::changeXY(const DetId& id, int nrStepsX,
int nrStepsY ) const {

HGCalTopology::DecodedDetId id_ = decode(id);
std::pair<int,int> kcell= hdcons_.newCell(id_.iCell,id_.iLay,id_.iSec,
id_.iSubSec,nrStepsX,nrStepsY,
half_);
id_.iSubSec= kcell.second;
id_.iSec = (kcell.second > 0) ? kcell.second : -kcell.second;
id_.iCell = kcell.first;
DetId nextPoint = encode(id_);
if (valid(nextPoint)) return nextPoint;
else return DetId(0);
return DetId();
}


DetId HGCalTopology::changeZ(const DetId& id, int nrStepsZ) const {

HGCalTopology::DecodedDetId id_ = decode(id);
std::pair<int,int> kcell = hdcons_.newCell(id_.iCell,id_.iLay,
id_.iSubSec,nrStepsZ,half_);
id_.iLay = kcell.second;
id_.iCell = kcell.first;
DetId nextPoint = encode(id_);
if (valid(nextPoint)) return nextPoint;
else return DetId(0);
return DetId();
}

#include "FWCore/Utilities/interface/typelookup.h"
Expand Down
4,591 changes: 0 additions & 4,591 deletions Geometry/HGCalCommonData/data/eta4/hgcalEE.xml

This file was deleted.

1,217 changes: 0 additions & 1,217 deletions Geometry/HGCalCommonData/data/eta4/hgcalHEgem.xml

This file was deleted.

1,168 changes: 0 additions & 1,168 deletions Geometry/HGCalCommonData/data/eta4/hgcalHEsci.xml

This file was deleted.

1,832 changes: 0 additions & 1,832 deletions Geometry/HGCalCommonData/data/eta4/hgcalHEsil.xml

This file was deleted.

102 changes: 0 additions & 102 deletions Geometry/HGCalCommonData/data/hgcal/v1/hgcal.xml

This file was deleted.

99 changes: 0 additions & 99 deletions Geometry/HGCalCommonData/data/hgcal/v2/hgcal.xml

This file was deleted.

99 changes: 0 additions & 99 deletions Geometry/HGCalCommonData/data/hgcal/v3/hgcal.xml

This file was deleted.

0 comments on commit 52b0706

Please sign in to comment.