Fork me on GitHub

Changeset a1c9c16 in git


Ignore:
Timestamp:
02/14/19 20:22:07 (20 months ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
d08af46
Parents:
69da136
Message:

remove DelphesLongFormula? and TrackEfficiency?

Files:
4 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • cards/delphes_card_llptest.tcl

    r69da136 ra1c9c16  
    3939##############################
    4040
    41 module TrackEfficiency MuonTrackingEfficiency {
     41module Efficiency MuonTrackingEfficiency {
    4242  set InputArray ParticlePropagator/muons
    4343  set OutputArray muons
  • classes/DelphesFormula.cc

    r69da136 ra1c9c16  
    6060  buffer.ReplaceAll("phi", "z");
    6161  buffer.ReplaceAll("energy", "t");
     62  buffer.ReplaceAll("d0", "[0]");
     63  buffer.ReplaceAll("dz", "[1]");
     64  buffer.ReplaceAll("ctgTheta", "[2]");
    6265
    6366#if ROOT_VERSION_CODE < ROOT_VERSION(6, 0, 0)
     
    7477//------------------------------------------------------------------------------
    7578
    76 Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy)
     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)
    7782{
    7883  Double_t x[4] = {pt, eta, phi, energy};
    79   return EvalPar(x);
     84  Double_t params[3] = {d0, dz, ctgTheta};
     85  return EvalPar(x, params);
    8086}
    8187
  • classes/DelphesFormula.h

    r69da136 ra1c9c16  
    3333  Int_t Compile(const char *expression);
    3434
    35   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0);
     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);
    3638};
    3739
  • modules/Efficiency.cc

    r69da136 ra1c9c16  
    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    d0 = candidate->D0;
     109    dz = candidate->DZ;
     110    ctgTheta = candidate->CtgTheta;
    108111
    109112    // apply an efficency formula
    110     if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e)) continue;
     113    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
    111114
    112115    fOutputArray->Add(candidate);
  • modules/ModulesLinkDef.h

    r69da136 ra1c9c16  
    3232#include "modules/ParticlePropagator.h"
    3333#include "modules/Efficiency.h"
    34 #include "modules/TrackEfficiency.h"
    3534#include "modules/IdentificationMap.h"
    3635#include "modules/EnergySmearing.h"
     
    8685#pragma link C++ class ParticlePropagator+;
    8786#pragma link C++ class Efficiency+;
    88 #pragma link C++ class TrackEfficiency+;
    8987#pragma link C++ class IdentificationMap+;
    9088#pragma link C++ class EnergySmearing+;
Note: See TracChangeset for help on using the changeset viewer.