Changeset 7c5b8f3 in git

Timestamp:

Mar 27, 2020, 9:21:22 AM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, master

Children:

354b7f3

Parents:

288a5fc (diff), 36fb740 (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:

Pavel Demin <pavel-demin@…> (03/27/20 09:21:22)

git-committer:

GitHub <noreply@…> (03/27/20 09:21:22)

Message:

Merge pull request #71 from preghenella/rdev

Radius and particle-density dependence of formula parameterisations

Files:

• Makefile (modified) (6 diffs)
• classes/DelphesClasses.cc (modified) (1 diff)
• classes/DelphesClasses.h (modified) (1 diff)
• classes/DelphesFormula.cc (modified) (3 diffs)
• classes/DelphesFormula.h (modified) (2 diffs)
• modules/AngularSmearing.cc (modified) (1 diff)
• modules/Efficiency.cc (modified) (2 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/MomentumSmearing.cc (modified) (1 diff)
• modules/ParticleDensity.cc (added)
• modules/ParticleDensity.h (added)
• modules/TrackSmearing.cc (modified) (7 diffs)

Makefile

@@ -446 +446 @@
         modules/VertexFinderDA4D.h \
         modules/DecayFilter.h \
+        modules/ParticleDensity.h \
         modules/ExampleModule.h
 tmp/modules/ModulesDict$(PcmSuf): \
@@ -510 +511 @@
 tmp/classes/DelphesFormula.$(ObjSuf): \
         classes/DelphesFormula.$(SrcSuf) \
-        classes/DelphesFormula.h
+        classes/DelphesFormula.h \
+        classes/DelphesClasses.h
 tmp/classes/DelphesHepMCReader.$(ObjSuf): \
         classes/DelphesHepMCReader.$(SrcSuf) \
@@ -881 +883 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootResult.h
+tmp/modules/ParticleDensity.$(ObjSuf): \
+        modules/ParticleDensity.$(SrcSuf) \
+        modules/ParticleDensity.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootClassifier.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootResult.h
 tmp/modules/ParticlePropagator.$(ObjSuf): \
         modules/ParticlePropagator.$(SrcSuf) \
@@ -1017 +1028 @@
         modules/TrackCovariance.h \
         classes/DelphesClasses.h \
-        external/TrackCovariance/SolGeom.h
+        external/TrackCovariance/SolGeom.h \
+        external/TrackCovariance/SolGridCov.h \
+        external/TrackCovariance/ObsTrk.h
 tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
         modules/TrackPileUpSubtractor.$(SrcSuf) \
@@ -1174 +1187 @@
         tmp/modules/MomentumSmearing.$(ObjSuf) \
         tmp/modules/OldCalorimeter.$(ObjSuf) \
+        tmp/modules/ParticleDensity.$(ObjSuf) \
         tmp/modules/ParticlePropagator.$(ObjSuf) \
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
@@ -2262 +2276 @@
         @touch $@
 
+modules/ParticleDensity.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/TimeSmearing.h: \
         classes/DelphesModule.h

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

@@ -18 +18 @@
 
 #include "classes/DelphesFormula.h"
+#include "classes/DelphesClasses.h"
 
 #include "TString.h"
@@ -63 +64 @@
   buffer.ReplaceAll("dz", "[1]");
   buffer.ReplaceAll("ctgTheta", "[2]");
+  buffer.ReplaceAll("radius", "[3]");
+  buffer.ReplaceAll("density", "[4]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
@@ -77 +80 @@
 //------------------------------------------------------------------------------
 
-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 DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy, Candidate *candidate)
 {
+
+  Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0., density = 0.;
+  if (candidate) {
+    d0 = candidate->D0;
+    dz = candidate->DZ;
+    ctgTheta = candidate->CtgTheta;
+    radius = candidate->Position.Pt();
+    density = candidate->ParticleDensity;
+  }
+    
   Double_t x[4] = {pt, eta, phi, energy};
-  Double_t params[3] = {d0, dz, ctgTheta};
+  Double_t params[5] = {d0, dz, ctgTheta, radius, density};
   return EvalPar(x, params);
 }

classes/DelphesFormula.h

@@ -22 +22 @@
 #include "TFormula.h"
 
+class Candidate;
+
 class DelphesFormula: public TFormula
 {
@@ -33 +35 @@
   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 d0 = 0, Double_t dz = 0,
-    Double_t ctgTheta = 0);
+  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0, Candidate *candidate = nullptr);
 };
 

modules/AngularSmearing.cc

@@ -112 +112 @@
     // apply smearing formula for eta,phi
 
-    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
-    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
+    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e, candidate));
+    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e, candidate));
 
     if(pt <= 0.0) continue;

modules/Efficiency.cc

@@ -95 +95 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
+  Double_t pt, eta, phi, e;
 
   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, d0, dz, ctgTheta)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, candidate)) continue;
 
     fOutputArray->Add(candidate);

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+;
 

modules/MomentumSmearing.cc

@@ -106 +106 @@
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-    res = fFormula->Eval(pt, eta, phi, e);
+    res = fFormula->Eval(pt, eta, phi, e, candidate);
 
     // apply smearing formula

modules/TrackSmearing.cc

@@ -158 +158 @@
   TLorentzVector beamSpotPosition;
   Candidate *candidate, *mother;
-  Double_t pt, eta, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
+  Double_t pt, eta, e, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
   Double_t x, y, z, t, px, py, pz, theta;
   Double_t q, r;
@@ -223 +223 @@
     pt = momentum.Pt();
     eta = momentum.Eta();
-
+    e = momentum.E();
+    
     d0 = trueD0 = candidate->D0;
     dz = trueDZ = candidate->DZ;
@@ -232 +233 @@
 
     if(fUseD0Formula)
-      d0Error = fD0Formula->Eval(pt, eta);
+      d0Error = fD0Formula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -247 +248 @@
 
     if(fUseDZFormula)
-      dzError = fDZFormula->Eval(pt, eta);
+      dzError = fDZFormula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -262 +263 @@
 
     if(fUsePFormula)
-      pError = fPFormula->Eval(pt, eta) * p;
+      pError = fPFormula->Eval(pt, eta, phi, e, candidate) * p;
     else
     {
@@ -277 +278 @@
 
     if(fUseCtgThetaFormula)
-      ctgThetaError = fCtgThetaFormula->Eval(pt, eta);
+      ctgThetaError = fCtgThetaFormula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -292 +293 @@
 
     if(fUsePhiFormula)
-      phiError = fPhiFormula->Eval(pt, eta);
+      phiError = fPhiFormula->Eval(pt, eta, phi, e, candidate);
     else
     {