Changes in / [db316cd:f8e61b2] in git

Files:

• cards/delphes_card_IDEA.tcl (modified) (13 diffs)
• modules/TimeOfFlight.cc (modified) (2 diffs)
• modules/TimeSmearing.cc (modified) (1 diff)

cards/delphes_card_IDEA.tcl

@@ -68 +68 @@
   TauTagging
 
+  UniqueObjectFinder
+
+  ScalarHT
   TreeWriter
 }
@@ -77 +80 @@
 module TruthVertexFinder TruthVertexFinder {
 
-  ## below this distance two vertices are assumed to be merged
+  ## below this distance two vertices are assumed to be the same
   set Resolution 1E-06
 
@@ -113 +116 @@
     set InputArray ParticlePropagator/chargedHadrons
     set OutputArray chargedHadrons
-    set UseMomentumVector true
-
     # We use only one efficiency, we set only 0 effincency out of eta bounds:
 
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (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)
+        (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)
     }
 }
@@ -134 +135 @@
     set InputArray ParticlePropagator/electrons
     set OutputArray electrons
-    set UseMomentumVector true
+
 
     # Current full simulation with CLICdet provides for electrons:
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (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)
+        (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)
     }
 }
@@ -153 +154 @@
     set InputArray ParticlePropagator/muons
     set OutputArray muons
-    set UseMomentumVector true
 
     # Current full simulation with CLICdet provides for muons:
     set EfficiencyFormula {
         (abs(eta) > 3.0)                                       * (0.000) +
-        (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)
+        (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)
     }
 }
@@ -417 +417 @@
 
   # 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
-}
+
+}
+
 
 ##############
@@ -720 +721 @@
 module FastJetFinder GenJetFinder {
   set InputArray NeutrinoFilter/filteredParticles
+
   set OutputArray jets
 
-  set JetAlgorithm 10
-  set ParameterR 1.5
-  set ParameterP -1.0
+  # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
+  set JetAlgorithm 6
+  set ParameterR 0.4
   set JetPTMin 1.0
-
 }
 
@@ -751 +752 @@
 
   # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
-  set JetAlgorithm 10
-  set ParameterR 1.5
-  set ParameterP -1.0
+  set JetAlgorithm 6
+  set ParameterR 0.4
   set JetPTMin 1.0
-
-
 }
 
@@ -768 +766 @@
 
   # scale formula for jets
-  set ScaleFormula {1.00}
+  set ScaleFormula {1.08}
 }
 
@@ -828 +826 @@
 
 
+#####################################################
+# 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
+}
+
 
 ##################
@@ -841 +854 @@
 
     add Branch Delphes/allParticles Particle GenParticle
-    add Branch TruthVertexFinder/vertices GenVertex Vertex
 
     add Branch TrackMerger/tracks Track Track
@@ -850 +862 @@
     add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
 
-    add Branch EFlowMerger/eflow ParticleFlowCandidate ParticleFlowCandidate
-
     add Branch Calorimeter/photons CaloPhoton Photon
     add Branch PhotonEfficiency/photons PhotonEff Photon
@@ -859 +869 @@
     add Branch GenMissingET/momentum GenMissingET MissingET
 
-    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 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 AntiKtJet Jet
 
     add Branch MissingET/momentum MissingET MissingET
+    add Branch ScalarHT/energy ScalarHT ScalarHT
 
     # add Info InfoName InfoValue

modules/TimeOfFlight.cc

@@ -164 +164 @@
         }
 
+
+    //ti = ti - t_truth;
+
     p = candidateMomentum.P();
 
@@ -187 +190 @@
     candidate->InitialPosition.SetT(ti * 1.0E3 * c_light);
 
-    // update particle mass based on TOF-based PID (commented for now, assume this calculation is done offline)
-    //candidate->Momentum.SetVectM(candidateMomentum.Vect(), mass);
+    // update particle mass based on TOF-based PID
+    candidate->Momentum.SetVectM(candidateMomentum.Vect(), mass);
 
     candidate->AddCandidate(mother);

modules/TimeSmearing.cc

@@ -103 +103 @@
   while((candidate = static_cast<Candidate *>(fItTrackInputArray->Next())))
   {
-
+    // converting to meters
     const TLorentzVector &candidateFinalPosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;