Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HBHE: Mahi arrival time #26270

Merged
merged 2 commits into from
Apr 2, 2019
Merged

HBHE: Mahi arrival time #26270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee9da9
fixes for Mahi arrival Time
mariadalfonso Mar 27, 2019
bc65d12
add option to deactivate computation of arrivalTime for HLT
mariadalfonso Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion RecoLocalCalo/HcalRecAlgos/interface/MahiFit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class MahiFit

void setParameters(bool iDynamicPed, double iTS4Thresh, double chiSqSwitch,
bool iApplyTimeSlew, HcalTimeSlew::BiasSetting slewFlavor,
double iMeanTime, double iTimeSigmaHPD, double iTimeSigmaSiPM,
bool iCalculateArrivalTime, double iMeanTime, double iTimeSigmaHPD, double iTimeSigmaSiPM,
const std::vector <int> &iActiveBXs, int iNMaxItersMin, int iNMaxItersNNLS,
double iDeltaChiSqThresh, double iNnlsThresh);

Expand Down Expand Up @@ -165,6 +165,7 @@ class MahiFit
HcalTimeSlew::BiasSetting slewFlavor_;
float tsDelay1GeV_=0.f;

bool calculateArrivalTime_;
float meanTime_;
float timeSigmaHPD_;
float timeSigmaSiPM_;
Expand Down
15 changes: 10 additions & 5 deletions RecoLocalCalo/HcalRecAlgos/src/MahiFit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ MahiFit::MahiFit() :

