Changeset d870fc5 in git for cards/delphes_card_FCC_basic.tcl

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

• cards/delphes_card_FCC_basic.tcl (modified) (8 diffs)

cards/delphes_card_FCC_basic.tcl

@@ -18 +18 @@
   ImpactParameterSmearing
   
-  Ecal
-  Hcal
+  ECal
+  HCal
   
   TowerMerger
@@ -219 +219 @@
 #############
 
-module SimpleCalorimeter Ecal {
+module SimpleCalorimeter ECal {
   set ParticleInputArray ParticlePropagator/stableParticles
   set TrackInputArray ImpactParameterSmearing/tracks
@@ -226 +226 @@
   set EFlowTowerOutputArray eflowPhotons
   
-  set TowerMinEnergy 0.5
-  set TowerMinSignificance 1.0
+  set EnergyMin 0.5
+  set EnergySignificanceMin 1.0
   
   set pi [expr {acos(-1)}]
@@ -281 +281 @@
 #############
 
-module SimpleCalorimeter Hcal {
+module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
   set TrackInputArray ImpactParameterSmearing/tracks
@@ -288 +288 @@
   set EFlowTowerOutputArray eflowNeutralHadrons
   
-  set TowerMinEnergy 1.0
-  set TowerMinSignificance 1.0
+  set EnergyMin 1.0
+  set EnergySignificanceMin 1.0
  
   set pi [expr {acos(-1)}]
@@ -346 +346 @@
 module Merger TowerMerger {
 # add InputArray InputArray
-  add InputArray Ecal/ecalTowers
-  add InputArray Hcal/hcalTowers
+  add InputArray ECal/ecalTowers
+  add InputArray HCal/hcalTowers
   set OutputArray towers
 }
@@ -358 +358 @@
 # add InputArray InputArray
   add InputArray ImpactParameterSmearing/tracks
-  add InputArray Ecal/eflowPhotons
-  add InputArray Hcal/eflowNeutralHadrons
+  add InputArray ECal/eflowPhotons
+  add InputArray HCal/eflowNeutralHadrons
   set OutputArray eflow
 }
@@ -512 +512 @@
   
   add Branch ChargedHadronMomentumSmearing/chargedHadrons ChargedHadron Track
-  add Branch Hcal/eflowNeutralHadrons NeutralHadron Tower
-  add Branch Ecal/eflowPhotons Photon Photon
+  add Branch HCal/eflowNeutralHadrons NeutralHadron Tower
+  add Branch ECal/eflowPhotons Photon Photon
 
   add Branch ElectronEnergySmearing/electrons Electron Electron