Changes in / [1c1c9c2:2bb6079] in git

File:

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

cards/delphes_card_IDEA.tcl

@@ -68 +68 @@
   TauTagging
 
-  UniqueObjectFinder
-
-  ScalarHT
   TreeWriter
 }
@@ -80 +77 @@
 module TruthVertexFinder TruthVertexFinder {
 
-  ## below this distance two vertices are assumed to be the same
+  ## below this distance two vertices are assumed to be merged
   set Resolution 1E-06
 
@@ -120 +117 @@
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
-        (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
-        (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
+        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
+        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
+        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     }
 }
@@ -140 +137 @@
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
-        (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
-        (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
+        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
+        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
+        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     }
 }
@@ -158 +155 @@
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
-        (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
-        (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
+        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
+        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
+        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     }
 }
@@ -417 +414 @@
 
   # 0: assume vertex time tV from MC Truth (ideal case)
-  # 1: assume vertex time tV=0
+  # 1: assume vertex time tV = 0
   # 2: calculate vertex time as vertex TOF, assuming tPV=0
+
   set VertexTimeMode 2
-
-}
-
+}
 
 ##############
@@ -829 +825 @@
 
 
-#####################################################
-# Find uniquely identified photons/electrons/tau/jets
-#####################################################
-
-module UniqueObjectFinder UniqueObjectFinder {
-
-  set UseUniqueID true
-# earlier arrays take precedence over later ones
-# add InputArray InputArray OutputArray
-  add InputArray PhotonIsolation/photons photons
-  add InputArray ElectronIsolation/electrons electrons
-  add InputArray MuonIsolation/muons muons
-  add InputArray JetEnergyScale/jets jets
-}
-
 
 ##################
@@ -857 +838 @@
 
     add Branch Delphes/allParticles Particle GenParticle
+    add Branch TruthVertexFinder/vertices GenVertex Vertex
 
     add Branch TrackMerger/tracks Track Track
@@ -874 +856 @@
     add Branch GenMissingET/momentum GenMissingET MissingET
 
-    add Branch UniqueObjectFinder/jets Jet Jet
-    add Branch UniqueObjectFinder/electrons Electron Electron
-    add Branch UniqueObjectFinder/photons Photon Photon
-    add Branch UniqueObjectFinder/muons Muon Muon
+    add Branch JetEnergyScale/jets Jet Jet
+    add Branch ElectronIsolation/electrons Electron Electron
+    add Branch PhotonIsolation/photons Photon Photon
+    add Branch MuonIsolation/muons Muon Muon
 
     add Branch MissingET/momentum MissingET MissingET
-    add Branch ScalarHT/energy ScalarHT ScalarHT
 
     # add Info InfoName InfoValue