Fork me on GitHub

Changeset c0756c4 in git


Ignore:
Timestamp:
Jun 16, 2016, 10:06:52 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
0f73bea
Parents:
efc1546 (diff), bc14a10 (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 'master' into dev_01

Location:
cards/CMS_PhaseII
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl

    refc1546 rc0756c4  
    2929  HCal
    3030
     31  PhotonEnergySmearing
     32
    3133  TowerMerger
    3234  EFlowMerger
    … …  
    5052  GenJetFinder
    5153  FastJetFinder
     54  FatJetFinder
    5255
    5356  ScalarHT
    … …  
    435438}
    436439
     440#################################
     441# Energy resolution for electrons
     442#################################
     443
     444module EnergySmearing PhotonEnergySmearing {
     445  set InputArray ECal/eflowPhotons
     446  set OutputArray eflowPhotons
     447
     448  # adding 1% extra photon smearing
     449  set ResolutionFormula {energy*0.01}
     450
     451}
     452
     453
    437454####################
    438455# Energy flow merger
    … …  
    442459# add InputArray InputArray
    443460  add InputArray HCal/eflowTracks
    444   add InputArray ECal/eflowPhotons
     461  add InputArray PhotonEnergySmearing/eflowPhotons
    445462  add InputArray HCal/eflowNeutralHadrons
    446463  set OutputArray eflow
    … …  
    537554}
    538555
     556
     557
     558
     559############
     560# Jet finder
     561############
     562
     563module FastJetFinder FatJetFinder {
     564#  set InputArray TowerMerger/towers
     565  set InputArray EFlowMerger/eflow
     566
     567  set OutputArray jets
     568
     569  set JetAlgorithm 5
     570  set ParameterR 0.8
     571
     572  set ComputeNsubjettiness 1
     573  set Beta 1.0
     574  set AxisMode 4
     575 
     576  set ComputeTrimming 1
     577  set RTrim 0.2
     578  set PtFracTrim 0.05
     579
     580  set ComputePruning 1
     581  set ZcutPrun 0.1
     582  set RcutPrun 0.5
     583  set RPrun 0.8
     584
     585  set ComputeSoftDrop 1
     586  set BetaSoftDrop 0.0
     587  set SymmetryCutSoftDrop 0.1
     588  set R0SoftDrop 0.8
     589
     590  set JetPTMin 200.0
     591}
     592
     593
     594
    539595##################
    540596# Jet Energy Scale
    … …  
    556612 
    557613  # particle for which calculate the isolation
    558   set CandidateInputArray ECal/eflowPhotons
     614  set CandidateInputArray PhotonEnergySmearing/eflowPhotons
    559615 
    560616  # isolation collection
    … …  
    801857
    802858  add Branch HCal/eflowTracks EFlowTrack Track
    803   add Branch ECal/eflowPhotons EFlowPhoton Tower
     859  add Branch PhotonEnergySmearing/eflowPhotons EFlowPhoton Tower
    804860  add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
    805861 
    … …  
    810866 
    811867  add Branch JetEnergyScale/jets Jet Jet
     868  add Branch FatJetFinder/jets FatJet Jet
    812869 
    813870  add Branch MissingET/momentum MissingET MissingET

  • cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl

    refc1546 rc0756c4  
    3030  ECal
    3131  HCal
    32 
     32 
     33  PhotonEnergySmearing
    3334  ElectronFilter
    3435  TrackPileUpSubtractor
    … …  
    6566  GenJetFinder
    6667  FastJetFinder
     68  FatJetFinder
    6769
    6870  ScalarHT
    … …  
    9698
    9799  # pre-generated minbias input file
    98   set PileUpFile ../eos/cms/store/group/upgrade/delphes/PhaseII/MinBias_100k.pileup
     100  #set PileUpFile ../eos/cms/store/group/upgrade/delphes/PhaseII/MinBias_100k.pileup
     101  set PileUpFile MinBias.pileup
    99102
    100103  # average expected pile up
    … …  
    464467}
    465468
     469#################################
     470# Energy resolution for electrons
     471#################################
     472
     473module EnergySmearing PhotonEnergySmearing {
     474  set InputArray ECal/eflowPhotons
     475  set OutputArray eflowPhotons
     476
     477  # adding 1% extra photon smearing
     478  set ResolutionFormula {energy*0.01}
     479
     480}
     481
     482
     483
    466484#################
    467485# Electron filter
    … …  
    512530module Merger NeutralEFlowMerger {
    513531# add InputArray InputArray
    514   add InputArray ECal/eflowPhotons
     532  add InputArray PhotonEnergySmearing/eflowPhotons
    515533  add InputArray HCal/eflowNeutralHadrons
    516534  set OutputArray eflowTowers
    … …  
    525543# add InputArray InputArray
    526544  add InputArray HCal/eflowTracks
    527   add InputArray ECal/eflowPhotons
     545  add InputArray PhotonEnergySmearing/eflowPhotons
    528546  add InputArray HCal/eflowNeutralHadrons
    529547  set OutputArray eflow
    … …  
    537555# add InputArray InputArray
    538556  add InputArray TrackMerger/tracks
    539   add InputArray ECal/eflowPhotons
     557  add InputArray PhotonEnergySmearing/eflowPhotons
    540558  add InputArray HCal/eflowNeutralHadrons
    541559  set OutputArray eflow
    … …  
    708726}
    709727
     728
     729
     730############
     731# Jet finder
     732############
     733
     734module FastJetFinder FatJetFinder {
     735#  set InputArray TowerMerger/towers
     736  set InputArray RunPUPPI/PuppiParticles
     737
     738  set OutputArray jets
     739
     740  set JetAlgorithm 5
     741  set ParameterR 0.8
     742
     743  set ComputeNsubjettiness 1
     744  set Beta 1.0
     745  set AxisMode 4
     746
     747  set ComputeTrimming 1
     748  set RTrim 0.2
     749  set PtFracTrim 0.05
     750
     751  set ComputePruning 1
     752  set ZcutPrun 0.1
     753  set RcutPrun 0.5
     754  set RPrun 0.8
     755
     756  set ComputeSoftDrop 1
     757  set BetaSoftDrop 0.0
     758  set SymmetryCutSoftDrop 0.1
     759  set R0SoftDrop 0.8
     760
     761  set JetPTMin 200.0
     762}
     763
     764
    710765##################
    711766# Jet Energy Scale
    … …  
    726781
    727782module PdgCodeFilter PhotonFilter {
    728   set InputArray ECal/eflowPhotons
     783  set InputArray PhotonEnergySmearing/eflowPhotons
    729784  set OutputArray photons
    730785  set Invert true
    … …  
    10161071
    10171072  add Branch JetEnergyScale/jets Jet Jet
     1073  add Branch FatJetFinder/jets FatJet Jet
    10181074
    10191075  add Branch MissingET/momentum MissingET MissingET
Note: See TracChangeset for help on using the changeset viewer.