void MahiFit::setParameters(bool iDynamicPed, double iTS4Thresh, double chiSqSwitch,
bool iApplyTimeSlew, HcalTimeSlew::BiasSetting slewFlavor,
double iMeanTime, double iTimeSigmaHPD, double iTimeSigmaSiPM,
bool iCalculateArrivalTime, double iMeanTime, double iTimeSigmaHPD, double iTimeSigmaSiPM,
const std::vector <int> &iActiveBXs, int iNMaxItersMin, int iNMaxItersNNLS,
double iDeltaChiSqThresh, double iNnlsThresh) {

Expand All @@ -20,6 +20,7 @@ void MahiFit::setParameters(bool iDynamicPed, double iTS4Thresh, double chiSqSwi
applyTimeSlew_ = iApplyTimeSlew;
slewFlavor_ = slewFlavor;

calculateArrivalTime_ = iCalculateArrivalTime;
meanTime_ = iMeanTime;
timeSigmaHPD_ = iTimeSigmaHPD;
timeSigmaSiPM_ = iTimeSigmaSiPM;
Expand Down Expand Up @@ -197,7 +198,9 @@ void MahiFit::doFit(std::array<float,3> &correctedOutput, int nbx) const {
if (foundintime) {
correctedOutput.at(0) = nnlsWork_.ampVec.coeff(ipulseintime); //charge
if (correctedOutput.at(0)!=0) {
float arrivalTime = calculateArrivalTime();
// fixME store the timeslew
float arrivalTime = 0.;
if(calculateArrivalTime_) arrivalTime = calculateArrivalTime();
correctedOutput.at(1) = arrivalTime; //time
}
else correctedOutput.at(1) = -9999;//time
Expand Down Expand Up @@ -282,7 +285,7 @@ void MahiFit::updatePulseShape(double itQ, FullSampleVector &pulseShape, FullSam
//with previous SOI=TS4 case assumed by psfPtr_->getPulseShape()
int delta = 4 - nnlsWork_. tsOffset;

auto invDt = 0.25 / nnlsWork_.dt;
auto invDt = 0.5 / nnlsWork_.dt;

for (unsigned int iTS=0; iTS<nnlsWork_.tsSize; ++iTS) {

Expand Down Expand Up @@ -336,11 +339,13 @@ float MahiFit::calculateArrivalTime() const {
for (unsigned int iBX=0; iBX<nnlsWork_.nPulseTot; ++iBX) {
int offset=nnlsWork_.bxs.coeff(iBX);
if (offset==0) itIndex=iBX;
nnlsWork_.pulseDerivMat.col(iBX) *= nnlsWork_.ampVec.coeff(iBX);

}

PulseVector residuals = nnlsWork_.pulseMat*nnlsWork_.ampVec - nnlsWork_.amplitudes;
SampleVector residuals = nnlsWork_.pulseMat*nnlsWork_.ampVec - nnlsWork_.amplitudes;
PulseVector solution = nnlsWork_.pulseDerivMat.colPivHouseholderQr().solve(residuals);
float t = solution.coeff(itIndex)/nnlsWork_.ampVec.coeff(itIndex);
float t = solution.coeff(itIndex);
t = (t>timeLimit_) ? timeLimit_ :
((t<-timeLimit_) ? -timeLimit_ : t);

Expand Down
4 changes: 3 additions & 1 deletion RecoLocalCalo/HcalRecAlgos/src/parseHBHEPhase1AlgoDescription.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ parseHBHEMahiDescription(const edm::ParameterSet& conf)

const bool iApplyTimeSlew = conf.getParameter<bool> ("applyTimeSlew");

const bool iCalculateArrivalTime = conf.getParameter<bool> ("calculateArrivalTime");
const double iMeanTime = conf.getParameter<double> ("meanTime");
const double iTimeSigmaHPD = conf.getParameter<double> ("timeSigmaHPD");
const double iTimeSigmaSiPM = conf.getParameter<double> ("timeSigmaSiPM");
Expand All @@ -33,7 +34,7 @@ parseHBHEMahiDescription(const edm::ParameterSet& conf)
std::unique_ptr<MahiFit> corr = std::make_unique<MahiFit>();

corr->setParameters(iDynamicPed, iTS4Thresh, chiSqSwitch, iApplyTimeSlew, HcalTimeSlew::Medium,
iMeanTime, iTimeSigmaHPD, iTimeSigmaSiPM,
iCalculateArrivalTime, iMeanTime, iTimeSigmaHPD, iTimeSigmaSiPM,
iActiveBXs, iNMaxItersMin, iNMaxItersNNLS,
iDeltaChiSqThresh, iNnlsThresh);

Expand Down Expand Up @@ -149,6 +150,7 @@ edm::ParameterSetDescription fillDescriptionForParseHBHEPhase1Algo()
desc.add<double>("tdcTimeShift", 0.0);
desc.add<bool>("correctForPhaseContainment", true);
desc.add<bool>("applyLegacyHBMCorrection", true);
desc.add<bool>("calculateArrivalTime", true);

return desc;
}
4 changes: 3 additions & 1 deletion RecoLocalCalo/HcalRecAlgos/test/MahiDebugger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class MahiDebugger : public edm::one::EDAnalyzer<edm::one::SharedResources> {
HcalTimeSlew::BiasSetting slewFlavor_;
double tsDelay1GeV_=0;

bool calculateArrivalTime_;
float meanTime_;
float timeSigmaHPD_;
float timeSigmaSiPM_;
Expand Down Expand Up @@ -180,6 +181,7 @@ MahiDebugger::MahiDebugger(const edm::ParameterSet& iConfig)
ts4Thresh_(iConfig.getParameter<double> ("ts4Thresh")),
chiSqSwitch_(iConfig.getParameter<double> ("chiSqSwitch")),
applyTimeSlew_(iConfig.getParameter<bool> ("applyTimeSlew")),
calculateArrivalTime_(iConfig.getParameter<bool> ("calculateArrivalTime")),
meanTime_(iConfig.getParameter<double> ("meanTime")),
timeSigmaHPD_(iConfig.getParameter<double> ("timeSigmaHPD")),
timeSigmaSiPM_(iConfig.getParameter<double> ("timeSigmaSiPM")),
Expand All @@ -195,7 +197,7 @@ MahiDebugger::MahiDebugger(const edm::ParameterSet& iConfig)
mahi_ = std::make_unique<MahiFit>();

mahi_ -> setParameters(dynamicPed_, ts4Thresh_, chiSqSwitch_, applyTimeSlew_, HcalTimeSlew::Medium,
meanTime_, timeSigmaHPD_, timeSigmaSiPM_,
calculateArrivalTime_, meanTime_, timeSigmaHPD_, timeSigmaSiPM_,
activeBXs_, nMaxItersMin_, nMaxItersNNLS_,
deltaChiSqThresh_, nnlsThresh_);

Expand Down
1 change: 1 addition & 0 deletions RecoLocalCalo/HcalRecProducers/python/HBHEMahiParameters_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Configuration parameters for Mahi
mahiParameters = cms.PSet(

calculateArrivalTime = cms.bool(True),
dynamicPed = cms.bool(False),
ts4Thresh = cms.double(0.0),
chiSqSwitch = cms.double(15.0),
Expand Down