Changeset 7e83689 in git

Timestamp:

Mar 26, 2020, 4:01:20 PM (5 years ago)

Author:

Roberto Preghenella <preghenella@…>

Branches:

ImprovedOutputFile, master

Children:

36fb740

Parents:

f298e48

git-author:

Roberto Preghenella <preghenella@…> (03/23/20 15:43:15)

git-committer:

Roberto Preghenella <preghenella@…> (03/26/20 16:01:20)

Message:

Add particle density to formula parameterisations

also adds a new module that computes the particle density
in a eta-phi grid sets the ParticleDensity value of the
candidate, to be used in formula parameterisations.

Files:

• classes/DelphesClasses.cc (modified) (1 diff)
• classes/DelphesClasses.h (modified) (1 diff)
• classes/DelphesFormula.cc (modified) (3 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/ParticleDensity.cc (added)
• modules/ParticleDensity.h (added)

classes/DelphesClasses.cc

@@ -172 +172 @@
   ExclYmerge45(0),
   ExclYmerge56(0),
+  ParticleDensity(0),
   fFactory(0),
   fArray(0)

classes/DelphesClasses.h

@@ -733 +733 @@
   Double_t ExclYmerge56;
 
+  // event characteristics variables
+  Double_t ParticleDensity; // particle multiplicity density in the proximity of the particle
+  
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }

classes/DelphesFormula.cc

@@ -65 +65 @@
   buffer.ReplaceAll("ctgTheta", "[2]");
   buffer.ReplaceAll("radius", "[3]");
+  buffer.ReplaceAll("density", "[4]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
@@ -82 +83 @@
 {
 
-  Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0.;
+  Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0., density = 0.;
   if (candidate) {
     d0 = candidate->D0;
@@ -88 +89 @@
     ctgTheta = candidate->CtgTheta;
     radius = candidate->Position.Pt();
+    density = candidate->ParticleDensity;
   }
     
   Double_t x[4] = {pt, eta, phi, energy};
-  Double_t params[4] = {d0, dz, ctgTheta, radius};
+  Double_t params[5] = {d0, dz, ctgTheta, radius, density};
   return EvalPar(x, params);
 }

modules/ModulesLinkDef.h

@@ -74 +74 @@
 #include "modules/VertexFinderDA4D.h"
 #include "modules/DecayFilter.h"
+#include "modules/ParticleDensity.h"
 #include "modules/ExampleModule.h"
 
@@ -130 +131 @@
 #pragma link C++ class VertexFinderDA4D+;
 #pragma link C++ class DecayFilter+;
+#pragma link C++ class ParticleDensity+;
 #pragma link C++ class ExampleModule+;