Fork me on GitHub

Changeset e70228d in git


Ignore:
Timestamp:
Jan 20, 2020, 5:09:36 PM (5 years ago)
Author:
Kaan Yüksel Oyulmaz <kaanyukseloyulmaz@…>
Branches:
Timing
Children:
6049672
Parents:
93bf9c6 (diff), 364dbe1 (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:

fixing merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cards/FCC/FCChh_PileUpVtx.tcl

    r93bf9c6 re70228d  
    1212#######################################
    1313
    14 set MaxEvents 100
     14set MaxEvents 1000
    1515set RandomSeed 123
    1616
     
    255255  add InputArray ElectronMomentumSmearing/electrons
    256256  add InputArray MuonMomentumSmearing/muons
     257
     258  set ActiveFraction 0.013
     259  set ChargeCollectionEfficiency 0.75
     260 
     261  # fixme: this number should probably be charge/energy dependent, or absolute number in MeV/cm?
     262  set Resolution 0.15
     263
     264  # active material properties (cf. http://pdg.lbl.gov/2014/AtomicNuclearProperties/properties8.dat)
     265  set Z 14.
     266  set A 28.0855
     267  set rho 2.329
     268 
     269  # material polarisation correction parameters
     270  set a 0.1492
     271  set m 3.2546
     272  set x0 0.2015
     273  set x1 2.8716
     274  set I 173.0
     275  set c0 4.4355
     276
    257277}
    258278
Note: See TracChangeset for help on using the changeset viewer.