Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -56,7 +56,7 @@ public:
|
||||
parent::m_bin_entries[offset]++;
|
||||
parent::m_bin_Sw[offset] += aWeight;
|
||||
parent::m_bin_Sw2[offset] += aWeight * aWeight;
|
||||
|
||||
|
||||
TC xw = aX * aWeight;
|
||||
TC x2w = aX * xw;
|
||||
parent::m_bin_Sxw[offset][0] += xw;
|
||||
@@ -150,10 +150,10 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
bool multiply(const h1& a_histo) {
|
||||
bool multiply(const h1& a_histo) {
|
||||
return parent::base_multiply(a_histo);
|
||||
}
|
||||
|
||||
|
||||
bool divide(const h1& a_histo) {
|
||||
return parent::base_divide(a_histo);
|
||||
}
|
||||
@@ -162,7 +162,7 @@ public:
|
||||
if(!a_factor) return false;
|
||||
|
||||
// actual bin number must be a multiple of a_factor.
|
||||
|
||||
|
||||
const axis_t& _axis = parent::axis();
|
||||
|
||||
bn_t n = _axis.bins();
|
||||
@@ -220,14 +220,14 @@ public:
|
||||
*this = *new_h;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool equals_TH(const h1& a_from,const TW& a_prec,TW(*a_fabs)(TW)) const {
|
||||
if(!parent::equals_TH(a_from,a_prec,a_fabs,true)) return false;
|
||||
if(!parent::equals_TH(a_from,a_prec,a_fabs,true)) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void not_a_profile() const {}
|
||||
|
||||
|
||||
public: //CERN-ROOT API (for MEMPHYS sim).
|
||||
bool Fill(TC aX,TW aWeight = 1) {return fill(aX,aWeight);}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user