Fork me on GitHub

Changeset 83ee320 in git


Ignore:
Timestamp:
Jan 17, 2020, 11:42:48 AM (5 years ago)
Author:
GitHub <noreply@…>
Branches:
Timing
Children:
9c1d14a, af6ce6a
Parents:
d4e5b6a (diff), 2d7ff18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Michele Selvaggi <michele.selvaggi@…> (01/17/20 11:42:48)
git-committer:
GitHub <noreply@…> (01/17/20 11:42:48)
Message:

Merge pull request #6 from delphes/llp

Llp

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesFormula.cc

    rd4e5b6a r83ee320  
    5656    buffer.Append(*it);
    5757  }
    58   buffer.ReplaceAll("pt", "x");
    59   buffer.ReplaceAll("eta", "y");
    60   buffer.ReplaceAll("phi", "z");
    61   buffer.ReplaceAll("energy", "t");
    62   buffer.ReplaceAll("d0", "[0]");
    63   buffer.ReplaceAll("dz", "[1]");
    64   buffer.ReplaceAll("ctgTheta", "[2]");
     58  buffer.ReplaceAll("pt", "[0]");
     59  buffer.ReplaceAll("eta", "[1]");
     60  buffer.ReplaceAll("phi", "[2]");
     61  buffer.ReplaceAll("energy", "[3]");
     62  buffer.ReplaceAll("r", "[4]");
     63  buffer.ReplaceAll("d0", "[5]");
     64  buffer.ReplaceAll("dz", "[6]");
     65  buffer.ReplaceAll("ctgTheta", "[7]");
    6566
    6667#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
     
    7879
    7980Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi,
    80   Double_t energy, Double_t d0, Double_t dz,
    81   Double_t ctgTheta)
     81  Double_t energy, Double_t r, Double_t z,
     82  Double_t d0, Double_t dz, Double_t ctgTheta)
    8283{
    83   Double_t x[4] = {pt, eta, phi, energy};
    84   Double_t params[3] = {d0, dz, ctgTheta};
     84  Double_t x[4] = {0.0, 0.0, z, 0.0};
     85  Double_t params[8] = {pt, eta, phi, energy, r, d0, dz, ctgTheta};
    8586  return EvalPar(x, params);
    8687}
  • classes/DelphesFormula.h

    rd4e5b6a r83ee320  
    3434
    3535  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0,
    36     Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0,
    37     Double_t ctgTheta = 0);
     36    Double_t energy = 0, Double_t r = 0, Double_t z = 0,
     37    Double_t d0 = 0, Double_t dz = 0, Double_t ctgTheta = 0);
    3838};
    3939
  • modules/Efficiency.cc

    rd4e5b6a r83ee320  
    9595{
    9696  Candidate *candidate;
    97   Double_t pt, eta, phi, e, d0, dz, ctgTheta;
     97  Double_t pt, eta, phi, e, r, z, d0, dz, ctgTheta;
    9898
    9999  fItInputArray->Reset();
     
    102102    const TLorentzVector &candidatePosition = candidate->Position;
    103103    const TLorentzVector &candidateMomentum = candidate->Momentum;
     104    r = candidatePosition.Perp();
     105    z = candidatePosition.Z();
    104106    eta = candidatePosition.Eta();
    105107    phi = candidatePosition.Phi();
     
    111113
    112114    // apply an efficency formula
    113     if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
     115    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, r, z, d0, dz, ctgTheta)) continue;
    114116
    115117    fOutputArray->Add(candidate);
Note: See TracChangeset for help on using the changeset viewer.