Skip to content

Commit

Permalink
Merge pull request #23386 from vkhristenko/hcalhbhedf_constexpr_10_2_…
Browse files Browse the repository at this point in the history 
…0_pre4

Hcal DetIds/Digi DataFrames adjustments to be used with cuda
  • Loading branch information
@cmsbuild
cmsbuild committed Jun 6, 2018
2 parents 876eed4 + 6cc610f commit 6c2de83
Show file tree
Hide file tree
Showing 21 changed files with 908 additions and 780 deletions.
22 changes: 11 additions & 11 deletions DataFormats/Common/interface/DataFrame.h
View file
Expand Up @@ -22,9 +22,9 @@ namespace edm {
typedef data_type const * const_iterator;


inline
constexpr inline
DataFrame() : m_id(0), m_data(nullptr), m_size(0){}
inline
constexpr inline
DataFrame(id_type i, data_type const * idata, size_type isize) :
m_id(i), m_data(idata), m_size(isize) {}

Expand All @@ -34,40 +34,40 @@ namespace edm {
inline
void set(DataFrameContainer const & icont,
size_type i);
inline
constexpr inline
data_type & operator[](size_type i) {
return data()[i];
}

inline
constexpr inline
data_type operator[](size_type i) const {
return m_data[i];
}

inline
constexpr inline
iterator begin() { return data();}

inline
constexpr inline
iterator end() { return data()+m_size;}

inline
constexpr inline
const_iterator begin() const { return m_data;}

inline
constexpr inline
const_iterator end() const { return m_data+m_size;}


inline
constexpr inline
id_type id() const { return m_id;}

inline
constexpr inline
size_type size() const { return m_size; }

private:
//for testing
friend class ::TestDataFrame;

data_type * data() {
constexpr data_type * data() {
return const_cast<data_type *>(m_data);
}

Expand Down
259 changes: 229 additions & 30 deletions DataFormats/HcalDetId/interface/HcalDetId.h
View file
Expand Up @@ -4,6 +4,7 @@
#include <iosfwd>
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
#include "FWCore/Utilities/interface/Exception.h"


/** \class HcalDetId
Expand Down Expand Up @@ -31,63 +32,261 @@ class HcalDetId : public DetId {

public:
/** Create a null cellid*/
HcalDetId();
constexpr HcalDetId() : DetId() {
}
/** Create cellid from raw id (0=invalid tower id) */
HcalDetId(uint32_t rawid);
constexpr HcalDetId(uint32_t rawid) {
if ((DetId::Detector(rawid>>DetId::kDetOffset)&DetId::kDetMask) != Hcal) {
id_ = rawid;
} else {
HcalSubdetector subdet = (HcalSubdetector)((rawid>>DetId::kSubdetOffset)&DetId::kSubdetMask);
if ((subdet==HcalBarrel) || (subdet==HcalEndcap) ||
(subdet==HcalOuter) || (subdet==HcalForward)) {
id_ = newForm(rawid);
} else {
id_ = rawid;
}
}
}

/** Constructor from subdetector, signed tower ieta,iphi,and depth */
HcalDetId(HcalSubdetector subdet, int tower_ieta, int tower_iphi, int depth);
constexpr HcalDetId(HcalSubdetector subdet, int tower_ieta, int tower_iphi, int depth) : DetId(Hcal,subdet) {
// (no checking at this point!)
id_ |= (kHcalIdFormat2) | ((depth&kHcalDepthMask2)<<kHcalDepthOffset2) |
((tower_ieta>0)?(kHcalZsideMask2|(tower_ieta<<kHcalEtaOffset2)):((-tower_ieta)<<kHcalEtaOffset2)) |
(tower_iphi&kHcalPhiMask2);
}
/** Constructor from a generic cell id */
HcalDetId(const DetId& id);
constexpr HcalDetId(const DetId& gen) {
if (!gen.null()) {
HcalSubdetector subdet=(HcalSubdetector(gen.subdetId()));
if (gen.det()!=Hcal ||
(subdet!=HcalBarrel && subdet!=HcalEndcap &&
subdet!=HcalOuter && subdet!=HcalForward &&
subdet!=HcalTriggerTower && subdet!=HcalOther)) {
throw cms::Exception("Invalid DetId") << "Cannot initialize HcalDetId from " << std::hex << gen.rawId() << std::dec;
}
if ((subdet==HcalBarrel) || (subdet==HcalEndcap) ||
(subdet==HcalOuter) || (subdet==HcalForward)) {
id_ = newForm(gen.rawId());
} else {
id_ = gen.rawId();
}
} else {
id_ = gen.rawId();
}
}
/** Assignment from a generic cell id */
HcalDetId& operator=(const DetId& id);
constexpr HcalDetId& operator=(const DetId& gen) {
if (!gen.null()) {
HcalSubdetector subdet=(HcalSubdetector(gen.subdetId()));
if (gen.det()!=Hcal ||
(subdet!=HcalBarrel && subdet!=HcalEndcap &&
subdet!=HcalOuter && subdet!=HcalForward &&
subdet!=HcalTriggerTower && subdet!=HcalOther)) {
throw cms::Exception("Invalid DetId") << "Cannot assign HcalDetId from " << std::hex << gen.rawId() << std::dec;
}
if ((subdet==HcalBarrel) || (subdet==HcalEndcap) ||
(subdet==HcalOuter) || (subdet==HcalForward)) {
id_ = newForm(gen.rawId());
} else {
id_ = gen.rawId();
}
} else {
id_ = gen.rawId();
}
return (*this);
}

/** Comparison operator */
bool operator==(DetId id) const;
bool operator!=(DetId id) const;
bool operator<(DetId id) const;
constexpr bool operator==(DetId gen) const {
uint32_t rawid = gen.rawId();
if (rawid == id_) return true;
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(rawid, zsid, eta, phi, dep);
bool result = (((id_&kHcalIdMask) == (rawid&kHcalIdMask)) && (zsid==zside())
&& (eta==ietaAbs()) && (phi==iphi()) && (dep==depth()));
return result;
}
constexpr bool operator!=(DetId gen) const {
uint32_t rawid = gen.rawId();
if (rawid == id_) return false;
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(rawid, zsid, eta, phi, dep);
bool result = (((id_&kHcalIdMask)!=(rawid&kHcalIdMask)) || (zsid!=zside())
|| (eta!=ietaAbs()) || (phi!=iphi()) || (dep!=depth()));
return result;
}
constexpr bool operator<(DetId gen) const {
uint32_t rawid = gen.rawId();
if ((rawid&kHcalIdFormat2)==(id_&kHcalIdFormat2)) {
return id_<rawid;
} else {
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(rawid, zsid, eta, phi, dep);
rawid &= kHcalIdMask;
if (oldFormat()) {
rawid |= ((dep&kHcalDepthMask1)<<kHcalDepthOffset1) |
((zsid>0)?(kHcalZsideMask1|(eta<<kHcalEtaOffset1)):((eta)<<kHcalEtaOffset1)) |
(phi&kHcalPhiMask1);
} else {
rawid |= (kHcalIdFormat2) | ((dep&kHcalDepthMask2)<<kHcalDepthOffset2) |
((zsid>0)?(kHcalZsideMask2|(eta<<kHcalEtaOffset2)):((eta)<<kHcalEtaOffset2)) |
(phi&kHcalPhiMask2);
}
return (id_<rawid);
}
}

/// get the subdetector
HcalSubdetector subdet() const { return (HcalSubdetector)(subdetId()); }
bool oldFormat() const { return ((id_&kHcalIdFormat2)==0)?(true):(false); }
constexpr HcalSubdetector subdet() const { return (HcalSubdetector)(subdetId()); }
constexpr bool oldFormat() const { return ((id_&kHcalIdFormat2)==0)?(true):(false); }
/// get the z-side of the cell (1/-1)
int zside() const;
constexpr int zside() const {
if (oldFormat()) return (id_&kHcalZsideMask1)?(1):(-1);
else return (id_&kHcalZsideMask2)?(1):(-1);
}
/// get the absolute value of the cell ieta
int ietaAbs() const;
constexpr int ietaAbs() const {
if (oldFormat()) return (id_>>kHcalEtaOffset1)&kHcalEtaMask1;
else return (id_>>kHcalEtaOffset2)&kHcalEtaMask2;
}
/// get the cell ieta
int ieta() const { return zside()*ietaAbs(); }
constexpr int ieta() const { return zside()*ietaAbs(); }
/// get the cell iphi
int iphi() const;
constexpr int iphi() const {
if (oldFormat()) return id_&kHcalPhiMask1;
else return id_&kHcalPhiMask2;
}
/// get the tower depth
int depth() const;
constexpr int depth() const {
if (oldFormat()) return (id_>>kHcalDepthOffset1)&kHcalDepthMask1;
else return (id_>>kHcalDepthOffset2)&kHcalDepthMask2;
}
/// get full depth information for HF
int hfdepth() const;
constexpr int hfdepth() const {
int dep = depth();
if (subdet() == HcalForward) {
if (dep > 2) dep -= 2;
}
return dep;
}
/// get the tower depth
uint32_t maskDepth() const;
constexpr uint32_t maskDepth() const {
if (oldFormat()) return (id_|kHcalDepthSet1);
else return (id_|kHcalDepthSet2);
}
/// change format
uint32_t otherForm() const;
void changeForm();
uint32_t newForm() const;
static uint32_t newForm(const uint32_t&);
constexpr uint32_t otherForm() const {
uint32_t rawid = (id_&kHcalIdMask);
if (oldFormat()) {
rawid = newForm(id_);
} else {
rawid |= ((depth()&kHcalDepthMask1)<<kHcalDepthOffset1) |
((ieta()>0)?(kHcalZsideMask1|(ieta()<<kHcalEtaOffset1)):((-ieta())<<kHcalEtaOffset1)) |
(iphi()&kHcalPhiMask1);
}
return rawid;
}
constexpr void changeForm() {
id_ = otherForm();
}
constexpr uint32_t newForm() const {
return newForm(id_);
}
constexpr static int32_t newForm(const uint32_t& inpid) {
uint32_t rawid(inpid);
if ((rawid&kHcalIdFormat2)==0) {
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(rawid, zsid, eta, phi, dep);
rawid = inpid&kHcalIdMask;
rawid |= (kHcalIdFormat2) | ((dep&kHcalDepthMask2)<<kHcalDepthOffset2) |
((zsid>0)?(kHcalZsideMask2|(eta<<kHcalEtaOffset2)):((eta)<<kHcalEtaOffset2)) |
(phi&kHcalPhiMask2);
}
return rawid;
}
/// base detId for HF dual channels
bool sameBaseDetId(const DetId&) const;
HcalDetId baseDetId() const;
constexpr bool sameBaseDetId(const DetId& gen) const {
uint32_t rawid = gen.rawId();
if (rawid == id_) return true;
int zsid{0}, eta{0}, phi{0}, dep{0};
if ((id_&kHcalIdMask) != (rawid&kHcalIdMask)) return false;
unpackId(rawid, zsid, eta, phi, dep);
if (subdet() == HcalForward && dep > 2) dep -= 2;
bool result = ((zsid==zside()) && (eta==ietaAbs()) && (phi==iphi()) &&
(dep==hfdepth()));
return result;
}
constexpr HcalDetId baseDetId() const {
if (subdet() != HcalForward || depth() <= 2) {
return HcalDetId(id_);
} else {
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(id_, zsid, eta, phi, dep);
dep -= 2;
uint32_t rawid = id_&kHcalIdMask;
rawid |= (kHcalIdFormat2) | ((dep&kHcalDepthMask2)<<kHcalDepthOffset2) |
((zsid>0)?(kHcalZsideMask2|(eta<<kHcalEtaOffset2)):((eta)<<kHcalEtaOffset2)) |
(phi&kHcalPhiMask2);
return HcalDetId(rawid);
}
}
/// second PMT anode detId for HF dual channels
HcalDetId secondAnodeId() const;
constexpr HcalDetId secondAnodeId() const {
if (subdet() != HcalForward || depth() > 2) {
return HcalDetId(id_);
} else {
int zsid{0}, eta{0}, phi{0}, dep{0};
unpackId(id_, zsid, eta, phi, dep);
dep += 2;
uint32_t rawid = id_&kHcalIdMask;
rawid |= (kHcalIdFormat2) | ((dep&kHcalDepthMask2)<<kHcalDepthOffset2) |
((zsid>0)?(kHcalZsideMask2|(eta<<kHcalEtaOffset2)):((eta)<<kHcalEtaOffset2)) |
(phi&kHcalPhiMask2);
return HcalDetId(rawid);
}
}

/// get the smallest crystal_ieta of the crystal in front of this tower (HB and HE tower 17 only)
int crystal_ieta_low() const { return ((ieta()-zside())*5)+zside(); }
constexpr int crystal_ieta_low() const { return ((ieta()-zside())*5)+zside(); }
/// get the largest crystal_ieta of the crystal in front of this tower (HB and HE tower 17 only)
int crystal_ieta_high() const { return ((ieta()-zside())*5)+5*zside(); }
constexpr int crystal_ieta_high() const { return ((ieta()-zside())*5)+5*zside(); }
/// get the smallest crystal_iphi of the crystal in front of this tower (HB and HE tower 17 only)
int crystal_iphi_low() const;
constexpr int crystal_iphi_low() const {
int simple_iphi=((iphi()-1)*5)+1;
simple_iphi+=10;
return ((simple_iphi>360)?(simple_iphi-360):(simple_iphi));
}
/// get the largest crystal_iphi of the crystal in front of this tower (HB and HE tower 17 only)
int crystal_iphi_high() const;
constexpr int crystal_iphi_high() const {
int simple_iphi=((iphi()-1)*5)+5;
simple_iphi+=10;
return ((simple_iphi>360)?(simple_iphi-360):(simple_iphi));
}

static const HcalDetId Undefined;

private:

void newFromOld(const uint32_t&);
static void unpackId(const uint32_t&, int&, int&, int&, int&);
constexpr void newFromOld(const uint32_t& rawid) {
id_ = newForm(rawid);
}

constexpr static void unpackId(const uint32_t& rawid, int& zsid, int& eta, int& phi,
int& dep) {
if ((rawid&kHcalIdFormat2)==0) {
zsid = (rawid&kHcalZsideMask1)?(1):(-1);
eta = (rawid>>kHcalEtaOffset1)&kHcalEtaMask1;
phi = rawid&kHcalPhiMask1;
dep = (rawid>>kHcalDepthOffset1)&kHcalDepthMask1;
} else {
zsid = (rawid&kHcalZsideMask2)?(1):(-1);
eta = (rawid>>kHcalEtaOffset2)&kHcalEtaMask2;
phi = rawid&kHcalPhiMask2;
dep = (rawid>>kHcalDepthOffset2)&kHcalDepthMask2;
}
}
};

std::ostream& operator<<(std::ostream&,const HcalDetId& id);
Expand Down

0 comments on commit 6c2de83

Please sign in to comment.