Index: cards/FCC/FCChh.tcl
===================================================================
--- cards/FCC/FCChh.tcl	(revision 96c959ae71251ddcba3669e1eb1b0e57c44a22de)
+++ cards/FCC/FCChh.tcl	(revision 95e6b7a9f609a10b40f2c24832584ce3b3460a6e)
@@ -15,4 +15,9 @@
   
   ParticlePropagator
+  TrackMergerProp
+
+  DenseProp
+  DenseMergeTracks
+  DenseTrackFilter
 
   ChargedHadronTrackingEfficiency
@@ -24,7 +29,4 @@
   MuonMomentumSmearing
 
-  DenseProp
-  DenseMergeTracks
-  TrackMergerProp  
   TrackMerger
 
@@ -82,8 +84,7 @@
 }
 
-#
-#################################
-# Propagate particles in cylinder
-#################################
+#####################################
+# Track propagation to calorimeters
+#####################################
 
 module ParticlePropagator ParticlePropagator {
@@ -103,4 +104,77 @@
 }
 
+
+##############
+# 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 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 DenseTrackFilter {
+
+  set TrackInputArray DenseMergeTracks/tracks
+
+  set TrackOutputArray tracks
+  set ChargedHadronOutputArray chargedHadrons
+  set ElectronOutputArray electrons
+  set MuonOutputArray muons
+
+  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}]
+  }
+}
+
 ####################################
 # Charged hadron tracking efficiency
@@ -108,5 +182,5 @@
 
 module Efficiency ChargedHadronTrackingEfficiency {
-  set InputArray ParticlePropagator/chargedHadrons
+  set InputArray DenseTrackFilter/chargedHadrons
   set OutputArray chargedHadrons
 
@@ -131,5 +205,5 @@
 
 module Efficiency ElectronTrackingEfficiency {
-  set InputArray ParticlePropagator/electrons
+  set InputArray DenseTrackFilter/electrons
   set OutputArray electrons
 
@@ -147,4 +221,5 @@
 
 }
+
 ##########################
 # Muon tracking efficiency
@@ -152,5 +227,5 @@
 
 module Efficiency MuonTrackingEfficiency {
-  set InputArray ParticlePropagator/muons
+  set InputArray DenseTrackFilter/muons
   set OutputArray muons
 
@@ -202,10 +277,9 @@
 }
 
-
 ##############
 # Track merger
 ##############
 
-module Merger TrackMergerProp {
+module Merger TrackMerger {
 # add InputArray InputArray
   add InputArray ChargedHadronMomentumSmearing/chargedHadrons
@@ -214,75 +288,4 @@
   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
-  }
-}
-
 
 
