Fork me on GitHub

Changes in / [7c5b8f3:288a5fc] in git


Ignore:
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r7c5b8f3 r288a5fc  
    446446        modules/VertexFinderDA4D.h \
    447447        modules/DecayFilter.h \
    448         modules/ParticleDensity.h \
    449448        modules/ExampleModule.h
    450449tmp/modules/ModulesDict$(PcmSuf): \
     
    511510tmp/classes/DelphesFormula.$(ObjSuf): \
    512511        classes/DelphesFormula.$(SrcSuf) \
    513         classes/DelphesFormula.h \
    514         classes/DelphesClasses.h
     512        classes/DelphesFormula.h
    515513tmp/classes/DelphesHepMCReader.$(ObjSuf): \
    516514        classes/DelphesHepMCReader.$(SrcSuf) \
     
    883881        external/ExRootAnalysis/ExRootFilter.h \
    884882        external/ExRootAnalysis/ExRootResult.h
    885 tmp/modules/ParticleDensity.$(ObjSuf): \
    886         modules/ParticleDensity.$(SrcSuf) \
    887         modules/ParticleDensity.h \
    888         classes/DelphesClasses.h \
    889         classes/DelphesFactory.h \
    890         classes/DelphesFormula.h \
    891         external/ExRootAnalysis/ExRootClassifier.h \
    892         external/ExRootAnalysis/ExRootFilter.h \
    893         external/ExRootAnalysis/ExRootResult.h
    894883tmp/modules/ParticlePropagator.$(ObjSuf): \
    895884        modules/ParticlePropagator.$(SrcSuf) \
     
    10281017        modules/TrackCovariance.h \
    10291018        classes/DelphesClasses.h \
    1030         external/TrackCovariance/SolGeom.h \
    1031         external/TrackCovariance/SolGridCov.h \
    1032         external/TrackCovariance/ObsTrk.h
     1019        external/TrackCovariance/SolGeom.h
    10331020tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
    10341021        modules/TrackPileUpSubtractor.$(SrcSuf) \
     
    11871174        tmp/modules/MomentumSmearing.$(ObjSuf) \
    11881175        tmp/modules/OldCalorimeter.$(ObjSuf) \
    1189         tmp/modules/ParticleDensity.$(ObjSuf) \
    11901176        tmp/modules/ParticlePropagator.$(ObjSuf) \
    11911177        tmp/modules/PdgCodeFilter.$(ObjSuf) \
     
    22762262        @touch $@
    22772263
    2278 modules/ParticleDensity.h: \
    2279         classes/DelphesModule.h
    2280         @touch $@
    2281 
    22822264modules/TimeSmearing.h: \
    22832265        classes/DelphesModule.h
  • classes/DelphesClasses.cc

    r7c5b8f3 r288a5fc  
    172172  ExclYmerge45(0),
    173173  ExclYmerge56(0),
    174   ParticleDensity(0),
    175174  fFactory(0),
    176175  fArray(0)
  • classes/DelphesClasses.h

    r7c5b8f3 r288a5fc  
    733733  Double_t ExclYmerge56;
    734734
    735   // event characteristics variables
    736   Double_t ParticleDensity; // particle multiplicity density in the proximity of the particle
    737  
    738735  static CompBase *fgCompare; //!
    739736  const CompBase *GetCompare() const { return fgCompare; }
  • classes/DelphesFormula.cc

    r7c5b8f3 r288a5fc  
    1818
    1919#include "classes/DelphesFormula.h"
    20 #include "classes/DelphesClasses.h"
    2120
    2221#include "TString.h"
     
    6463  buffer.ReplaceAll("dz", "[1]");
    6564  buffer.ReplaceAll("ctgTheta", "[2]");
    66   buffer.ReplaceAll("radius", "[3]");
    67   buffer.ReplaceAll("density", "[4]");
    6865
    6966#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
     
    8077//------------------------------------------------------------------------------
    8178
    82 Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy, Candidate *candidate)
     79Double_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)
    8382{
    84 
    85   Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0., density = 0.;
    86   if (candidate) {
    87     d0 = candidate->D0;
    88     dz = candidate->DZ;
    89     ctgTheta = candidate->CtgTheta;
    90     radius = candidate->Position.Pt();
    91     density = candidate->ParticleDensity;
    92   }
    93    
    9483  Double_t x[4] = {pt, eta, phi, energy};
    95   Double_t params[5] = {d0, dz, ctgTheta, radius, density};
     84  Double_t params[3] = {d0, dz, ctgTheta};
    9685  return EvalPar(x, params);
    9786}
  • classes/DelphesFormula.h

    r7c5b8f3 r288a5fc  
    2222#include "TFormula.h"
    2323
    24 class Candidate;
    25 
    2624class DelphesFormula: public TFormula
    2725{
     
    3533  Int_t Compile(const char *expression);
    3634
    37   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0, Candidate *candidate = nullptr);
     35  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);
    3838};
    3939
  • modules/AngularSmearing.cc

    r7c5b8f3 r288a5fc  
    112112    // apply smearing formula for eta,phi
    113113
    114     eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e, candidate));
    115     phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e, candidate));
     114    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
     115    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
    116116
    117117    if(pt <= 0.0) continue;
  • modules/Efficiency.cc

    r7c5b8f3 r288a5fc  
    9595{
    9696  Candidate *candidate;
    97   Double_t pt, eta, phi, e;
     97  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
    9898
    9999  fItInputArray->Reset();
     
    106106    pt = candidateMomentum.Pt();
    107107    e = candidateMomentum.E();
    108    
     108    d0 = candidate->D0;
     109    dz = candidate->DZ;
     110    ctgTheta = candidate->CtgTheta;
     111
    109112    // apply an efficency formula
    110     if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, candidate)) continue;
     113    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
    111114
    112115    fOutputArray->Add(candidate);
  • modules/ModulesLinkDef.h

    r7c5b8f3 r288a5fc  
    7474#include "modules/VertexFinderDA4D.h"
    7575#include "modules/DecayFilter.h"
    76 #include "modules/ParticleDensity.h"
    7776#include "modules/ExampleModule.h"
    7877
     
    131130#pragma link C++ class VertexFinderDA4D+;
    132131#pragma link C++ class DecayFilter+;
    133 #pragma link C++ class ParticleDensity+;
    134132#pragma link C++ class ExampleModule+;
    135133
  • modules/MomentumSmearing.cc

    r7c5b8f3 r288a5fc  
    106106    pt = candidateMomentum.Pt();
    107107    e = candidateMomentum.E();
    108     res = fFormula->Eval(pt, eta, phi, e, candidate);
     108    res = fFormula->Eval(pt, eta, phi, e);
    109109
    110110    // apply smearing formula
  • modules/TrackSmearing.cc

    r7c5b8f3 r288a5fc  
    158158  TLorentzVector beamSpotPosition;
    159159  Candidate *candidate, *mother;
    160   Double_t pt, eta, e, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
     160  Double_t pt, eta, 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     e = momentum.E();
    226    
     225
    227226    d0 = trueD0 = candidate->D0;
    228227    dz = trueDZ = candidate->DZ;
     
    233232
    234233    if(fUseD0Formula)
    235       d0Error = fD0Formula->Eval(pt, eta, phi, e, candidate);
     234      d0Error = fD0Formula->Eval(pt, eta);
    236235    else
    237236    {
     
    248247
    249248    if(fUseDZFormula)
    250       dzError = fDZFormula->Eval(pt, eta, phi, e, candidate);
     249      dzError = fDZFormula->Eval(pt, eta);
    251250    else
    252251    {
     
    263262
    264263    if(fUsePFormula)
    265       pError = fPFormula->Eval(pt, eta, phi, e, candidate) * p;
     264      pError = fPFormula->Eval(pt, eta) * p;
    266265    else
    267266    {
     
    278277
    279278    if(fUseCtgThetaFormula)
    280       ctgThetaError = fCtgThetaFormula->Eval(pt, eta, phi, e, candidate);
     279      ctgThetaError = fCtgThetaFormula->Eval(pt, eta);
    281280    else
    282281    {
     
    293292
    294293    if(fUsePhiFormula)
    295       phiError = fPhiFormula->Eval(pt, eta, phi, e, candidate);
     294      phiError = fPhiFormula->Eval(pt, eta);
    296295    else
    297296    {
Note: See TracChangeset for help on using the changeset viewer.