Skip to content

Commit

Permalink
Merge pull request #17984 from mariadalfonso/fixM3delay90
Browse files Browse the repository at this point in the history
HBHE M3 = fix M3 (90)
  • Loading branch information
davidlange6 committed Mar 21, 2017
2 parents 8b88ffd + 309328f commit d56a536
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions CalibCalorimetry/HcalAlgos/src/HcalTimeSlew.cc
Expand Up @@ -8,22 +8,25 @@ static const double cap = 6.0;
static const double tspar0[2] = {15.5, 12.2999};
static const double tspar1[2] = {-3.2,-2.19142};
static const double tspar2[2] = {32, 0};
static const double tspar0_siPM[2] = {3., 3.}; // 3ns delay for MC and DATA, recheck later for data
static const double tspar0_siPM[2] = {0., 0.}; // 0ns delay for MC and DATA, recheck later for data
static const double tspar1_siPM[2] = {0, 0};
static const double tspar2_siPM[2] = {0, 0};

// used by M2
double HcalTimeSlew::delay(double fC, BiasSetting bias) {
double rawDelay=tzero[bias]+slope[bias]*log(fC);
return (rawDelay<0)?(0):((rawDelay>tmax[bias])?(tmax[bias]):(rawDelay));
}

// used by M3
double HcalTimeSlew::delay(double fC, ParaSource source, BiasSetting bias, double par0, double par1, double par2, bool isHPD) {

if (source==TestStand) {
return HcalTimeSlew::delay(fC, bias);
}
else if (source==InputPars) {
return std::fmin(cap, par0 + par1*log(fC+par2));
if(isHPD) return std::fmin(cap, par0 + par1*log(fC+par2));
return cap+tspar0_siPM[0];
}
else if (source==Data || source==MC){
if(isHPD) return std::fmin(cap,tspar0[source-1]+tspar1[source-1]*log(fC+tspar2[source-1]));
Expand Down

0 comments on commit d56a536

Please sign in to comment.