Changeset c614dd7 in git

Timestamp:

Sep 23, 2019, 5:29:37 PM (5 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

3051358a, 84a097e

Parents:

ededa33

Message:

added neutral and charged energy fraction to jets

Files:

• classes/DelphesClasses.cc (modified) (2 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/FastJetFinder.cc (modified) (4 diffs)
• modules/TreeWriter.cc (modified) (1 diff)

classes/DelphesClasses.cc

@@ -151 +151 @@
   NCharged(0),
   NNeutrals(0),
+  NeutralEnergyFraction(0),  // charged energy fraction
+  ChargedEnergyFraction(0),  // neutral energy fraction 
   Beta(0),
   BetaStar(0),
@@ -322 +324 @@
   object.NCharged = NCharged;
   object.NNeutrals = NNeutrals;
+  object.NeutralEnergyFraction = NeutralEnergyFraction;
+  object.ChargedEnergyFraction = ChargedEnergyFraction;
   object.Beta = Beta;
   object.BetaStar = BetaStar;

classes/DelphesClasses.h

@@ -387 +387 @@
   Int_t NCharged; // number of charged constituents
   Int_t NNeutrals; // number of neutral constituents
+
+  Float_t NeutralEnergyFraction;  // charged energy fraction
+  Float_t ChargedEnergyFraction;  // neutral energy fraction 
+
   Float_t Beta; // (sum pt of charged pile-up constituents)/(sum pt of charged constituents)
   Float_t BetaStar; // (sum pt of charged constituents coming from hard interaction)/(sum pt of charged constituents)
@@ -677 +681 @@
   Float_t PTD;
   Float_t FracPt[5];
+  Float_t NeutralEnergyFraction;  // charged energy fraction
+  Float_t ChargedEnergyFraction;  // neutral energy fraction 
+
 
   // Timing information

modules/FastJetFinder.cc

@@ -316 +316 @@
   Double_t deta, dphi, detaMax, dphiMax;
   Double_t time, timeWeight;
+  Double_t neutralEnergyFraction, chargedEnergyFraction;
+
   Int_t number, ncharged, nneutrals;
   Int_t charge;
@@ -418 +420 @@
     nneutrals = 0;
 
+    neutralEnergyFraction =0.;
+    chargedEnergyFraction =0.;
+
     inputList.clear();
     inputList = sequence->constituents(*itOutputList);
@@ -432 +437 @@
 
       if(constituent->Charge == 0)
+      {
         nneutrals++;
+        neutralEnergyFraction += constituent->Momentum.E();
+      }
       else
+      {
         ncharged++;
-
+        chargedEnergyFraction += constituent->Momentum.E();
+      }
+      
       time += TMath::Sqrt(constituent->Momentum.E()) * (constituent->Position.T());
       timeWeight += TMath::Sqrt(constituent->Momentum.E());
@@ -454 +465 @@
     candidate->NNeutrals = nneutrals;
     candidate->NCharged = ncharged;
+
+    candidate->NeutralEnergyFraction = (momentum.E() > 0 ) ? neutralEnergyFraction/momentum.E() : 0.0;
+    candidate->ChargedEnergyFraction = (momentum.E() > 0 ) ? chargedEnergyFraction/momentum.E() : 0.0;
 
     //for exclusive clustering, access y_n,n+1 as exclusive_ymerge (fNJets);

modules/TreeWriter.cc

@@ -775 +775 @@
     entry->NCharged = candidate->NCharged;
     entry->NNeutrals = candidate->NNeutrals;
+
+    entry->NeutralEnergyFraction = candidate->NeutralEnergyFraction;
+    entry->ChargedEnergyFraction = candidate->ChargedEnergyFraction;
     entry->Beta = candidate->Beta;
     entry->BetaStar = candidate->BetaStar;