Fork me on GitHub

Changeset 35807af in git


Ignore:
Timestamp:
Mar 6, 2018, 6:34:52 PM (7 years ago)
Author:
Ulrike Schnoor <schnooru@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
2971ebb, b4e1ab5
Parents:
a5f4828
Message:

Catch cases with less partons in events than N(jet) required by Exclusive clustering; also added jet energy smearing tentatively

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • cards/delphes_card_CLICdet.tcl

    ra5f4828 r35807af  
    8686
    8787   
     88    JetMomentumSmearing_VLCR05N2                                                                 
     89    JetMomentumSmearing_VLCR05N3                                                                 
     90    JetMomentumSmearing_VLCR05N4                                                                 
     91    JetMomentumSmearing_VLCR05N5
     92    JetMomentumSmearing_VLCR05N6
     93    JetMomentumSmearing_VLCR05_inclusive
     94    JetMomentumSmearing_VLCR07N2
     95    JetMomentumSmearing_VLCR07N3
     96    JetMomentumSmearing_VLCR07N4
     97    JetMomentumSmearing_VLCR07N5
     98    JetMomentumSmearing_VLCR07N6
     99    JetMomentumSmearing_VLCR07_inclusive
     100    JetMomentumSmearing_VLCR10N2
     101    JetMomentumSmearing_VLCR10N3
     102    JetMomentumSmearing_VLCR10N4
     103    JetMomentumSmearing_VLCR10N5
     104    JetMomentumSmearing_VLCR10N6
     105    JetMomentumSmearing_VLCR10_inclusive
     106    JetMomentumSmearing_VLCR12N2
     107    JetMomentumSmearing_VLCR12N3
     108    JetMomentumSmearing_VLCR12N4
     109    JetMomentumSmearing_VLCR12N5
     110    JetMomentumSmearing_VLCR12N6
     111    JetMomentumSmearing_VLCR12_inclusive
     112    JetMomentumSmearing_VLCR15N2
     113    JetMomentumSmearing_VLCR15N3
     114    JetMomentumSmearing_VLCR15N4
     115    JetMomentumSmearing_VLCR15N5
     116    JetMomentumSmearing_VLCR15N6
     117    JetMomentumSmearing_VLCR15_inclusive
     118
    88119
    89120    JetFlavorAssociation_R05N2
    … …  
    575606        add PhiBins [expr {$i * $pi/30.0}]
    576607    }
    577     # deta =0.1 for 0.9 < |eta| <=3.5
    578     #for -3.5 to -0.9, 26 segments
    579     for {set i 1} {$i <=27} {incr i} {
    580         set eta [expr {-3.6 + $i * 0.1}]
     608    # deta =0.1 for 0.9 < |eta| <=3.0
     609    #for -3.0 to -0.9, 21 segments
     610    for {set i 1} {$i <=22} {incr i} {
     611        set eta [expr {-3.1 + $i * 0.1}]
    581612        add EtaPhiBins $eta $PhiBins
    582613    }
    583     #same for 0.9 to 3.5
    584     for {set i 1} {$i <=27} {incr i} {
     614    #same for 0.9 to 3.0
     615    for {set i 1} {$i <=22} {incr i} {
    585616        set eta [expr {0.8 + $i * 0.1 }]
    586617        add EtaPhiBins $eta $PhiBins
    … …  
    964995#    set ScaleFormula {1.00}
    965996#}
    966 
     997#########################################
     998# Jet Momentum Smearing to mimick overlay
     999#########################################
     1000
     1001
     1002source CLICdet/CLICdet_JetSmearing.tcl
    9671003
    9681004########################
    … …  
    10371073
    10381074
     1075    ###with JER
     1076    add Branch JetMomentumSmearing_VLCR05N2/JER_VLCjetsR05N2 JER_VLCjetR05N2 Jet
     1077    add Branch JetMomentumSmearing_VLCR05N3/JER_VLCjetsR05N3 JER_VLCjetR05N3 Jet
     1078    add Branch JetMomentumSmearing_VLCR05N4/JER_VLCjetsR05N4 JER_VLCjetR05N4 Jet
     1079    add Branch JetMomentumSmearing_VLCR05N5/JER_VLCjetsR05N5 JER_VLCjetR05N5 Jet
     1080    add Branch JetMomentumSmearing_VLCR05N6/JER_VLCjetsR05N6 JER_VLCjetR05N6 Jet
     1081
     1082    add Branch JetMomentumSmearing_VLCR07N2/JER_VLCjetsR07N2 JER_VLCjetR07N2 Jet
     1083    add Branch JetMomentumSmearing_VLCR07N3/JER_VLCjetsR07N3 JER_VLCjetR07N3 Jet
     1084    add Branch JetMomentumSmearing_VLCR07N4/JER_VLCjetsR07N4 JER_VLCjetR07N4 Jet
     1085    add Branch JetMomentumSmearing_VLCR07N5/JER_VLCjetsR07N5 JER_VLCjetR07N5 Jet
     1086    add Branch JetMomentumSmearing_VLCR07N6/JER_VLCjetsR07N6 JER_VLCjetR07N6 Jet
     1087
     1088    add Branch JetMomentumSmearing_VLCR10N2/JER_VLCjetsR10N2 JER_VLCjetR10N2 Jet
     1089    add Branch JetMomentumSmearing_VLCR10N3/JER_VLCjetsR10N3 JER_VLCjetR10N3 Jet
     1090    add Branch JetMomentumSmearing_VLCR10N4/JER_VLCjetsR10N4 JER_VLCjetR10N4 Jet
     1091    add Branch JetMomentumSmearing_VLCR10N5/JER_VLCjetsR10N5 JER_VLCjetR10N5 Jet
     1092    add Branch JetMomentumSmearing_VLCR10N6/JER_VLCjetsR10N6 JER_VLCjetR10N6 Jet
     1093
     1094    add Branch JetMomentumSmearing_VLCR12N2/JER_VLCjetsR12N2 JER_VLCjetR12N2 Jet
     1095    add Branch JetMomentumSmearing_VLCR12N3/JER_VLCjetsR12N3 JER_VLCjetR12N3 Jet
     1096    add Branch JetMomentumSmearing_VLCR12N4/JER_VLCjetsR12N4 JER_VLCjetR12N4 Jet
     1097    add Branch JetMomentumSmearing_VLCR12N5/JER_VLCjetsR12N5 JER_VLCjetR12N5 Jet
     1098    add Branch JetMomentumSmearing_VLCR12N6/JER_VLCjetsR12N6 JER_VLCjetR12N6 Jet
     1099
     1100    add Branch JetMomentumSmearing_VLCR15N2/JER_VLCjetsR15N2 JER_VLCjetR15N2 Jet
     1101    add Branch JetMomentumSmearing_VLCR15N3/JER_VLCjetsR15N3 JER_VLCjetR15N3 Jet
     1102    add Branch JetMomentumSmearing_VLCR15N4/JER_VLCjetsR15N4 JER_VLCjetR15N4 Jet
     1103    add Branch JetMomentumSmearing_VLCR15N5/JER_VLCjetsR15N5 JER_VLCjetR15N5 Jet
     1104    add Branch JetMomentumSmearing_VLCR15N6/JER_VLCjetsR15N6 JER_VLCjetR15N6 Jet
     1105
     1106    add Branch JetMomentumSmearing_VLCR05_inclusive/JER_VLCjetsR05_inclusive JER_VLCjetR05_inclusive Jet
     1107    add Branch JetMomentumSmearing_VLCR07_inclusive/JER_VLCjetsR07_inclusive JER_VLCjetR07_inclusive Jet
     1108    add Branch JetMomentumSmearing_VLCR10_inclusive/JER_VLCjetsR10_inclusive JER_VLCjetR10_inclusive Jet
     1109    add Branch JetMomentumSmearing_VLCR12_inclusive/JER_VLCjetsR12_inclusive JER_VLCjetR12_inclusive Jet
     1110    add Branch JetMomentumSmearing_VLCR15_inclusive/JER_VLCjetsR15_inclusive JER_VLCjetR15_inclusive Jet
     1111
     1112    ####
     1113
    10391114    add Branch GenMissingET/momentum GenMissingET MissingET
    10401115

  • modules/FastJetFinder.cc

    ra5f4828 r35807af  
    384384  if(fExclusiveClustering)
    385385    {
    386       outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
     386   try{
     387     outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
     388   }
     389   catch(fastjet::Error)
     390     {
     391       outputList.clear();
     392     }
    387393
    388394      excl_ymerge23 = sequence->exclusive_ymerge( 2 );
Note: See TracChangeset for help on using the changeset viewer.