Skip to content

Commit

Permalink
added default ctors to embedded classes to avoid unit test crashing i…
Browse files Browse the repository at this point in the history
…n ROOT6 branch
  • Loading branch information
apfeiffer1 committed Feb 21, 2015
1 parent 3f78535 commit de50c68
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion CondFormats/L1TObjects/interface/CaloParams.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ namespace l1t {
// turn encoding on/off
bool doEncoding_;

TowerParams() : lsbH_(0), lsbE_(0), lsbSum_(0),
nBitsH_(0), nBitsE_(0), nBitsSum_(0), nBitsRatio_(0),
maskH_(0), maskE_(0), maskSum_(0), maskRatio_(0),
doEncoding_(false)
{ /* no-op */}

COND_SERIALIZABLE;
};

Expand Down Expand Up @@ -122,6 +128,11 @@ namespace l1t {
// veto region is seed tower +/- <=egIsoVetoNrTowersPhi
unsigned isoVetoNrTowersPhi_;

EgParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0), hcalThreshold_(0), maxHcalEt_(0), maxPtHOverE_(0),
minPtJetIsolation_(0), maxPtJetIsolation_(0), minPtHOverEIsolation_(0), maxPtHOverEIsolation_(0),
isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), isoVetoNrTowersPhi_(0)
{ /* no-op */ }

COND_SERIALIZABLE;
};

Expand Down Expand Up @@ -162,6 +173,12 @@ namespace l1t {
// veto region is seed tower +/- <=tauIsoVetoNrTowersPhi
unsigned isoVetoNrTowersPhi_;

TauParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0), maxPtTauVeto_(0),
minPtJetIsolationB_(0), maxJetIsolationB_(0), maxJetIsolationA_(0),
isoEtaMin_(0), isoEtaMax_(0),
isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), isoVetoNrTowersPhi_(0)
{ /* no-op */ }

COND_SERIALIZABLE;
};

Expand All @@ -176,6 +193,8 @@ namespace l1t {
// Et threshold on neighbouring towers/regions
double neighbourThreshold_;

JetParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0) { /* no-op */ }

COND_SERIALIZABLE;
};

Expand Down Expand Up @@ -368,7 +387,6 @@ namespace l1t {
void print(std::ostream&) const;
friend std::ostream& operator<<(std::ostream& o, const CaloParams & p) { p.print(o); return o; }


private:
unsigned version_;

Expand Down

0 comments on commit de50c68

Please sign in to comment.