Merge pull request #14 from cms-analysis/ch-dec-15

December Updates

.travis.yml

@@ -1,10 +1,13 @@
 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
+  - export DOX=doxygen-1.8.10
   - 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
 script:

CombinePdfs/bin/BuildFile.xml

@@ -1,13 +1,4 @@
-<bin file="AdaptChargedHiggs.cpp" name="AdaptChargedHiggs"></bin>
 <bin file="ContourPlot.cpp" name="ContourPlot"></bin>
-<bin file="HhhMSSMCombinationExample.cpp" name="HhhMSSMCombinationExample"></bin>
-<bin file="HhhMorphingExample-NoModel.cpp" name="HhhMorphingExample-NoModel"></bin>
-<bin file="AZhMorphing-NoModel.cpp" name="AZhMorphing-NoModel"></bin>
-<bin file="AZhMorphing.cpp" name="AZhMorphing"></bin>
-<bin file="HhhMorphingExample.cpp" name="HhhMorphingExample"></bin>
-<bin file="MorphingMSSM-NoModel.cpp" name="MorphingMSSM-NoModel"></bin>
-<bin file="MorphingMSSMUpdate-NoModel.cpp" name="MorphingMSSMUpdate-NoModel"></bin>
-<bin file="MorphingMSSM.cpp" name="MorphingMSSM"></bin>
 <bin file="ParametricMSSM.cpp" name="ParametricMSSM"></bin>
 <bin file="PlotParametric.cpp" name="PlotParametric"></bin>
 <bin file="SMLegacyMorphing.cpp" name="SMLegacyMorphing"></bin>