Changeset 781af69 in git

Timestamp:

May 6, 2021, 10:40:18 AM (4 years ago)

Author:

michele <michele.selvaggi@…>

Branches:

master

Children:

d489660

Parents:

65776c0

Message:

added dNdx member

Files:

• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (3 diffs)
• modules/ClusterCounting.cc (modified) (3 diffs)
• modules/TreeWriter.cc (modified) (2 diffs)

classes/DelphesClasses.cc

@@ -231 +231 @@
   Xd(0), Yd(0), Zd(0),
   Nclusters(0.0),
+  dNdx(0.0),
   TrackResolution(0),
   NCharged(0),
@@ -408 +409 @@
   object.Zd = Zd;
   object.Nclusters = Nclusters;
+  object.dNdx = dNdx;
   object.TrackResolution = TrackResolution;
   object.NCharged = NCharged;
@@ -541 +543 @@
   Zd = 0.0;
   Nclusters = 0.0;
+  dNdx = 0.0;
   TrackResolution = 0.0;
   NCharged = 0;

classes/DelphesClasses.h

@@ -462 +462 @@
   Float_t DZ; // track longitudinal impact parameter
   Float_t Nclusters; // Number of ionization clusters
+  Float_t dNdx; // Number of ionization clusters
 
   Float_t ErrorP; // track momentum error
@@ -567 +568 @@
   Float_t DZ; // track longitudinal impact parameter
   Float_t Nclusters; // Number of ionization clusters
+  Float_t dNdx; // Number of ionization clusters
 
   Float_t ErrorP; // track momentum error
@@ -697 +699 @@
 
   Float_t Nclusters; // Number of ionization clusters
+  Float_t dNdx; // Number of ionization clusters per unit length
 
   Float_t Xd;

modules/ClusterCounting.cc

@@ -28 +28 @@
  */
 
-//FIXME add reference to Bedeschi-code
-//FIXME make sure about units of P, X
-//FIXME fix pt > 200 GeV issue and angle > 6.41
-
 #include "modules/ClusterCounting.h"
-
 #include "classes/DelphesClasses.h"
 #include "TrackCovariance/TrkUtil.h"
@@ -108 +103 @@
 {
   Candidate *candidate, *mother, *particle;
-  Double_t mass, Ncl;
+  Double_t mass, trackLength, Ncl;
 
   fItInputArray->Reset();
@@ -124 +119 @@
     mass = candidateMomentum.M();
 
+    trackLength = fTrackUtil->TrkLen(Par);
+
     mother    = candidate;
     candidate = static_cast<Candidate*>(candidate->Clone());
 
     Ncl = -999;
+
+
     // computation of Nclusters is not supported for electrons
+    /*
     if (TMath::Abs(particle->PID) == 11)
     {
       candidate->Nclusters = Ncl;
+      candidate->dNdx = -999;
     }
-    else if (fTrackUtil->IonClusters(Ncl, mass, Par))
+    */
+    if (fTrackUtil->IonClusters(Ncl, mass, Par))
     {
       candidate->Nclusters = Ncl;
+      candidate->dNdx = (trackLength > 0.) ? Ncl/trackLength : -1;
     }
-    //cout<<candidate->PID<<", "<<mass<<", "<<candidate->Nclusters<<endl;
 
     candidate->AddCandidate(mother);

modules/TreeWriter.cc

@@ -356 +356 @@
     entry->DZ = candidate->DZ;
     entry->Nclusters = candidate->Nclusters;
+    entry->dNdx = candidate->dNdx;
 
     entry->ErrorP = candidate->ErrorP;
@@ -510 +511 @@
     entry->DZ = candidate->DZ;
     entry->Nclusters = candidate->Nclusters;
+    entry->dNdx = candidate->dNdx;
 
     entry->ErrorP = candidate->ErrorP;