Changes in cards/FCC/FCChh.tcl [4b59725:96d6bcf] in git

File:

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

cards/FCC/FCChh.tcl

@@ -2 +2 @@
 # Official Delphes card prepared by FCC-hh collaboration
 #
-#  Main authors:  Michele Selvaggi (CERN)
+#  Main authors: Heather Gray (CERN)
+#                Filip Moortgat (CERN)
+#                Michele Selvaggi (CERN)
 #
-#  Released on: Apr. 6th, 2017
+#  Released on: Nov 14th, 2016
 #
-#  Configuration: FCC-hh baseline detector
+#  Configuration: FCC-hh baseline detector 
 #
 #######################################
@@ -226 +228 @@
   # the list ends with the higher edged of the last tower
 
-  # 0.012 rad towers up to eta = 2.5 (barrel)
+  # 0.5 degree towers (5x5 mm^2)
    set PhiBins {}
   for {set i -256} {$i <= 256} {incr i} {
     add PhiBins [expr {$i * $pi/256.0}]
   } 
-
-  # 0.01 unit in eta up to eta = 2.5 (barrel)
-  for {set i -249} {$i <= 250} {incr i} {
-    set eta [expr {$i * 0.01}]
+ 
+  # TBC 
+  foreach eta {-2.4875 -2.475 -2.4625 -2.45 -2.4375 -2.425 -2.4125 -2.4 -2.3875 -2.375 -2.3625 -2.35 -2.3375 -2.325 -2.3125 -2.3 -2.2875 -2.275 -2.2625 -2.25 -2.2375 -2.225 -2.2125 -2.2 -2.1875 -2.175 -2.1625 -2.15 -2.1375 -2.125 -2.1125 -2.1 -2.0875 -2.075 -2.0625 -2.05 -2.0375 -2.025 -2.0125 -2 -1.9875 -1.975 -1.9625 -1.95 -1.9375 -1.925 -1.9125 -1.9 -1.8875 -1.875 -1.8625 -1.85 -1.8375 -1.825 -1.8125 -1.8 -1.7875 -1.775 -1.7625 -1.75 -1.7375 -1.725 -1.7125 -1.7 -1.6875 -1.675 -1.6625 -1.65 -1.6375 -1.625 -1.6125 -1.6 -1.5875 -1.575 -1.5625 -1.55 -1.5375 -1.525 -1.5125 -1.5 -1.4875 -1.475 -1.4625 -1.45 -1.4375 -1.425 -1.4125 -1.4 -1.3875 -1.375 -1.3625 -1.35 -1.3375 -1.325 -1.3125 -1.3 -1.2875 -1.275 -1.2625 -1.25 -1.2375 -1.225 -1.2125 -1.2 -1.1875 -1.175 -1.1625 -1.15 -1.1375 -1.125 -1.1125 -1.1 -1.0875 -1.075 -1.0625 -1.05 -1.0375 -1.025 -1.0125 -1.0 -0.9875 -0.975 -0.9625 -0.95 -0.9375 -0.925 -0.9125 -0.9 -0.8875 -0.875 -0.8625 -0.85 -0.8375 -0.825 -0.8125 -0.8 -0.7875 -0.775 -0.7625 -0.75 -0.7375 -0.725 -0.7125 -0.7 -0.6875 -0.675 -0.6625 -0.65 -0.6375 -0.625 -0.6125 -0.6 -0.5875 -0.575 -0.5625 -0.55 -0.5375 -0.525 -0.5125 -0.5 -0.4875 -0.475 -0.4625 -0.45 -0.4375 -0.425 -0.4125 -0.4 -0.3875 -0.375 -0.3625 -0.35 -0.3375 -0.325 -0.3125 -0.3 -0.2875 -0.275 -0.2625 -0.25 -0.2375 -0.225 -0.2125 -0.2 -0.1875 -0.175 -0.1625 -0.15 -0.1375 -0.125 -0.1125 -0.1 -0.0875 -0.075 -0.0625 -0.05 -0.0375 -0.025 -0.0125 0 0.0125 0.025 0.0375 0.05 0.0625 0.075 0.0875 0.1 0.1125 0.125 0.1375 0.15 0.1625 0.175 0.1875 0.2 0.2125 0.225 0.2375 0.25 0.2625 0.275 0.2875 0.3 0.3125 0.325 0.3375 0.35 0.3625 0.375 0.3875 0.4 0.4125 0.425 0.4375 0.45 0.4625 0.475 0.4875 0.5 0.5125 0.525 0.5375 0.55 0.5625 0.575 0.5875 0.6 0.6125 0.625 0.6375 0.65 0.6625 0.675 0.6875 0.7 0.7125 0.725 0.7375 0.75 0.7625 0.775 0.7875 0.8 0.8125 0.825 0.8375 0.85 0.8625 0.875 0.8875 0.9 0.9125 0.925 0.9375 0.95 0.9625 0.975 0.9875 1.0 1.0125 1.025 1.0375 1.05 1.0625 1.075 1.0875 1.1 1.1125 1.125 1.1375 1.15 1.1625 1.175 1.1875 1.2 1.2125 1.225 1.2375 1.25 1.2625 1.275 1.2875 1.3 1.3125 1.325 1.3375 1.35 1.3625 1.375 1.3875 1.4 1.4125 1.425 1.4375 1.45 1.4625 1.475 1.4875 1.5 1.5125 1.525 1.5375 1.55 1.5625 1.575 1.5875 1.6 1.6125 1.625 1.6375 1.65 1.6625 1.675 1.6875 1.7 1.7125 1.725 1.7375 1.75 1.7625 1.775 1.7875 1.8 1.8125 1.825 1.8375 1.85 1.8625 1.875 1.8875 1.9 1.9125 1.925 1.9375 1.95 1.9625 1.975 1.9875 2 2.0125 2.025 2.0375 2.05 2.0625 2.075 2.0875 2.1 2.1125 2.125 2.1375 2.15 2.1625 2.175 2.1875 2.2 2.2125 2.225 2.2375 2.25 2.2625 2.275 2.2875 2.3 2.3125 2.325 2.3375 2.35 2.3625 2.375 2.3875 2.4 2.4125 2.425 2.4375 2.45 2.4625 2.475 2.4875 2.5} {
     add EtaPhiBins $eta $PhiBins
   }
-
-  # 0.025 rad between 2.5 and 6.0
+  # 0.025 eta  x 0.025 for eta between 2.5 and 4.0
   set PhiBins {}
   for {set i -128} {$i <= 128} {incr i} {
     add PhiBins [expr {$i * $pi/128.0}]
   }
-
-  # 0.025 unit in eta between 2.5 and 6.0
-  for {set i 0} {$i <= 140} {incr i} {
-    set eta [expr { -6.00 + $i * 0.025}]
+  foreach eta {-3.975 -3.95 -3.925 -3.9 -3.875 -3.85 -3.825 -3.8 -3.775 -3.75 -3.725 -3.7 -3.675 -3.65 -3.625 -3.6 -3.575 -3.55 -3.525 -3.5 -3.475 -3.45 -3.425 -3.4 -3.375 -3.35 -3.325 -3.3 -3.275 -3.25 -3.225 -3.2 -3.175 -3.15 -3.125 -3.1 -3.075 -3.05 -3.025 -3.0 -2.975 -2.95 -2.925 -2.9 -2.875 -2.85 -2.825 -2.8 -2.775 -2.75 -2.725 -2.7 -2.675 -2.65 -2.625 -2.6 -2.575 -2.55 -2.525 -2.5 2.525 2.55 2.575 2.6 2.625 2.65 2.675 2.7 2.725 2.75 2.775 2.8 2.825 2.85 2.875 2.9 2.925 2.95 2.975 3.0 3.025 3.05 3.075 3.1 3.125 3.15 3.175 3.2 3.225 3.25 3.275 3.3 3.325 3.35 3.375 3.4 3.425 3.45 3.475 3.5 3.525 3.55 3.575 3.6 3.625 3.65 3.675 3.7 3.725 3.75 3.775 3.8 3.825 3.85 3.875 3.9 3.925 3.95 3.975 4.0} {
     add EtaPhiBins $eta $PhiBins
   }
 
-  for {set i 0} {$i <= 139} {incr i} {
-    set eta [expr { 2.525 + $i * 0.025}]
+  # 0.05 x 0.05 for eta between 4.0 and 6.0
+  set PhiBins {}
+  for {set i -64} {$i <= 64} {incr i} {
+    add PhiBins [expr {$i * $pi/64.0}]
+  }
+  foreach eta {-6.0 -5.95 -5.9 -5.85 -5.8 -5.75 -5.7 -5.65 -5.6 -5.55 -5.5 -5.45 -5.4 -5.35 -5.3 -5.25 -5.2 -5.15 -5.1 -5.05 -5.0 -4.95 -4.9 -4.85 -4.8 -4.75 -4.7 -4.65 -4.6 -4.55 -4.5 -4.45 -4.4 -4.35 -4.3 -4.25 -4.2 -4.15 -4.1 -4.05 -4 4.05 4.1 4.15 4.2 4.25 4.3 4.35 4.4 4.45 4.5 4.55 4.6 4.65 4.7 4.75 4.8 4.85 4.9 4.95 5.0 5.05 5.1 5.15 5.2 5.25 5.3 5.35 5.4 5.45 5.5 5.55 5.6 5.65 5.7 5.75 5.8 5.85 5.9 5.95 6.0} {
     add EtaPhiBins $eta $PhiBins
   }
-
   # default energy fractions {abs(PDG code)} {fraction of energy deposited in ECAL}
 
@@ -308 +308 @@
   # the list ends with the higher edged of the last tower
 
-  # 0.025 rad towers up to eta = 2.5 (barrel)
-   set PhiBins {}
-  for {set i -128} {$i <= 128} {incr i} {
-    add PhiBins [expr {$i * $pi/128.0}]
-  } 
-
-  # 0.025 unit in eta up to eta = 2.5 (barrel)
-  for {set i -99} {$i <= 100} {incr i} {
-    set eta [expr {$i * 0.025}]
-    add EtaPhiBins $eta $PhiBins
-  }
-
-  # 0.05 rad between 2.5 and 6.0
+  # 6 degree towers
   set PhiBins {}
   for {set i -64} {$i <= 64} {incr i} {
@@ -326 +314 @@
   }
 
-  # 0.05 unit in eta between 2.5 and 6.0
-  for {set i 0} {$i <= 70} {incr i} {
-    set eta [expr { -6.00 + $i * 0.05}]
+  # TBC 
+  foreach eta {-2.45 -2.4 -2.35 -2.3 -2.25 -2.2 -2.15 -2.1 -2.05 -2.0 -1.95 -1.9 -1.85 -1.8 -1.75 -1.7 -1.65 -1.6 -1.55 -1.5 -1.45 -1.4 -1.35 -1.3 -1.25 -1.2 -1.15 -1.1 -1.05 -1.0 -0.95 -0.9 -0.85 -0.8 -0.75 -0.7 -0.65 -0.6 -0.55 -0.5 -0.45 -0.4 -0.35 -0.3 -0.25 -0.2 -0.15 -0.1 -0.05 0.0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1.0 1.05 1.1 1.15 1.2 1.25 1.3 1.35 1.4 1.45 1.5 1.55 1.6 1.65 1.7 1.75 1.8 1.85 1.9 1.95 2.0 2.05 2.1 2.15 2.2 2.25 2.3 2.35 2.4 2.45 2.5} {
     add EtaPhiBins $eta $PhiBins
   }
 
-  for {set i 0} {$i <= 69} {incr i} {
-    set eta [expr { 2.55 + $i * 0.05}]
+  # 0.1 x 0.1 between eta 2.5 and 4.0
+  set PhiBins {}
+  for {set i -32} {$i <= 32} {incr i} {
+    add PhiBins [expr {$i * $pi/32.0}]
+  }
+  foreach eta {-3.9 -3.8 -3.7 -3.6 -3.5 -3.4 -3.3 -3.2 -3.1 -3.0 -2.9 -2.8 -2.7 -2.6 -2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0} {
     add EtaPhiBins $eta $PhiBins
   }
 
+  # 0.2 x 0.2 between eta 4.0 and 6.0
+  set PhiBins {}
+  for {set i -16} {$i <= 16} {incr i} {
+    add PhiBins [expr {$i * $pi/16.0}]
+  }
+  foreach eta {-6.0 -5.8 -5.6 -5.4 -5.2 -5.0 -4.8 -4.6 -4.4 -4.2 -4.0 4.2 4.4 4.6 4.8 5.0 5.2 5.4 5.6 5.8 6.0} {
+    add EtaPhiBins $eta $PhiBins
+  }
 
   # default energy fractions {abs(PDG code)} {Fecal Fhcal}
@@ -359 +358 @@
 
    # set HCalResolutionFormula {resolution formula as a function of eta and energy}
-  set ResolutionFormula {                     (abs(eta) <= 1.7) * sqrt(energy^2*0.03^2 + energy*0.50^2) + \
-                            (abs(eta) > 1.7 && abs(eta) <= 4.0) * sqrt(energy^2*0.05^2 + energy*0.80^2) + \
+  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)}
 }