Changeset a1c9c16 in git

Timestamp:

Feb 14, 2019, 8:22:07 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, llp, master

Children:

d08af46

Parents:

69da136

Message:

remove DelphesLongFormula and TrackEfficiency

Files:

• cards/delphes_card_llptest.tcl (modified) (1 diff)
• classes/DelphesFormula.cc (modified) (2 diffs)
• classes/DelphesFormula.h (modified) (1 diff)
• classes/DelphesLongFormula.cc (deleted)
• classes/DelphesLongFormula.h (deleted)
• modules/Efficiency.cc (modified) (2 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/TrackEfficiency.cc (deleted)
• modules/TrackEfficiency.h (deleted)

cards/delphes_card_llptest.tcl

@@ -39 +39 @@
 ##############################
 
-module TrackEfficiency MuonTrackingEfficiency {
+module Efficiency MuonTrackingEfficiency {
   set InputArray ParticlePropagator/muons
   set OutputArray muons

classes/DelphesFormula.cc

@@ -60 +60 @@
   buffer.ReplaceAll("phi", "z");
   buffer.ReplaceAll("energy", "t");
+  buffer.ReplaceAll("d0", "[0]");
+  buffer.ReplaceAll("dz", "[1]");
+  buffer.ReplaceAll("ctgTheta", "[2]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 0, 0)
@@ -74 +77 @@
 //------------------------------------------------------------------------------
 
-Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy)
+Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi,
+  Double_t energy, Double_t d0, Double_t dz,
+  Double_t ctgTheta)
 {
   Double_t x[4] = {pt, eta, phi, energy};
-  return EvalPar(x);
+  Double_t params[3] = {d0, dz, ctgTheta};
+  return EvalPar(x, params);
 }
 

classes/DelphesFormula.h

@@ -33 +33 @@
   Int_t Compile(const char *expression);
 
-  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0);
+  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0,
+    Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0,
+    Double_t ctgTheta = 0);
 };
 

modules/Efficiency.cc

@@ -95 +95 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
+    d0 = candidate->D0;
+    dz = candidate->DZ;
+    ctgTheta = candidate->CtgTheta;
 
     // apply an efficency formula
-    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
 
     fOutputArray->Add(candidate);

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
-#include "modules/TrackEfficiency.h"
 #include "modules/IdentificationMap.h"
 #include "modules/EnergySmearing.h"
@@ -86 +85 @@
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;
-#pragma link C++ class TrackEfficiency+;
 #pragma link C++ class IdentificationMap+;
 #pragma link C++ class EnergySmearing+;