Fork me on GitHub

Changeset f298e48 in git for modules/TrackSmearing.cc


Ignore:
Timestamp:
Mar 22, 2020, 6:39:09 PM (5 years ago)
Author:
Roberto Preghenella <preghenella@…>
Branches:
ImprovedOutputFile, master
Children:
7e83689
Parents:
288a5fc
git-author:
Roberto Preghenella <preghenella@…> (03/22/20 16:32:29)
git-committer:
Roberto Preghenella <preghenella@…> (03/22/20 18:39:09)
Message:

Add radius (distance from beam line) to formula parameterisations

also redefines the DelphesFormula::Eval function to allow one to
include future parameters for parameterisations that can be
taken from Candidates in a generalised way.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/TrackSmearing.cc

    r288a5fc rf298e48  
    158158  TLorentzVector beamSpotPosition;
    159159  Candidate *candidate, *mother;
    160   Double_t pt, eta, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
     160  Double_t pt, eta, e, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
    161161  Double_t x, y, z, t, px, py, pz, theta;
    162162  Double_t q, r;
     
    223223    pt = momentum.Pt();
    224224    eta = momentum.Eta();
    225 
     225    e = momentum.E();
     226   
    226227    d0 = trueD0 = candidate->D0;
    227228    dz = trueDZ = candidate->DZ;
     
    232233
    233234    if(fUseD0Formula)
    234       d0Error = fD0Formula->Eval(pt, eta);
     235      d0Error = fD0Formula->Eval(pt, eta, phi, e, candidate);
    235236    else
    236237    {
     
    247248
    248249    if(fUseDZFormula)
    249       dzError = fDZFormula->Eval(pt, eta);
     250      dzError = fDZFormula->Eval(pt, eta, phi, e, candidate);
    250251    else
    251252    {
     
    262263
    263264    if(fUsePFormula)
    264       pError = fPFormula->Eval(pt, eta) * p;
     265      pError = fPFormula->Eval(pt, eta, phi, e, candidate) * p;
    265266    else
    266267    {
     
    277278
    278279    if(fUseCtgThetaFormula)
    279       ctgThetaError = fCtgThetaFormula->Eval(pt, eta);
     280      ctgThetaError = fCtgThetaFormula->Eval(pt, eta, phi, e, candidate);
    280281    else
    281282    {
     
    292293
    293294    if(fUsePhiFormula)
    294       phiError = fPhiFormula->Eval(pt, eta);
     295      phiError = fPhiFormula->Eval(pt, eta, phi, e, candidate);
    295296    else
    296297    {
Note: See TracChangeset for help on using the changeset viewer.