Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cms-analysis/CombineHarvester
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: CombineHarvester-v15.10
Choose a base ref
...
head repository: cms-analysis/CombineHarvester
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 33,362 additions and 5,694 deletions.
  1. +10 −0 .gitlab-ci.yml
  2. +7 −4 .travis.yml
  3. +1 −0 CombinePdfs/BuildFile.xml
  4. +0 −156 CombinePdfs/bin/AZhMorphing-NoModel.cpp
  5. +0 −232 CombinePdfs/bin/AZhMorphing.cpp
  6. +0 −115 CombinePdfs/bin/AdaptChargedHiggs.cpp
  7. +0 −9 CombinePdfs/bin/BuildFile.xml
  8. +0 −429 CombinePdfs/bin/HhhMSSMCombinationExample.cpp
  9. +0 −193 CombinePdfs/bin/HhhMorphingExample-NoModel.cpp
  10. +0 −275 CombinePdfs/bin/HhhMorphingExample.cpp
  11. +0 −145 CombinePdfs/bin/MorphingMSSM-NoModel.cpp
  12. +0 −348 CombinePdfs/bin/MorphingMSSM.cpp
  13. +0 −223 CombinePdfs/bin/MorphingMSSMUpdate-NoModel.cpp
  14. +4 −1 CombinePdfs/bin/SMLegacyMorphing.cpp
  15. +0 −1 CombinePdfs/input
  16. +68 −0 CombinePdfs/interface/CMSHistFuncFactory.h
  17. +1 −1 CombinePdfs/interface/MorphFunctions.h
  18. +17 −0 CombinePdfs/interface/Python.h
  19. +0 −160 CombinePdfs/python/AZh.py
  20. +0 −169 CombinePdfs/python/Hhh.py
  21. +392 −213 CombinePdfs/python/MSSM.py
  22. +4 −89 CombinePdfs/python/ModelIndependent.py
  23. +34 −86 CombinePdfs/python/{MSSMv2.py → THDM.py}
  24. +12 −0 CombinePdfs/python/morphing.py
  25. +0 −8 CombinePdfs/scripts/mssm_1Dlimit_grid.json
  26. +106 −0 CombinePdfs/scripts/mssm_bbh_boundaries.json
  27. +190 −0 CombinePdfs/scripts/mssm_ggh_bbh_boundaries.json
  28. +106 −0 CombinePdfs/scripts/mssm_ggh_boundaries.json
  29. +22 −3 CombinePdfs/scripts/mssm_hybrid_grid.json
  30. +3 −3 CombinePdfs/scripts/plotMorphing.py
  31. +732 −0 CombinePdfs/src/CMSHistFuncFactory.cc
  32. +62 −13 CombinePdfs/src/MorphFunctions.cc
  33. +36 −0 CombinePdfs/src/Python.cc
  34. +2 −1 CombineTools/BuildFile.xml
  35. +0 −135 CombineTools/bin/AZhExample.cpp
  36. +2 −3 CombineTools/bin/BuildFile.xml
  37. +71 −0 CombineTools/bin/Example3.cpp
  38. +0 −168 CombineTools/bin/HhhExample.cpp
  39. +2 −2 CombineTools/bin/LimitCompare.cpp
  40. +0 −232 CombineTools/bin/PostFitShapes.cpp
  41. +457 −0 CombineTools/bin/PostFitShapesFromWorkspace.cpp
  42. +36 −31 CombineTools/bin/SMLegacyExample.cpp
  43. +7 −0 CombineTools/input/job_prefixes/job_prefix_ic.txt
  44. +18 −0 CombineTools/input/job_prefixes/job_prefix_naf.txt
  45. +25 −0 CombineTools/interface/Algorithm.h
  46. +118 −0 CombineTools/interface/AutoRebin.h
  47. +39 −0 CombineTools/interface/BinByBin.h
  48. +105 −6 CombineTools/interface/CombineHarvester.h
  49. +13 −0 CombineTools/interface/CombineHarvester_Python.h
  50. +2 −1 CombineTools/interface/HistMapping.h
  51. +2 −2 CombineTools/interface/Logging.h
  52. +8 −0 CombineTools/interface/Object.h
  53. +13 −1 CombineTools/interface/Parameter.h
  54. +1 −1 CombineTools/interface/ParseCombineWorkspace.h
  55. +19 −4 CombineTools/interface/Process.h
  56. +15 −1 CombineTools/interface/Systematic.h
  57. +83 −0 CombineTools/interface/Systematics.h
  58. +3 −2 CombineTools/interface/TFileIO.h
  59. +1 −0 CombineTools/interface/Utilities.h
  60. +45 −0 CombineTools/interface/ValidationTools.h
  61. +18,490 −0 CombineTools/interface/json.hpp
  62. +202 −0 CombineTools/interface/strict_fstream.hpp
  63. +411 −0 CombineTools/interface/zstr.hpp
  64. +0 −4 CombineTools/makeGitVersion
  65. +80 −57 CombineTools/python/ch.py
  66. +177 −38 CombineTools/python/combine/CombineToolBase.py
  67. +166 −14 CombineTools/python/combine/EnhancedCombine.py
  68. +147 −0 CombineTools/python/combine/FastScan.py
  69. +240 −106 CombineTools/python/combine/Impacts.py
  70. +183 −20 CombineTools/python/combine/ImpactsFromScans.py
  71. +629 −372 CombineTools/python/combine/LimitGrids.py
  72. +280 −37 CombineTools/python/combine/Output.py
  73. +159 −0 CombineTools/python/combine/T2W.py
  74. +646 −0 CombineTools/python/combine/TaylorExpand.py
  75. +6 −4 CombineTools/python/combine/Workspace.py
  76. +2 −1 CombineTools/python/combine/crab.py
  77. +379 −0 CombineTools/python/combine/rounding.py
  78. +143 −8 CombineTools/python/combine/utils.py
  79. +7 −11 CombineTools/python/maketable.py
  80. +0 −137 CombineTools/python/mssm_multidim_fit_boundaries.py
  81. +54 −0 CombineTools/python/pdgRounding.py
  82. +1,793 −771 CombineTools/python/plotting.py
  83. +35 −0 CombineTools/scripts/Example3.py
  84. +32 −21 CombineTools/scripts/MSSMtanbPlot.py
  85. +4 −1 CombineTools/scripts/SMLegacyExample.py
  86. +132 −0 CombineTools/scripts/ValidateDatacards.py
  87. +13 −4 CombineTools/scripts/combineTool.py
  88. +28 −0 CombineTools/scripts/copyRemoteWorkspace.sh
  89. +1 −1 CombineTools/scripts/do_nothing_cfg.py
  90. +45 −0 CombineTools/scripts/parseCombineWorkspaceExample.py
  91. +81 −0 CombineTools/scripts/partialCorrelationEdit.py
  92. +264 −0 CombineTools/scripts/plot1DScan.py
  93. +21 −14 CombineTools/scripts/plotBSMxsBRLimit.py
  94. +297 −0 CombineTools/scripts/plotGof.py
  95. +212 −19 CombineTools/scripts/plotImpacts.py
  96. +332 −0 CombineTools/scripts/plotLimitGrid.py
  97. +184 −64 CombineTools/scripts/plotLimits.py
  98. +41 −0 CombineTools/scripts/simpleLimits.py
  99. +15 −0 CombineTools/scripts/sparse-checkout-https.sh
  100. +15 −0 CombineTools/scripts/sparse-checkout-plotting-https.sh
  101. +15 −0 CombineTools/scripts/sparse-checkout-plotting-ssh.sh
  102. +15 −0 CombineTools/scripts/sparse-checkout-ssh.sh
  103. +7 −0 CombineTools/scripts/testingPyInterface.py
  104. +1 −1 CombineTools/src/AZhSystematics.cc
  105. +352 −0 CombineTools/src/AutoRebin.cc
  106. +58 −21 CombineTools/src/BinByBin.cc
  107. +22 −0 CombineTools/src/CardWriter.cc
  108. +262 −30 CombineTools/src/CombineHarvester.cc
  109. +44 −5 CombineTools/src/CombineHarvester_Creation.cc
  110. +591 −112 CombineTools/src/CombineHarvester_Datacards.cc
  111. +247 −10 CombineTools/src/CombineHarvester_Evaluate.cc
  112. +78 −19 CombineTools/src/CombineHarvester_Filters.cc
  113. +145 −2 CombineTools/src/CombineHarvester_Python.cc
  114. +55 −56 CombineTools/src/HistMapping.cc
  115. +2 −0 CombineTools/src/HttSystematics_MSSMUpdate.cc
  116. +11 −1 CombineTools/src/Object.cc
  117. +25 −7 CombineTools/src/Parameter.cc
  118. +45 −14 CombineTools/src/ParseCombineWorkspace.cc
  119. +14 −4 CombineTools/src/Process.cc
  120. +3 −3 CombineTools/src/SOverBTools.cc
  121. +73 −2 CombineTools/src/Systematic.cc
  122. +7 −3 CombineTools/src/TFileIO.cc
  123. +1 −0 CombineTools/src/Utilities.cc
  124. +319 −0 CombineTools/src/ValidationTools.cc
  125. +190 −121 Doxyfile
  126. +15 −6 README.md
  127. +37 −0 docs/BSM-ModelIndependent-Limits-HhhAZh.md
  128. +81 −0 docs/BSM-ModelIndependent-Limits-MSSMHTT.md
  129. +1 −1 docs/ChargedHiggs.md
  130. +2 −0 docs/Example2.md
  131. +40 −0 docs/Example3.md
  132. +51 −0 docs/HybridNewGrid.md
  133. +238 −0 docs/Limits.md
  134. +8 −9 docs/Main.md
  135. +0 −55 docs/PostFitShapes.md
  136. +70 −0 docs/PostFitShapesFromWorkspace.md
  137. +13 −0 docs/PythonInterface.md
  138. +95 −0 docs/ReproduceRun1HTTDatacards.md
  139. +208 −0 docs/RooMorphingPdf.md
  140. +175 −40 docs/customdoxygen.css
  141. 0 docs/doxypypy/__init__.py
  142. +836 −0 docs/doxypypy/doxypypy.py
  143. BIN docs/figures/FixBothRanges.png
  144. BIN docs/figures/example_plotLimits.png
  145. BIN docs/figures/example_plotLimitsMorphed.png
  146. BIN docs/figures/example_simple_limit.png
  147. +0 −1 docs/header.html
  148. +67 −0 docs/mA-tanb-Limits.md
  149. +1 −1 docs/publish-doxygen.sh
  150. +2 −0 docs/py_filter
