Changeset d3f950f in git

Timestamp:

Nov 7, 2014, 1:28:07 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6fb1a5d

Parents:

b25d4cf (diff), 35b9204 (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 'TestFastJet310b1' of github.com:delphes/delphes into TestFastJet310b1

Location:

examples

Files:

• Example4.C (added)
• delphes_card_ATLAS.tcl (modified) (1 diff)
• delphes_card_CMS.tcl (modified) (1 diff)

examples/delphes_card_ATLAS.tcl

@@ -475 +475 @@
   set OutputArray jets
 
- # scale formula for jets 
-  set ScaleFormula {  1.00  }
-
+  # scale formula for jets 
+  set ScaleFormula {  sqrt( (3.0 - 0.2*(abs(eta)))^2 / pt + 1.0 )  }
 }
 

examples/delphes_card_CMS.tcl

@@ -489 +489 @@
   set OutputArray jets
 
- # scale formula for jets
-  set ScaleFormula {1.00}
+  # scale formula for jets
+  set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
 }