Changeset 781af69 in git for modules

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

Location:

modules

Files:

• ClusterCounting.cc (modified) (3 diffs)
• TreeWriter.cc (modified) (2 diffs)

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;