Changeset 2bb6079 in git

Timestamp:

May 19, 2021, 10:56:14 AM (3 years ago)

Author:

michele <michele.selvaggi@…>

Branches:

master

Children:

5cc021e

Parents:

33a6b3a (diff), 1c1c9c2 (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.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

• cards/delphes_card_IDEA.tcl (modified) (5 diffs)

cards/delphes_card_IDEA.tcl

@@ -717 +717 @@
 module FastJetFinder GenJetFinder {
   set InputArray NeutrinoFilter/filteredParticles
-
   set OutputArray jets
 
-  # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
-  set JetAlgorithm 6
-  set ParameterR 0.4
+  set JetAlgorithm 10
+  set ParameterR 1.5
+  set ParameterP -1.0
   set JetPTMin 1.0
+
 }
 
@@ -748 +748 @@
 
   # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
-  set JetAlgorithm 6
-  set ParameterR 0.4
+  set JetAlgorithm 10
+  set ParameterR 1.5
+  set ParameterP -1.0
   set JetPTMin 1.0
+
+
 }
 
@@ -762 +765 @@
 
   # scale formula for jets
-  set ScaleFormula {1.08}
+  set ScaleFormula {1.00}
 }
 
@@ -844 +847 @@
     add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
 
+    add Branch EFlowMerger/eflow ParticleFlowCandidate ParticleFlowCandidate
+
     add Branch Calorimeter/photons CaloPhoton Photon
     add Branch PhotonEfficiency/photons PhotonEff Photon
@@ -856 +861 @@
     add Branch MuonIsolation/muons Muon Muon
 
-    add Branch JetEnergyScale/jets AntiKtJet Jet
-
     add Branch MissingET/momentum MissingET MissingET