Changeset 27cd45c in git

Timestamp:

Dec 5, 2017, 8:36:19 PM (7 years ago)

Author:

Michele Selvaggi (michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8d4d51b

Parents:

ccd0cf1

Message:

update FCChh card

File:

• cards/FCC/FCChh.tcl (modified) (10 diffs)

cards/FCC/FCChh.tcl

@@ -4 +4 @@
 #  Main authors:  Michele Selvaggi (CERN)
 #
-#  Released on: Apr. 6th, 2017
+#  Released on: Dec. 1st, 2017
 #
 #  Configuration: FCC-hh baseline detector
@@ -13 +13 @@
 
 set ExecutionPath {
-
+  
   ParticlePropagator
 
@@ -24 +24 @@
   MuonMomentumSmearing
 
+  DenseProp
+  DenseMergeTracks
+  TrackMergerProp  
   TrackMerger
 
@@ -67 +70 @@
 }
 
+#
 #################################
 # Propagate particles in cylinder
@@ -73 +77 @@
 module ParticlePropagator ParticlePropagator {
   set InputArray Delphes/stableParticles
-
   set OutputArray stableParticles
   set ChargedHadronOutputArray chargedHadrons
@@ -187 +190 @@
 }
 
+
 ##############
 # Track merger
 ##############
 
-module Merger TrackMerger {
+module Merger TrackMergerProp {
 # add InputArray InputArray
   add InputArray ChargedHadronMomentumSmearing/chargedHadrons
@@ -198 +202 @@
   set OutputArray tracks
 }
+
+
+#################################
+# Dense Track propagation
+#################################
+
+module ParticlePropagator DenseProp {
+  set InputArray Delphes/stableParticles
+
+  set OutputArray stableParticles
+  set NeutralOutputArray neutralParticles
+  set ChargedHadronOutputArray chargedHadrons
+  set ElectronOutputArray electrons
+  set MuonOutputArray muons
+
+  # radius of the magnetic field coverage, in m
+  set Radius 0.45
+  set RadiusMax 1.5
+  # half-length of the magnetic field coverage, in m
+  set HalfLength 0.8
+  set HalfLengthMax 5
+
+  # magnetic field
+  set Bz 4.0
+}
+
+####################
+# Dense Track merger
+###################
+
+module Merger DenseMergeTracks {
+# add InputArray InputArray
+  add InputArray DenseProp/chargedHadrons
+  add InputArray DenseProp/electrons
+  add InputArray DenseProp/muons
+  set OutputArray tracks
+}
+
+
+######################
+#   Dense Track Filter
+######################
+
+module DenseTrackFilter TrackMerger {
+  set TrackInputArray TrackMergerProp/tracks
+  set DenseChargedInputArray DenseMergeTracks/tracks
+
+  set TrackOutputArray tracks
+
+  set EtaPhiRes 0.001
+  set EtaMax 6.0
+
+  set pi [expr {acos(-1)}]
+
+  set nbins_phi [expr {$pi/$EtaPhiRes} ]
+  set nbins_phi [expr {int($nbins_phi)} ]
+
+  set PhiBins {}
+  for {set i -$nbins_phi} {$i <= $nbins_phi} {incr i} {
+    add PhiBins [expr {$i * $pi/$nbins_phi}]
+  }
+
+  set nbins_eta [expr {$EtaMax/$EtaPhiRes} ]
+  set nbins_eta [expr {int($nbins_eta)} ]
+
+  for {set i -$nbins_eta} {$i <= $nbins_eta} {incr i} {
+    set eta [expr {$i * $EtaPhiRes}]
+    add EtaPhiBins $eta $PhiBins
+  }
+}
+
+
 
 #############
@@ -524 +600 @@
   set ParameterR 0.4
 
+  set ComputeNsubjettiness 1
+  set Beta 1.0
+  set AxisMode 4
+
+  set ComputeTrimming 1
+  set RTrim 0.2
+  set PtFracTrim 0.05
+
+  set ComputePruning 1
+  set ZcutPrun 0.1
+  set RcutPrun 0.5
+  set RPrun 0.8
+
+  set ComputeSoftDrop 1
+  set BetaSoftDrop 0.0
+  set SymmetryCutSoftDrop 0.1
+  set R0SoftDrop 0.8
+
   set JetPTMin 30.0
 }
@@ -680 +774 @@
 
 
+
 ###########
 # b-tagging
@@ -703 +798 @@
 
   (pt <= 10.0)                       * (0.00) +
-  (abs(eta) < 2.5)                   * (pt > 10.0 && pt < 500)      * (0.04) + \
-  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 15000.0) * (0.04)*(1.0 - pt/15000.) + \
+  (abs(eta) < 2.5)                   * (pt > 10.0 && pt < 500)      * (0.05) + \
+  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 15000.0) * (0.05)*(1.0 - pt/15000.) + \
   (abs(eta) < 2.5)                   * (pt > 15000.0)               * (0.000) + \
   (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500)      * (0.03) + \