Index: examples/delphes_card_FCC_basic.tcl
===================================================================
--- examples/delphes_card_FCC_basic.tcl	(revision 37deb3b5a30eecd538f19c551b5c20c97065a5af)
+++ examples/delphes_card_FCC_basic.tcl	(revision acf622f34bdb90f07ff7a6e09655db1cc9f9afbc)
@@ -15,4 +15,5 @@
 
   TrackMerger
+  AngularSmearing
   ImpactParameterSmearing
   
@@ -52,10 +53,10 @@
 
   # radius of the magnetic field coverage, in m
-  set Radius 5.00
+  set Radius 2.60
   # half-length of the magnetic field coverage, in m
-  set HalfLength 12.00
+  set HalfLength 6.00
 
   # magnetic field
-  set Bz 5.0
+  set Bz 6.0
 }
 
@@ -73,7 +74,7 @@
   set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
                                            (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.75) + \
-                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.99) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1   && pt <= 1.0)   * (0.70) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0)                  * (0.98) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1   && pt <= 1.0)   * (0.60) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0)                  * (0.90) + \
                          (abs(eta) > 4.0)                                                  * (0.00)}
 			 
@@ -129,12 +130,8 @@
 
   # resolution formula for charged hadrons
-  set ResolutionFormula {                  (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.02) + \
-                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e1) * (0.01) + \
-                                           (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
-                                           (abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1   && pt <= 1.0)   * (0.03) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0   && pt <= 1.0e1) * (0.02) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 2.0e2)                * (0.05)}
+  set ResolutionFormula {    (abs(eta) <= 1.5)                   * (pt > 0.1) * (0.01 + pt*2.e-5) + \
+                             (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1) * (0.02 + pt*3.e-5)}
+
+
 }
 
@@ -167,16 +164,8 @@
 
   # resolution formula for muons
-  set ResolutionFormula {                  (abs(eta) <= 0.5) * (pt > 0.1   && pt <= 5.0)   * (0.02) + \
-                                           (abs(eta) <= 0.5) * (pt > 5.0   && pt <= 1.0e2) * (0.015) + \
-                                           (abs(eta) <= 0.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.03) + \
-                                           (abs(eta) <= 0.5) * (pt > 2.0e2)                * (0.05 + pt*1.e-4) + \
-                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1   && pt <= 5.0)   * (0.03) + \
-                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 5.0   && pt <= 1.0e2) * (0.02) + \
-                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.04) + \
-                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05 + pt*1.e-4) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1   && pt <= 5.0)   * (0.04) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 5.0   && pt <= 1.0e2) * (0.035) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0e2 && pt <= 2.0e2) * (0.05) + \
-                         (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 2.0e2)                * (0.05 + pt*1.e-4)}
+  set ResolutionFormula {    (abs(eta) <= 1.5)                   * (pt > 0.1) * (0.01 + pt*5.e-6) + \
+                             (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1) * (0.02 + pt*1.e-5)}
+
+
 }
 
@@ -193,4 +182,22 @@
 }
 
+
+################################
+# Track angular smearing
+################################
+
+module AngularSmearing AngularSmearing {
+  set InputArray TrackMerger/tracks
+  set OutputArray tracks
+
+
+  # angular smearing  in eta formula as a function of pt and eta
+  set EtaResolutionFormula { 0.001 }
+
+  # angular smearing  in phi formula as a function of pt and eta
+  set PhiResolutionFormula { 0.001 }
+
+}
+
 ################################
 # Track impact parameter smearing
@@ -198,11 +205,11 @@
 
 module ImpactParameterSmearing ImpactParameterSmearing {
-  set InputArray TrackMerger/tracks
+  set InputArray AngularSmearing/tracks
   set OutputArray tracks
 
 
-# absolute impact parameter smearing formula (in mm) as a function of pt and eta
-set ResolutionFormula {(pt > 0.1  && pt <= 5.0)   * (0.010) + \
-                       (pt > 5.0)                 * (0.005)}
+  # absolute impact parameter smearing formula (in mm) as a function of pt and eta
+  set ResolutionFormula {(pt > 0.1  && pt <= 5.0)   * (0.010) + \
+                         (pt > 5.0)                 * (0.005)}
 
 }
@@ -219,4 +226,7 @@
   set EFlowTowerOutputArray eflowPhotons
   
+  set TowerMinEnergy 0.5
+  set TowerMinSignificance 1.0
+  
   set pi [expr {acos(-1)}]
 
@@ -224,31 +234,17 @@
   # each list starts with the lower edge of the first tower
   # the list ends with the higher edged of the last tower
-
-  # 5 degrees towers
+   
+  # 0.5 degree towers
   set PhiBins {}