10 changes: 10 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
image: gitlab-registry.cern.ch/ci-tools/ci-worker:cc7

stages:
- deploy

ci:
stage: deploy
#trigger: cms-hcg/performances/ci
script:
curl --request POST --form "variables[CH_REF]=$CI_COMMIT_REF_NAME" --form "token=$CI_JOB_TOKEN" --form ref=master https://gitlab.cern.ch/api/v4/projects/cms-hcg%2Fperformances%2Fci/trigger/pipeline
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
language: cpp
before_install:
- sudo apt-add-repository -y ppa:git-core/ppa
- sudo apt-get update -qq
- sudo apt-get install git
- cd .. && mkdir -p src && mv $OLDPWD src/CombineHarvester
- export CMSSW_BASE=$PWD
- cd src/CombineHarvester
install:
- export DOX=doxygen-1.8.8
- wget -O - http://ftp.stack.nl/pub/users/dimitri/${DOX}.linux.bin.tar.gz | tar xz -C ${TMPDIR-/tmp} ${DOX}/bin/doxygen
- sudo install -m 755 ${TMPDIR-/tmp}/${DOX}/bin/doxygen /usr/local/bin/doxygen
- export DOX=1.8.10
- wget -O - https://downloads.sourceforge.net/project/doxygen/rel-${DOX}/doxygen-${DOX}.linux.bin.tar.gz | tar xz -C ${TMPDIR-/tmp} doxygen-${DOX}/bin/doxygen
- sudo install -m 755 ${TMPDIR-/tmp}/doxygen-${DOX}/bin/doxygen /usr/local/bin/doxygen
script:
- ./docs/publish-doxygen.sh
git:
submodules: false
env:
global:
- secure: "Qq51r7D7yE4HI662ZSHjnNuAkOuFqsazOqcIxuGIm0aE6AdapGfFKYXZ5c4g1cU1GNjcAxVPMXlD2mU2+Tdo1gsPhwEWrRT7z5dZBXjs7+bbLxt1l570lb+BuaXkEaDRm1JfspN3NnH6f65uqrp3MrQe8nJPQAnowe26CeIF6wo87NPAw7w3qKXTLujytyX2ZLBIRiImjv9beZFp50Jq/uXIvyTIpWutS2AtOIOTVjhzZr+4j4TUf34+Y9zUEHGVaCkYBomonhYEylo6qTOM7KMaBHqTa81ac5gtn7A0j5BaurD5TbT3iQR41Ogy6fGVqMltoJz2EMkZPG1fsOmE2K549FqGZyqoCNhKtsV7AXU2wI/TfQxIXA5h+6zk0YVQjJzvj1vzoHydEmDIjrg1jHCX7LovU8+EP3GpSkxxruFkIoJWE87KnnVa5XPGYZHPtK7j5fs3+h/IsfycFNQ9B4tEC5i8R3a22Y+3UJOmIVRkmUkYxmri4AK3SZHETsC0QB6T03sD4j9ywbXbn7uK6XRQnkV/EJex9F2AYCODDc1KUtsNKopXOUto6RkFHAc8XQYOevniHsmtXZZllduT1yXkqtmaIgrAzIAzfDWdHomlW0HoPHktgfRA1Xg49qDfjul/95Sk/Ysrx/o8Ikv1hqaeM1T+WnQedES+0/kMAu8="
- secure: "hEi9r4d+z9x9BiRBV5XtPQHPhaTEClbnZVky4LbpEU9IRPhzNSlJKY5ijdu0wBqFO3Gt5Nfjqr+cweqTFk4xpfoAVpO3nlsER1MaV8mdIernp5Vds6G2JUb+DsxraEC8eN94RvWfwarec0mdnthwuH7iwqvBRRNp9SpeF8LzJ4DUVkWyIQTNxp3Vwd1744H9qSvUVrZKmzrQ3N+MeMu+mOfym4N9fOEpFSxP79b5ECtG/gx5T8ivpMs7PD4vZT/X34y4ATHuCscpGvSFXCVRDbVEPBwLu5bZDIzVwwNXkRJobHPdubuxKVxhuytvjQedAXGMezu/wmbhQVXsepHsx0t37nxwuw1KJoyT5nXX+5rubMPDSm3gybCAJugtXhd6kkNDyVxbEETpPYiPYYtW5SS9BsIDhFF7SpAweAUpHH18wG/3FTTj9YtlKy97Kw6Dg4CdyArA42DL8nCm38jB6GcAVk7VUJmDbJ392lYmBnmI6gXEks2Ubxgu/c3W5tzpf6uOA5p6zgqnW8vfm9eWV+9Kcs8JJ42wYaAVVxabJPR7SzbFWCOgG28ae/0oXfRDofMEdIEeKhGzWdLXx4AZVCkJqfiRHayAzkm7Z7c4vV+LyK2Bikoo/QszvgDxAb3qJz4C5DCBev3VLFoY30eCWVTnPWY1InB/st/MEXKcLTg="
# whitelist
branches:
only:
1 change: 1 addition & 0 deletions CombinePdfs/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
<use name="rootpy"/>
<use name="CombineHarvester/CombineTools"/>
<use name="HiggsAnalysis/CombinedLimit"/>
<flags CXXFLAGS="-fno-guess-branch-probability -fno-devirtualize -fno-tree-forwprop"/>
<export>
<lib name="1"/>
</export>
156 changes: 0 additions & 156 deletions CombinePdfs/bin/AZhMorphing-NoModel.cpp

This file was deleted.

Loading