Changeset 4acf2fd in git for modules/ClusterCounting.cc

Timestamp:

May 17, 2021, 6:05:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

7dac4ea

Parents:

46d3442 (diff), 4afb18d (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:

Michele Selvaggi <michele.selvaggi@…> (05/17/21 18:05:38)

git-committer:

GitHub <noreply@…> (05/17/21 18:05:38)

Message:

Merge branch 'master' into master

File:

• modules/ClusterCounting.cc (modified) (4 diffs)

modules/ClusterCounting.cc

@@ -1 @@
-  /*
+   /*
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2020  Universite catholique de Louvain (UCLouvain), Belgium
@@ -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)
+    Ncl = 0.;
+    if (fTrackUtil->IonClusters(Ncl, mass, Par))
     {
       candidate->Nclusters = Ncl;
+      candidate->dNdx = (trackLength > 0.) ? Ncl/trackLength : -1;
     }
-    else if (fTrackUtil->IonClusters(Ncl, mass, Par))
-    {
-      candidate->Nclusters = Ncl;
-    }
-    //cout<<candidate->PID<<", "<<mass<<", "<<candidate->Nclusters<<endl;
 
     candidate->AddCandidate(mother);