Changeset 667a02a in git for cards/CMS_PhaseII

Timestamp:

Jun 8, 2018, 3:23:13 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

e57c062

Parents:

001ee95 (diff), 17d0ab8 (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/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl (modified) (12 diffs)

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

@@ +1 @@
+########################################
 #
 #  Main authors: Michele Selvaggi (CERN)
@@ -15 +16 @@
   PileUpMerger
   ParticlePropagator
+  TrackMergerProp
+
+  DenseProp
+  DenseMergeTracks
+  DenseTrackFilter
 
   ChargedHadronTrackingEfficiency
@@ -24 +30 @@
   MuonMomentumSmearing
 
-  DenseProp
-  DenseMergeTracks
-  TrackMergerProp
   TrackMerger
 
@@ -159 +162 @@
 
 
-#################################
-# Dense Track propagation calo
-#################################
+#####################################
+# Track propagation to calorimeters
+#####################################
 
 module ParticlePropagator ParticlePropagator {
@@ -182 +185 @@
 
 
+##############
+# Track merger
+##############
+
+module Merger TrackMergerProp {
+# add InputArray InputArray
+  add InputArray ParticlePropagator/chargedHadrons
+  add InputArray ParticlePropagator/electrons
+  add InputArray ParticlePropagator/muons
+  set OutputArray tracks
+}
+
+
+####################################
+# Track propagation to pseudo-pixel
+####################################
+
+module ParticlePropagator DenseProp {
+
+  set InputArray TrackMergerProp/tracks
+
+  # radius of the first pixel layer
+  set Radius 0.3
+  set RadiusMax 1.29
+  # half-length of the magnetic field coverage, in m
+  set HalfLength 0.7
+  set HalfLengthMax 3.0
+
+  # magnetic field
+  set Bz 3.8
+}
+
+
+####################
+# 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 DenseTrackFilter {
+
+  set TrackInputArray DenseMergeTracks/tracks
+
+  set TrackOutputArray tracks
+  set ChargedHadronOutputArray chargedHadrons
+  set ElectronOutputArray electrons
+  set MuonOutputArray muons
+
+  set EtaPhiRes 0.003
+  set EtaMax 4.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
+  }
+
+}
+
 
 
@@ -190 +274 @@
 module Efficiency ChargedHadronTrackingEfficiency {
   ## particles after propagation
-  set InputArray  ParticlePropagator/chargedHadrons
+  set InputArray  DenseTrackFilter/chargedHadrons
   set OutputArray chargedHadrons
   # tracking efficiency formula for charged hadrons
@@ -211 +295 @@
 
 module Efficiency ElectronTrackingEfficiency {
-  set InputArray  ParticlePropagator/electrons
+  set InputArray  DenseTrackFilter/electrons
   set OutputArray electrons
   # tracking efficiency formula for electrons
@@ -234 +318 @@
 
 module Efficiency MuonTrackingEfficiency {
-  set InputArray ParticlePropagator/muons
+  set InputArray DenseTrackFilter/muons
   set OutputArray muons
   # tracking efficiency formula for muons
@@ -351 +435 @@
 }
 
+
 #################################
 # Energy resolution for electrons
@@ -390 +475 @@
 }
 
+
+
 ##############
 # Track merger
 ##############
 
-module Merger TrackMergerProp {
+module Merger TrackMerger {
 # add InputArray InputArray
   add InputArray ChargedHadronMomentumSmearing/chargedHadrons
@@ -400 +487 @@
   add InputArray MuonMomentumSmearing/muons
   set OutputArray tracks
-}
-
-
-#################################
-# Dense Track propagation
-#################################
-
-module ParticlePropagator DenseProp {
-  set InputArray PileUpMerger/stableParticles
-
-  set OutputArray stableParticles
-  set NeutralOutputArray neutralParticles
-  set ChargedHadronOutputArray chargedHadrons
-  set ElectronOutputArray electrons
-  set MuonOutputArray muons
-
-  # radius of the first pixel layer
-  set Radius 0.3
-  set RadiusMax 1.29
-  # half-length of the magnetic field coverage, in m
-  set HalfLength 0.7
-  set HalfLengthMax 3.0
-
-  # magnetic field
-  set Bz 3.8
-}
-
-####################
-# 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.003
-  set EtaMax 4.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
-  }
-
 }
 
@@ -693 +710 @@
   add PdgCode {-11}
 }
+