Fork me on GitHub

Changeset 3ad158a in git


Ignore:
Timestamp:
May 8, 2018, 2:51:18 PM (7 years ago)
Author:
GitHub <noreply@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
0e0f211, 1db31ab
Parents:
a31331a (diff), befa255 (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.
git-author:
Michele Selvaggi <michele.selvaggi@…> (05/08/18 14:51:18)
git-committer:
GitHub <noreply@…> (05/08/18 14:51:18)
Message:

Merge pull request #58 from uschnoor/master

CLICdet card: updated jet energy correction

Location:
cards
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • cards/delphes_card_CLICdet_Stage2.tcl

    ra31331a r3ad158a  
    122122
    123123       
    124     JetEnergyScale_VLCR05N2                                                                 
    125     JetEnergyScale_VLCR05N3                                                                 
    126     JetEnergyScale_VLCR05N4                                                                 
    127     JetEnergyScale_VLCR05N5
    128     JetEnergyScale_VLCR05N6
    129     JetEnergyScale_VLCR05_inclusive
    130     JetEnergyScale_VLCR07N2
    131     JetEnergyScale_VLCR07N3
    132     JetEnergyScale_VLCR07N4
    133     JetEnergyScale_VLCR07N5
    134     JetEnergyScale_VLCR07N6
    135     JetEnergyScale_VLCR07_inclusive
    136     JetEnergyScale_VLCR10N2
    137     JetEnergyScale_VLCR10N3
    138     JetEnergyScale_VLCR10N4
    139     JetEnergyScale_VLCR10N5
    140     JetEnergyScale_VLCR10N6
    141     JetEnergyScale_VLCR10_inclusive
    142     JetEnergyScale_VLCR12N2
    143     JetEnergyScale_VLCR12N3
    144     JetEnergyScale_VLCR12N4
    145     JetEnergyScale_VLCR12N5
    146     JetEnergyScale_VLCR12N6
    147     JetEnergyScale_VLCR12_inclusive
    148     JetEnergyScale_VLCR15N2
    149     JetEnergyScale_VLCR15N3
    150     JetEnergyScale_VLCR15N4
    151     JetEnergyScale_VLCR15N5
    152     JetEnergyScale_VLCR15N6
    153     JetEnergyScale_VLCR15_inclusive
    154 
    155124
    156125    JetFlavorAssociation_R05N2
    … …  
    1018987source CLIC/CLICdet_JetReco.tcl
    1019988
    1020 
    1021 ###################
    1022 ## Jet Energy Scale
    1023 ###################
    1024 #
    1025 #module EnergyScale JetEnergyScale {
    1026 #    set InputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
    1027 #    set OutputArray jets
    1028 #
    1029 #    # scale formula for jets
    1030 #    set ScaleFormula {1.00}
    1031 #}
    1032989#########################################
    1033990# Jet Momentum Smearing to mimick overlay
    … …  
    1036993
    1037994source CLIC/CLICdet_JetSmearing_1500.tcl
    1038 
    1039 #########################################
    1040 # Jet Energy Scale to mimick overlay
    1041 #########################################
    1042 
    1043 source CLIC/CLICdet_JetScale_1500.tcl
    1044 
    1045 
    1046995
    1047996
    … …  
    11201069   
    11211070   ###with jet energy smearing and jet energy scaling
    1122     add Branch JetEnergyScale_VLCR05N2/JES_VLCjetsR05N2 JES_VLCjetR05N2 Jet
    1123     add Branch JetEnergyScale_VLCR05N3/JES_VLCjetsR05N3 JES_VLCjetR05N3 Jet
    1124     add Branch JetEnergyScale_VLCR05N4/JES_VLCjetsR05N4 JES_VLCjetR05N4 Jet
    1125     add Branch JetEnergyScale_VLCR05N5/JES_VLCjetsR05N5 JES_VLCjetR05N5 Jet
    1126     add Branch JetEnergyScale_VLCR05N6/JES_VLCjetsR05N6 JES_VLCjetR05N6 Jet
    1127 
    1128     add Branch JetEnergyScale_VLCR07N2/JES_VLCjetsR07N2 JES_VLCjetR07N2 Jet
    1129     add Branch JetEnergyScale_VLCR07N3/JES_VLCjetsR07N3 JES_VLCjetR07N3 Jet
    1130     add Branch JetEnergyScale_VLCR07N4/JES_VLCjetsR07N4 JES_VLCjetR07N4 Jet
    1131     add Branch JetEnergyScale_VLCR07N5/JES_VLCjetsR07N5 JES_VLCjetR07N5 Jet
    1132     add Branch JetEnergyScale_VLCR07N6/JES_VLCjetsR07N6 JES_VLCjetR07N6 Jet
    1133 
    1134     add Branch JetEnergyScale_VLCR10N2/JES_VLCjetsR10N2 JES_VLCjetR10N2 Jet
    1135     add Branch JetEnergyScale_VLCR10N3/JES_VLCjetsR10N3 JES_VLCjetR10N3 Jet
    1136     add Branch JetEnergyScale_VLCR10N4/JES_VLCjetsR10N4 JES_VLCjetR10N4 Jet
    1137     add Branch JetEnergyScale_VLCR10N5/JES_VLCjetsR10N5 JES_VLCjetR10N5 Jet
    1138     add Branch JetEnergyScale_VLCR10N6/JES_VLCjetsR10N6 JES_VLCjetR10N6 Jet
    1139 
    1140     add Branch JetEnergyScale_VLCR12N2/JES_VLCjetsR12N2 JES_VLCjetR12N2 Jet
    1141     add Branch JetEnergyScale_VLCR12N3/JES_VLCjetsR12N3 JES_VLCjetR12N3 Jet
    1142     add Branch JetEnergyScale_VLCR12N4/JES_VLCjetsR12N4 JES_VLCjetR12N4 Jet
    1143     add Branch JetEnergyScale_VLCR12N5/JES_VLCjetsR12N5 JES_VLCjetR12N5 Jet
    1144     add Branch JetEnergyScale_VLCR12N6/JES_VLCjetsR12N6 JES_VLCjetR12N6 Jet
    1145 
    1146     add Branch JetEnergyScale_VLCR15N2/JES_VLCjetsR15N2 JES_VLCjetR15N2 Jet
    1147     add Branch JetEnergyScale_VLCR15N3/JES_VLCjetsR15N3 JES_VLCjetR15N3 Jet
    1148     add Branch JetEnergyScale_VLCR15N4/JES_VLCjetsR15N4 JES_VLCjetR15N4 Jet
    1149     add Branch JetEnergyScale_VLCR15N5/JES_VLCjetsR15N5 JES_VLCjetR15N5 Jet
    1150     add Branch JetEnergyScale_VLCR15N6/JES_VLCjetsR15N6 JES_VLCjetR15N6 Jet
    1151 
    1152     add Branch JetEnergyScale_VLCR05_inclusive/JES_VLCjetsR05_inclusive JES_VLCjetR05_inclusive Jet
    1153     add Branch JetEnergyScale_VLCR07_inclusive/JES_VLCjetsR07_inclusive JES_VLCjetR07_inclusive Jet
    1154     add Branch JetEnergyScale_VLCR10_inclusive/JES_VLCjetsR10_inclusive JES_VLCjetR10_inclusive Jet
    1155     add Branch JetEnergyScale_VLCR12_inclusive/JES_VLCjetsR12_inclusive JES_VLCjetR12_inclusive Jet
    1156     add Branch JetEnergyScale_VLCR15_inclusive/JES_VLCjetsR15_inclusive JES_VLCjetR15_inclusive Jet
     1071    add Branch JetMomentumSmearing_VLCR05N2/JER_VLCjetsR05N2 JER_VLCjetR05N2 Jet
     1072    add Branch JetMomentumSmearing_VLCR05N3/JER_VLCjetsR05N3 JER_VLCjetR05N3 Jet
     1073    add Branch JetMomentumSmearing_VLCR05N4/JER_VLCjetsR05N4 JER_VLCjetR05N4 Jet
     1074    add Branch JetMomentumSmearing_VLCR05N5/JER_VLCjetsR05N5 JER_VLCjetR05N5 Jet
     1075    add Branch JetMomentumSmearing_VLCR05N6/JER_VLCjetsR05N6 JER_VLCjetR05N6 Jet
     1076
     1077    add Branch JetMomentumSmearing_VLCR07N2/JER_VLCjetsR07N2 JER_VLCjetR07N2 Jet
     1078    add Branch JetMomentumSmearing_VLCR07N3/JER_VLCjetsR07N3 JER_VLCjetR07N3 Jet
     1079    add Branch JetMomentumSmearing_VLCR07N4/JER_VLCjetsR07N4 JER_VLCjetR07N4 Jet
     1080    add Branch JetMomentumSmearing_VLCR07N5/JER_VLCjetsR07N5 JER_VLCjetR07N5 Jet
     1081    add Branch JetMomentumSmearing_VLCR07N6/JER_VLCjetsR07N6 JER_VLCjetR07N6 Jet
     1082
     1083    add Branch JetMomentumSmearing_VLCR10N2/JER_VLCjetsR10N2 JER_VLCjetR10N2 Jet
     1084    add Branch JetMomentumSmearing_VLCR10N3/JER_VLCjetsR10N3 JER_VLCjetR10N3 Jet
     1085    add Branch JetMomentumSmearing_VLCR10N4/JER_VLCjetsR10N4 JER_VLCjetR10N4 Jet
     1086    add Branch JetMomentumSmearing_VLCR10N5/JER_VLCjetsR10N5 JER_VLCjetR10N5 Jet
     1087    add Branch JetMomentumSmearing_VLCR10N6/JER_VLCjetsR10N6 JER_VLCjetR10N6 Jet
     1088
     1089    add Branch JetMomentumSmearing_VLCR12N2/JER_VLCjetsR12N2 JER_VLCjetR12N2 Jet
     1090    add Branch JetMomentumSmearing_VLCR12N3/JER_VLCjetsR12N3 JER_VLCjetR12N3 Jet
     1091    add Branch JetMomentumSmearing_VLCR12N4/JER_VLCjetsR12N4 JER_VLCjetR12N4 Jet
     1092    add Branch JetMomentumSmearing_VLCR12N5/JER_VLCjetsR12N5 JER_VLCjetR12N5 Jet
     1093    add Branch JetMomentumSmearing_VLCR12N6/JER_VLCjetsR12N6 JER_VLCjetR12N6 Jet
     1094
     1095    add Branch JetMomentumSmearing_VLCR15N2/JER_VLCjetsR15N2 JER_VLCjetR15N2 Jet
     1096    add Branch JetMomentumSmearing_VLCR15N3/JER_VLCjetsR15N3 JER_VLCjetR15N3 Jet
     1097    add Branch JetMomentumSmearing_VLCR15N4/JER_VLCjetsR15N4 JER_VLCjetR15N4 Jet
     1098    add Branch JetMomentumSmearing_VLCR15N5/JER_VLCjetsR15N5 JER_VLCjetR15N5 Jet
     1099    add Branch JetMomentumSmearing_VLCR15N6/JER_VLCjetsR15N6 JER_VLCjetR15N6 Jet
     1100
     1101    add Branch JetMomentumSmearing_VLCR05_inclusive/JER_VLCjetsR05_inclusive JER_VLCjetR05_inclusive Jet
     1102    add Branch JetMomentumSmearing_VLCR07_inclusive/JER_VLCjetsR07_inclusive JER_VLCjetR07_inclusive Jet
     1103    add Branch JetMomentumSmearing_VLCR10_inclusive/JER_VLCjetsR10_inclusive JER_VLCjetR10_inclusive Jet
     1104    add Branch JetMomentumSmearing_VLCR12_inclusive/JER_VLCjetsR12_inclusive JER_VLCjetR12_inclusive Jet
     1105    add Branch JetMomentumSmearing_VLCR15_inclusive/JER_VLCjetsR15_inclusive JER_VLCjetR15_inclusive Jet
    11571106
    11581107    ####

  • cards/delphes_card_CLICdet_Stage3.tcl

    ra31331a r3ad158a  
    123123
    124124       
    125     JetEnergyScale_VLCR05N2                                                                 
    126     JetEnergyScale_VLCR05N3                                                                 
    127     JetEnergyScale_VLCR05N4                                                                 
    128     JetEnergyScale_VLCR05N5
    129     JetEnergyScale_VLCR05N6
    130     JetEnergyScale_VLCR05_inclusive
    131     JetEnergyScale_VLCR07N2
    132     JetEnergyScale_VLCR07N3
    133     JetEnergyScale_VLCR07N4
    134     JetEnergyScale_VLCR07N5
    135     JetEnergyScale_VLCR07N6
    136     JetEnergyScale_VLCR07_inclusive
    137     JetEnergyScale_VLCR10N2
    138     JetEnergyScale_VLCR10N3
    139     JetEnergyScale_VLCR10N4
    140     JetEnergyScale_VLCR10N5
    141     JetEnergyScale_VLCR10N6
    142     JetEnergyScale_VLCR10_inclusive
    143     JetEnergyScale_VLCR12N2
    144     JetEnergyScale_VLCR12N3
    145     JetEnergyScale_VLCR12N4
    146     JetEnergyScale_VLCR12N5
    147     JetEnergyScale_VLCR12N6
    148     JetEnergyScale_VLCR12_inclusive
    149     JetEnergyScale_VLCR15N2
    150     JetEnergyScale_VLCR15N3
    151     JetEnergyScale_VLCR15N4
    152     JetEnergyScale_VLCR15N5
    153     JetEnergyScale_VLCR15N6
    154     JetEnergyScale_VLCR15_inclusive
    155 
    156125
    157126    JetFlavorAssociation_R05N2
    … …  
    1027996source CLIC/CLICdet_JetSmearing.tcl
    1028997
    1029 #########################################
    1030 # Jet Energy Scale to mimick overlay
    1031 #########################################
    1032 
    1033 source CLIC/CLICdet_JetScale.tcl
    1034 
    1035 
    1036998
    1037999
    … …  
    11091071   
    11101072   
    1111    ###with jet energy smearing and jet energy scale
    1112     add Branch JetEnergyScale_VLCR05N2/JES_VLCjetsR05N2 JES_VLCjetR05N2 Jet
    1113     add Branch JetEnergyScale_VLCR05N3/JES_VLCjetsR05N3 JES_VLCjetR05N3 Jet
    1114     add Branch JetEnergyScale_VLCR05N4/JES_VLCjetsR05N4 JES_VLCjetR05N4 Jet
    1115     add Branch JetEnergyScale_VLCR05N5/JES_VLCjetsR05N5 JES_VLCjetR05N5 Jet
    1116     add Branch JetEnergyScale_VLCR05N6/JES_VLCjetsR05N6 JES_VLCjetR05N6 Jet
    1117 
    1118     add Branch JetEnergyScale_VLCR07N2/JES_VLCjetsR07N2 JES_VLCjetR07N2 Jet
    1119     add Branch JetEnergyScale_VLCR07N3/JES_VLCjetsR07N3 JES_VLCjetR07N3 Jet
    1120     add Branch JetEnergyScale_VLCR07N4/JES_VLCjetsR07N4 JES_VLCjetR07N4 Jet
    1121     add Branch JetEnergyScale_VLCR07N5/JES_VLCjetsR07N5 JES_VLCjetR07N5 Jet
    1122     add Branch JetEnergyScale_VLCR07N6/JES_VLCjetsR07N6 JES_VLCjetR07N6 Jet
    1123 
    1124     add Branch JetEnergyScale_VLCR10N2/JES_VLCjetsR10N2 JES_VLCjetR10N2 Jet
    1125     add Branch JetEnergyScale_VLCR10N3/JES_VLCjetsR10N3 JES_VLCjetR10N3 Jet
    1126     add Branch JetEnergyScale_VLCR10N4/JES_VLCjetsR10N4 JES_VLCjetR10N4 Jet
    1127     add Branch JetEnergyScale_VLCR10N5/JES_VLCjetsR10N5 JES_VLCjetR10N5 Jet
    1128     add Branch JetEnergyScale_VLCR10N6/JES_VLCjetsR10N6 JES_VLCjetR10N6 Jet
    1129 
    1130     add Branch JetEnergyScale_VLCR12N2/JES_VLCjetsR12N2 JES_VLCjetR12N2 Jet
    1131     add Branch JetEnergyScale_VLCR12N3/JES_VLCjetsR12N3 JES_VLCjetR12N3 Jet
    1132     add Branch JetEnergyScale_VLCR12N4/JES_VLCjetsR12N4 JES_VLCjetR12N4 Jet
    1133     add Branch JetEnergyScale_VLCR12N5/JES_VLCjetsR12N5 JES_VLCjetR12N5 Jet
    1134     add Branch JetEnergyScale_VLCR12N6/JES_VLCjetsR12N6 JES_VLCjetR12N6 Jet
    1135 
    1136     add Branch JetEnergyScale_VLCR15N2/JES_VLCjetsR15N2 JES_VLCjetR15N2 Jet
    1137     add Branch JetEnergyScale_VLCR15N3/JES_VLCjetsR15N3 JES_VLCjetR15N3 Jet
    1138     add Branch JetEnergyScale_VLCR15N4/JES_VLCjetsR15N4 JES_VLCjetR15N4 Jet
    1139     add Branch JetEnergyScale_VLCR15N5/JES_VLCjetsR15N5 JES_VLCjetR15N5 Jet
    1140     add Branch JetEnergyScale_VLCR15N6/JES_VLCjetsR15N6 JES_VLCjetR15N6 Jet
    1141 
    1142     add Branch JetEnergyScale_VLCR05_inclusive/JES_VLCjetsR05_inclusive JES_VLCjetR05_inclusive Jet
    1143     add Branch JetEnergyScale_VLCR07_inclusive/JES_VLCjetsR07_inclusive JES_VLCjetR07_inclusive Jet
    1144     add Branch JetEnergyScale_VLCR10_inclusive/JES_VLCjetsR10_inclusive JES_VLCjetR10_inclusive Jet
    1145     add Branch JetEnergyScale_VLCR12_inclusive/JES_VLCjetsR12_inclusive JES_VLCjetR12_inclusive Jet
    1146     add Branch JetEnergyScale_VLCR15_inclusive/JES_VLCjetsR15_inclusive JES_VLCjetR15_inclusive Jet
     1073   ###with jet energy smearing
     1074    add Branch JetMomentumSmearing_VLCR05N2/JER_VLCjetsR05N2 JER_VLCjetR05N2 Jet
     1075    add Branch JetMomentumSmearing_VLCR05N3/JER_VLCjetsR05N3 JER_VLCjetR05N3 Jet
     1076    add Branch JetMomentumSmearing_VLCR05N4/JER_VLCjetsR05N4 JER_VLCjetR05N4 Jet
     1077    add Branch JetMomentumSmearing_VLCR05N5/JER_VLCjetsR05N5 JER_VLCjetR05N5 Jet
     1078    add Branch JetMomentumSmearing_VLCR05N6/JER_VLCjetsR05N6 JER_VLCjetR05N6 Jet
     1079
     1080    add Branch JetMomentumSmearing_VLCR07N2/JER_VLCjetsR07N2 JER_VLCjetR07N2 Jet
     1081    add Branch JetMomentumSmearing_VLCR07N3/JER_VLCjetsR07N3 JER_VLCjetR07N3 Jet
     1082    add Branch JetMomentumSmearing_VLCR07N4/JER_VLCjetsR07N4 JER_VLCjetR07N4 Jet
     1083    add Branch JetMomentumSmearing_VLCR07N5/JER_VLCjetsR07N5 JER_VLCjetR07N5 Jet
     1084    add Branch JetMomentumSmearing_VLCR07N6/JER_VLCjetsR07N6 JER_VLCjetR07N6 Jet
     1085
     1086    add Branch JetMomentumSmearing_VLCR10N2/JER_VLCjetsR10N2 JER_VLCjetR10N2 Jet
     1087    add Branch JetMomentumSmearing_VLCR10N3/JER_VLCjetsR10N3 JER_VLCjetR10N3 Jet
     1088    add Branch JetMomentumSmearing_VLCR10N4/JER_VLCjetsR10N4 JER_VLCjetR10N4 Jet
     1089    add Branch JetMomentumSmearing_VLCR10N5/JER_VLCjetsR10N5 JER_VLCjetR10N5 Jet
     1090    add Branch JetMomentumSmearing_VLCR10N6/JER_VLCjetsR10N6 JER_VLCjetR10N6 Jet
     1091
     1092    add Branch JetMomentumSmearing_VLCR12N2/JER_VLCjetsR12N2 JER_VLCjetR12N2 Jet
     1093    add Branch JetMomentumSmearing_VLCR12N3/JER_VLCjetsR12N3 JER_VLCjetR12N3 Jet
     1094    add Branch JetMomentumSmearing_VLCR12N4/JER_VLCjetsR12N4 JER_VLCjetR12N4 Jet
     1095    add Branch JetMomentumSmearing_VLCR12N5/JER_VLCjetsR12N5 JER_VLCjetR12N5 Jet
     1096    add Branch JetMomentumSmearing_VLCR12N6/JER_VLCjetsR12N6 JER_VLCjetR12N6 Jet
     1097
     1098    add Branch JetMomentumSmearing_VLCR15N2/JER_VLCjetsR15N2 JER_VLCjetR15N2 Jet
     1099    add Branch JetMomentumSmearing_VLCR15N3/JER_VLCjetsR15N3 JER_VLCjetR15N3 Jet
     1100    add Branch JetMomentumSmearing_VLCR15N4/JER_VLCjetsR15N4 JER_VLCjetR15N4 Jet
     1101    add Branch JetMomentumSmearing_VLCR15N5/JER_VLCjetsR15N5 JER_VLCjetR15N5 Jet
     1102    add Branch JetMomentumSmearing_VLCR15N6/JER_VLCjetsR15N6 JER_VLCjetR15N6 Jet
     1103
     1104    add Branch JetMomentumSmearing_VLCR05_inclusive/JER_VLCjetsR05_inclusive JER_VLCjetR05_inclusive Jet
     1105    add Branch JetMomentumSmearing_VLCR07_inclusive/JER_VLCjetsR07_inclusive JER_VLCjetR07_inclusive Jet
     1106    add Branch JetMomentumSmearing_VLCR10_inclusive/JER_VLCjetsR10_inclusive JER_VLCjetR10_inclusive Jet
     1107    add Branch JetMomentumSmearing_VLCR12_inclusive/JER_VLCjetsR12_inclusive JER_VLCjetR12_inclusive Jet
     1108    add Branch JetMomentumSmearing_VLCR15_inclusive/JER_VLCjetsR15_inclusive JER_VLCjetR15_inclusive Jet
    11471109
    11481110    ####
Note: See TracChangeset for help on using the changeset viewer.