-  for {set i -36} {$i <= 36} {incr i} {
-    add PhiBins [expr {$i * $pi/36.0}]
+  for {set i -360} {$i <= 360} {incr i} {
+    add PhiBins [expr {$i * $pi/360.0}]
   }
-  foreach eta {-1.566 -1.479 -1.392 -1.305 -1.218 -1.131 -1.044 -0.957 -0.87 -0.783 -0.696 -0.609 -0.522 -0.435 -0.348 -0.261 -0.174 -0.087 0 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.87 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653} {
+
+  # 0.01 unit in eta up to eta = 3
+  for {set i -300} {$i <= 300} {incr i} {
+    set eta [expr {$i * 0.01}]
     add EtaPhiBins $eta $PhiBins
   }
-
-  # 10 degrees towers
-  set PhiBins {}
-  for {set i -18} {$i <= 18} {incr i} {
-    add PhiBins [expr {$i * $pi/18.0}]
-  }
-  foreach eta {-4.35 -4.175 -4 -3.825 -3.65 -3.475 -3.3 -3.125 -2.95 -2.868 -2.65 -2.5 -2.322 -2.172 -2.043 -1.93 -1.83 -1.74 -1.653 1.74 1.83 1.93 2.043 2.172 2.322 2.5 2.65 2.868 2.95 3.125 3.3 3.475 3.65 3.825 4 4.175 4.35 4.525} {
-    add EtaPhiBins $eta $PhiBins
-  }
-
-  # 20 degrees towers
-  set PhiBins {}
-  for {set i -9} {$i <= 9} {incr i} {
-    add PhiBins [expr {$i * $pi/9.0}]
-  }
-  foreach eta {6 -5.6 -5.3 -5 -4.7 -4.525 4.7 5 5.3 5.6 6} {
-    add EtaPhiBins $eta $PhiBins
-  }
+  
   # default energy fractions {abs(PDG code)} {fraction of energy deposited in ECAL}
   
@@ -273,6 +269,8 @@
 
   # set ECalResolutionFormula {resolution formula as a function of eta and energy}
-  set ResolutionFormula {                     (abs(eta) <= 4.0) * sqrt(energy^2*0.005^2 + energy*0.02^2) + \
-                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.05^2  + energy*1.00^2)}
+  
+  # This is the CMS ECAL resolution, extended up eta = 6.0
+  set ResolutionFormula { (abs(eta) <= 3.0)                   * sqrt(energy^2*0.003^2 + energy*0.029^2 + 0.125^2)  + \
+                 	  (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
 
  
@@ -290,4 +288,7 @@
   set EFlowTowerOutputArray eflowNeutralHadrons
   
+  set TowerMinEnergy 1.0
+  set TowerMinSignificance 1.0
+ 
   set pi [expr {acos(-1)}]
 
@@ -295,32 +296,19 @@
   # each list starts with the lower edge of the first tower
   # the list ends with the higher edged of the last tower
-
-  # 5 degrees towers
+ 
+ 
+  # 5 degree towers
   set PhiBins {}
-  for {set i -36} {$i <= 36} {incr i} {
-    add PhiBins [expr {$i * $pi/36.0}]
+  for {set i -72} {$i <= 72} {incr i} {
+    add PhiBins [expr {$i * $pi/75.0}]
   }
-  foreach eta {-1.566 -1.479 -1.392 -1.305 -1.218 -1.131 -1.044 -0.957 -0.87 -0.783 -0.696 -0.609 -0.522 -0.435 -0.348 -0.261 -0.174 -0.087 0 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.87 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653} {
+
+  # 0.05 unit in eta up to eta = 3
+  for {set i -60} {$i <= 60} {incr i} {
+    set eta [expr {$i * 0.05}]
     add EtaPhiBins $eta $PhiBins
   }
-
-  # 10 degrees towers
-  set PhiBins {}
-  for {set i -18} {$i <= 18} {incr i} {
-    add PhiBins [expr {$i * $pi/18.0}]
-  }
-  foreach eta {-4.35 -4.175 -4 -3.825 -3.65 -3.475 -3.3 -3.125 -2.95 -2.868 -2.65 -2.5 -2.322 -2.172 -2.043 -1.93 -1.83 -1.74 -1.653 1.74 1.83 1.93 2.043 2.172 2.322 2.5 2.65 2.868 2.95 3.125 3.3 3.475 3.65 3.825 4 4.175 4.35 4.525} {
-    add EtaPhiBins $eta $PhiBins
-  }
-
-  # 20 degrees towers
-  set PhiBins {}
-  for {set i -9} {$i <= 9} {incr i} {
-    add PhiBins [expr {$i * $pi/9.0}]
-  }
-  foreach eta {6 -5.6 -5.3 -5 -4.7 -4.525 4.7 5 5.3 5.6 6} {
-    add EtaPhiBins $eta $PhiBins
-  }
-  
+ 
+   
   # default energy fractions {abs(PDG code)} {Fecal Fhcal}
   add EnergyFraction {0} {1.0}
@@ -343,9 +331,12 @@
   add EnergyFraction {3122} {0.7}
 
-   # set HCalResolutionFormula {resolution formula as a function of eta and energy}
-  set ResolutionFormula {                     (abs(eta) <= 4.0) * sqrt(energy^2*0.03^2 + energy*0.50^2) + \
-                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.05^2 + energy*1.00^2)}
-}
-
+  # set HCalResolutionFormula {resolution formula as a function of eta and energy}
+  
+  # This is the ATLAS HCAL resolution, extended up eta = 6.0
+  set HCalResolutionFormula {                  (abs(eta) <= 1.7) * sqrt(energy^2*0.0302^2 + energy*0.5205^2 + 1.59^2) + \
+                             (abs(eta) > 1.7 && abs(eta) <= 3.2) * sqrt(energy^2*0.0500^2 + energy*0.706^2) + \
+                             (abs(eta) > 3.2 && abs(eta) <= 6.0) * sqrt(energy^2*0.09420^2 + energy*1.00^2)}
+
+}
 
 ####################
@@ -428,5 +419,5 @@
   set ParameterR 0.5
 
-  set JetPTMin 5.0
+  set JetPTMin 100.0
 }
 
@@ -445,5 +436,5 @@
   set ParameterR 0.5
 
-  set JetPTMin 5.0
+  set JetPTMin 100.0
 }
 
