Changeset 3cd4c6e in git
- Timestamp:
- Nov 26, 2020, 3:49:23 PM (4 years ago)
- Branches:
- master
- Children:
- eee976c2
- Parents:
- 8dd735c (diff), ae5b7b7 (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:
- Aleksander Filip Żarnecki <zarnecki@…> (11/26/20 15:49:23)
- git-committer:
- GitHub <noreply@…> (11/26/20 15:49:23)
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cards/FCC/FCChh.tcl
r8dd735c r3cd4c6e 4 4 # Main authors: Michele Selvaggi (CERN) 5 5 # 6 # Released on: Dec. 1st, 2017 6 # Released on: October 14th, 2020 7 # 8 # - fix muon resolution at high pT 9 # - updated btagging, tau tagging and photon ID 10 # 7 11 # 8 12 # Configuration: FCC-hh baseline detector … … 1049 1053 (abs(eta) <= 2.5) * (pt > 1.0 && pt < 5.0) * (0.70) + 1050 1054 (abs(eta) <= 2.5) * (pt > 5.0 && pt < 10.0) * (0.85) + 1051 (abs(eta) <= 2.5) * (pt > 10.0) * (0.9 5) +1055 (abs(eta) <= 2.5) * (pt > 10.0) * (0.90) + 1052 1056 1053 1057 (abs(eta) > 2.5 && abs(eta) <= 4.0) * (pt > 1.0 && pt < 5.0) * (0.60) + … … 1138 1142 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.01)*(1.0 - pt/15000.) + \ 1139 1143 (abs(eta) < 2.5) * (pt > 15000.0) * (0.00) + \ 1140 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.0 075) + \1141 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.0 075)*(1.0 - pt/15000.) + \1144 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.01) + \ 1145 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.01)*(1.0 - pt/15000.) + \ 1142 1146 (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0) * (0.000) + \ 1143 1147 (abs(eta) > 4.0) * (0.00)} … … 1146 1150 1147 1151 (pt <= 10.0) * (0.00) + 1148 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0. 05) + \1149 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0. 05)*(1.0 - pt/15000.) + \1152 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.15) + \ 1153 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.15)*(1.0 - pt/15000.) + \ 1150 1154 (abs(eta) < 2.5) * (pt > 15000.0) * (0.000) + \ 1151 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0. 03) + \1152 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0. 03)*(1.0 - pt/15000.) + \1155 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.10) + \ 1156 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.10)*(1.0 - pt/15000.) + \ 1153 1157 (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0) * (0.000) + \ 1154 1158 (abs(eta) > 4.0) * (0.00)} … … 1157 1161 1158 1162 (pt <= 10.0) * (0.00) + 1159 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.8 5) +1160 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.8 5)*(1.0 - pt/15000.) +1163 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.82) + 1164 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.82)*(1.0 - pt/15000.) + 1161 1165 (abs(eta) < 2.5) * (pt > 15000.0) * (0.000) + 1162 1166 (abs(eta) >= 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.64) + … … 1217 1221 1218 1222 (pt <= 10.0) * (0.00) + 1219 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.0 1) + \1220 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.0 1) *(8./9. - pt/30000.) + \1223 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.02) + \ 1224 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.02) *(8./9. - pt/30000.) + \ 1221 1225 (abs(eta) < 2.5) * (pt > 34000.0) * (0.000) + \ 1222 1226 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.0075) + \ … … 1228 1232 1229 1233 (pt <= 10.0) * (0.00) + 1230 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.00 5) + \1231 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.00 5) *(8./9. - pt/30000.) + \1234 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.001) + \ 1235 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.001) *(8./9. - pt/30000.) + \ 1232 1236 (abs(eta) < 2.5) * (pt > 34000.0) * (0.000) + \ 1233 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.00 375) + \1234 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 5000.0 && pt < 34000.0) * (0.00 375)*(8./9. - pt/30000.) + \1237 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.001) + \ 1238 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 5000.0 && pt < 34000.0) * (0.001)*(8./9. - pt/30000.) + \ 1235 1239 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 34000.0) * (0.00) + \ 1236 1240 (abs(eta) > 4.0) * (0.00)} -
cards/FCC/muonMomentumResolutionVsP.tcl
r8dd735c r3cd4c6e 12 12 set ResolutionFormula { 13 13 14 ( abs(eta) < 1.35 ) * 15 16 (sqrt(0.0000364164 + ( 17 9.06262e-8 *pt^2* cosh( 18 eta)^2 *(2.82074e-7/sin(2*atan(exp(-abs(eta))))^2 + ( 19 504.525 *(1/400000000 + (0.117945* 1/cosh(eta)^2)/( 20 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 21 sin(2*atan(exp(-abs(eta))))^2) *sin(2*atan(exp(-abs(eta))))^2)/( 22 0.00516429/sin(2*atan(exp(-abs(eta))))^2 + ( 23 96868.8 *(1/400000000 + (0.117945 * 1/cosh(eta)^2)/( 24 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 25 sin(2*atan(exp(-abs(eta))))^2)) 26 27 ) + 14 15 ( abs(eta) < 1.35 ) * 16 17 (sqrt(0.0000364164 + ( 18 3*9.06262e-8 *pt^2* cosh( 19 eta)^2 *(2.82074e-7/sin(2*atan(exp(-abs(eta))))^2 + ( 20 504.525 *(1/400000000 + (0.117945* 1/cosh(eta)^2)/( 21 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 22 sin(2*atan(exp(-abs(eta))))^2) *sin(2*atan(exp(-abs(eta))))^2)/( 23 0.00516429/sin(2*atan(exp(-abs(eta))))^2 + ( 24 96868.8 *(1/400000000 + 5*(0.117945 * 1/cosh(eta)^2)/( 25 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 26 sin(2*atan(exp(-abs(eta))))^2)) 27 28 ) + 28 29 29 30 ( abs(eta) > 1.35 && abs(eta) < 2.00) * -
cards/delphes_card_CircularEE.tcl
r8dd735c r3cd4c6e 52 52 BTagging 53 53 CTagging 54 TauTagging 54 TauTaggingTight 55 TauTaggingLoose 55 56 56 57 BTaggingExclusive_N2 … … 62 63 CTaggingExclusive_N6 63 64 64 TauTaggingExclusive_N2 65 TauTaggingExclusive_N4 66 TauTaggingExclusive_N6 65 TauTaggingTightExclusive_N2 66 TauTaggingTightExclusive_N4 67 TauTaggingTightExclusive_N6 68 69 TauTaggingLooseExclusive_N2 70 TauTaggingLooseExclusive_N4 71 TauTaggingLooseExclusive_N6 67 72 68 73 ScalarHT … … 719 724 720 725 721 module TauTagging TauTagging {726 module TauTagging TauTaggingTight { 722 727 set ParticleInputArray Delphes/allParticles 723 728 set PartonInputArray Delphes/partons 724 729 set JetInputArray JetEnergyScale/jets 725 730 731 set BitNumber 0 732 726 733 set DeltaR 0.5 727 734 … … 740 747 741 748 749 ############# 750 # tau-tagging 751 ############# 752 753 754 module TauTagging TauTaggingLoose { 755 set ParticleInputArray Delphes/allParticles 756 set PartonInputArray Delphes/partons 757 set JetInputArray JetEnergyScale/jets 758 759 set BitNumber 1 760 761 set DeltaR 0.5 762 763 set TauPTMin 1.0 764 765 set TauEtaMax 3.0 766 767 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt} 768 769 # default efficiency formula (misidentification rate) 770 add EfficiencyFormula {0} {0.1} 771 # efficiency formula for tau-jets 772 add EfficiencyFormula {15} {0.85} 773 } 774 775 776 742 777 ########### 743 778 # b-tagging … … 784 819 785 820 786 module TauTagging TauTagging Exclusive_N2 {821 module TauTagging TauTaggingTightExclusive_N2 { 787 822 set ParticleInputArray Delphes/allParticles 788 823 set PartonInputArray Delphes/partons 789 824 set JetInputArray ExclusiveFastJetFinder_N2/jets 790 825 826 set BitNumber 0 827 791 828 set DeltaR 0.5 792 829 … … 804 841 805 842 843 ############# 844 # tau-tagging 845 ############# 846 847 848 module TauTagging TauTaggingLooseExclusive_N2 { 849 set ParticleInputArray Delphes/allParticles 850 set PartonInputArray Delphes/partons 851 set JetInputArray ExclusiveFastJetFinder_N2/jets 852 853 set BitNumber 1 854 855 set DeltaR 0.5 856 857 set TauPTMin 1.0 858 859 set TauEtaMax 3.0 860 861 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt} 862 863 # default efficiency formula (misidentification rate) 864 add EfficiencyFormula {0} {0.1} 865 # efficiency formula for tau-jets 866 add EfficiencyFormula {15} {0.85} 867 } 868 869 870 871 872 806 873 ########### 807 874 # b-tagging … … 848 915 849 916 850 module TauTagging TauTagging Exclusive_N4 {917 module TauTagging TauTaggingTightExclusive_N4 { 851 918 set ParticleInputArray Delphes/allParticles 852 919 set PartonInputArray Delphes/partons 853 920 set JetInputArray ExclusiveFastJetFinder_N4/jets 921 922 set BitNumber 0 854 923 855 924 set DeltaR 0.5 … … 866 935 add EfficiencyFormula {15} {0.4} 867 936 } 937 938 939 940 ############# 941 # tau-tagging 942 ############# 943 944 945 module TauTagging TauTaggingLooseExclusive_N4 { 946 set ParticleInputArray Delphes/allParticles 947 set PartonInputArray Delphes/partons 948 set JetInputArray ExclusiveFastJetFinder_N4/jets 949 950 set BitNumber 1 951 952 set DeltaR 0.5 953 954 set TauPTMin 1.0 955 956 set TauEtaMax 3.0 957 958 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt} 959 960 # default efficiency formula (misidentification rate) 961 add EfficiencyFormula {0} {0.1} 962 # efficiency formula for tau-jets 963 add EfficiencyFormula {15} {0.85} 964 } 965 966 967 868 968 ########### 869 969 # b-tagging … … 910 1010 911 1011 912 module TauTagging TauTagging Exclusive_N6 {1012 module TauTagging TauTaggingTightExclusive_N6 { 913 1013 set ParticleInputArray Delphes/allParticles 914 1014 set PartonInputArray Delphes/partons 915 1015 set JetInputArray ExclusiveFastJetFinder_N6/jets 916 1016 1017 set BitNumber 0 1018 917 1019 set DeltaR 0.5 918 1020 … … 927 1029 # efficiency formula for tau-jets 928 1030 add EfficiencyFormula {15} {0.4} 1031 } 1032 1033 1034 ############# 1035 # tau-tagging 1036 ############# 1037 1038 1039 module TauTagging TauTaggingLooseExclusive_N6 { 1040 set ParticleInputArray Delphes/allParticles 1041 set PartonInputArray Delphes/partons 1042 set JetInputArray ExclusiveFastJetFinder_N6/jets 1043 1044 set BitNumber 1 1045 1046 set DeltaR 0.5 1047 1048 set TauPTMin 1.0 1049 1050 set TauEtaMax 3.0 1051 1052 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt} 1053 1054 # default efficiency formula (misidentification rate) 1055 add EfficiencyFormula {0} {0.1} 1056 # efficiency formula for tau-jets 1057 add EfficiencyFormula {15} {0.85} 929 1058 } 930 1059 -
modules/TrackCovariance.cc
r8dd735c r3cd4c6e 133 133 candidate->D0 = track.GetObsPar()[0]*1e03; 134 134 candidate->Phi = track.GetObsPar()[1]; 135 candidate->C = track.GetObsPar()[2]*1e03; 135 136 // inverse of curvature 137 candidate->C = track.GetObsPar()[2]*1e-03; 136 138 candidate->DZ = track.GetObsPar()[3]*1e03; 137 139 candidate->CtgTheta = track.GetObsPar()[4]; … … 146 148 dpt = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz); 147 149 dp = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct)); 148 dC = TMath::Sqrt(track.GetCov()(2, 2))*1e 03;150 dC = TMath::Sqrt(track.GetCov()(2, 2))*1e-03; 149 151 150 152 candidate->ErrorD0 = dd0;
Note:
See TracChangeset
for help on using the changeset viewer.