Fork me on GitHub

Changeset af6ce6a in git for classes


Ignore:
Timestamp:
Jan 20, 2020, 2:29:19 PM (5 years ago)
Author:
GitHub <noreply@…>
Branches:
Timing
Children:
9867b49
Parents:
83ee320 (diff), 9c1d14a (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/20/20 14:29:19)
git-committer:
GitHub <noreply@…> (01/20/20 14:29:19)
Message:

Merge pull request #7 from selvaggi/revert-6-llp

Revert "Llp"

Location:
classes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesFormula.cc

    r83ee320 raf6ce6a  
    5656    buffer.Append(*it);
    5757  }
    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]");
     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]");
    6665
    6766#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
     
    7978
    8079Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi,
    81   Double_t energy, Double_t r, Double_t z,
    82   Double_t d0, Double_t dz, Double_t ctgTheta)
     80  Double_t energy, Double_t d0, Double_t dz,
     81  Double_t ctgTheta)
    8382{
    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};
     83  Double_t x[4] = {pt, eta, phi, energy};
     84  Double_t params[3] = {d0, dz, ctgTheta};
    8685  return EvalPar(x, params);
    8786}
  • classes/DelphesFormula.h

    r83ee320 raf6ce6a  
    3434
    3535  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 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);
     36    Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0,
     37    Double_t ctgTheta = 0);
    3838};
    3939
Note: See TracChangeset for help on using the changeset viewer.