Update 2HDMCalculator working version

.gitignore

@@ -2,7 +2,7 @@
 ############
 *.tar
 *.tar.gz
-
+*.tar.bz2
 
 # PYC #
 #######
@@ -24,3 +24,13 @@ Scan/*.out
 # tmp files #
 #############
 *.swp
+
+# 2HDMC output
+##############
+*.log
+*.out
+
+# png, pdf
+#########
+*.png
+*.pdf

README.md

@@ -1,24 +1,63 @@
-# Calculators For 2HDM
-Tools to use SusHi and 2HDMC to compute H/A/h cross section and branching fractions. 
 
+# 2HDMC - Two-Higgs-Doublet Model Caclulators -
+2HDMC is a general-purpose calculator for the two-Higgs doublet model. It allows parametrization of the Higgs potential in many different ways, convenient specification of generic Yukawa sectors, the evaluation of decay widths (including higher-order QCD corrections), theoretical constraints and much more.
+
+Version used: ``2HDMC1.8.0`` and ``Sushi1.7.0``.
+## Install in a CMSSW release:
 ```bash
-    # Install a random CMSSW release, e.g. CMSSW_7_1_20_patch2
-    export SCRAM_ARCH=slc6_amd64_gcc481
-    scram p CMSSW CMSSW_7_1_20_patch2
-    cd CMSSW_7_1_20_patch2/src
-    cms_env
+    # setup your env : for cp3 ingrid-ui1 cluster 
+    module load gcc/gcc-7.3.0-sl7_amd64 lhapdf/6.1.6-sl7_gcc73
+
+    # Install a CMSSW release .eg. CMSSW_10_2_22
+    cmsrel CMSSW_10_2_22
+    cd CMSSW_10_2_22/src
     cmsenv
     git cms-init
 
     # Get and execute the install script
-    wget https://raw.githubusercontent.com/cp3-llbb/Calculators42HDM/master/install_ingrid.sh
-    source install_ingrid.sh
+    wget https://raw.githubusercontent.com/kjaffel/Calculators42HDM/master/sushi_2hdmc_cmssw.sh 
+    source sushi_2hdmc_cmssw.sh
+```
+## Install With Conda (from [@pdavid](https://github.com/pieterdavid)):
+- [Conda](https://conda.io/projects/conda/en/latest/user-guide/install/linux.html)
+- [CONDA-FORGE](https://conda-forge.org/#page-top)
+
+```bash
+    # setup your env
+    conda create -n SusHi170 gsl gfortran_linux-64 gxx_linux-64 gcc_linux-64
+    conda activate SusHi170
 
-    # Setup github remotes
-    source first_setup.sh
+    wget https://github.com/kjaffel/Calculators42HDM/master/sushi_2hdmc_conda.sh
+    source sushi_2hdmc_conda.sh
 ```
 
-## Run the test
-    
+## Run the test:
+
     python example/test.py
+
+## Trouble-Shooting: 
+
+```bash
+lib/libsushi2HDMC.a(runthdmc.o): In function `runthdmc_':
+runthdmc.f:(.text+0x13d): undefined reference to `thdmc_set_param_'
+collect2: error: ld returned 1 exit status
+make[1]: *** [Makefile:197: bin/sushi.2HDMC] Error 1
+```
+In ``2HDMC-1.8.0/Makefile`` replace these lines:
+```bash
+  -CFLAGS= -std=c++11 -Wall $(DEBUG) $(OPT)
+  +CFLAGS= -std=c++11 -Wall -fPIE $(DEBUG) $(OPT)
+  -SOURCES=THDM.cpp SM.cpp DecayTable.cpp Constraints.cpp Util.cpp
+  +SOURCES=THDM.cpp SM.cpp DecayTable.cpp Constraints.cpp Util.cpp runTHDM.cpp
+```    
 
+## Keep an eye on the latest versions: 
+- [2HDMC](https://2hdmc.hepforge.org)
+- [SUSHI](https://sushi.hepforge.org/)
+- [LHAPDF](https://lhapdf.hepforge.org/index.html)
+- It can also be useful to download HiggsBounds/HiggsSignals (Note: 2HDMC work without HB/HS), since 2HDMC can interface the LEP, Tevatron and LHC constraints implemented in these codes. HiggsBounds/HiggsSignals are available: 
+- [HiggsBounds](http://higgsbounds.hepforge.org)
+- [HiggsSignals](http://higgsbounds.hepforge.org)
+## Useful Links:  
+- [2HDME: Two-Higgs-Doublet Model Evolver](https://arxiv.org/pdf/1811.08215.pdf) 
+- [Flavour Les Houches Accord: Interfacing Flavour related Codes](https://arxiv.org/pdf/1008.0762.pdf)

data/totalwidth_2HDM-type2_cosbeta-alpha-0p01_func_of_tb-from0p50to50p50_MH-from125p00to1125p00.json

@@ -0,0 +1 @@
+{"0.5": {"Awidth": [0.000537916343, 0.00538869455, 0.0255246914, 0.468837213, 72.2686856, 100.107076, 123.159172, 144.105407, 163.822856, 182.715013, 201.003857], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [0.00527737333, 0.0168979569, 0.0604952262, 25.5204189, 59.0424304, 88.2862774, 114.167883, 137.689724, 159.534933, 180.152801, 199.844428], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.0354574661, 10.6581797, 40.1045721, 66.1524219, 89.1507659, 110.14983, 129.804394, 148.509058, 166.511038, 183.972538, 201.004632], "hwidth": [0.20071698, 0.00432850812, 0.00432861074, 0.00432864881, 0.00432866706, 0.00432867722, 0.00432868345, 0.00432868755, 0.00432869038, 0.00432869243, 0.00432869395]}, "10.5": {"Awidth": [0.111331782, 0.341950559, 0.541622207, 0.730035875, 1.07446942, 1.3147517, 1.54120491, 0.022636832, 6.41599316, 2.18988686, 2.40163705], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [0.324723891, 0.531773743, 0.725683081, 0.96110314, 1.20990709, 1.4521566, 1.69149445, 13.0333549, 5.89060147, 2.42336219, 2.67944738], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.0637614414, 0.288896788, 0.677441083, 0.992823392, 1.26807177, 1.52064044, 1.75921035, 17.4213444, 9.90121986, 2.43117805, 2.64769059], "hwidth": [0.20014993, 0.00376140942, 0.00376150185, 0.00376153612, 0.00376155255, 0.00376156169, 0.0037615673, 0.00425855043, 0.00425855043, 0.00376157538, 0.00376157675]}, "40.5": {"Awidth": [1.65617337, 5.08785446, 8.05882796, 10.8437013, 13.5337391, 16.1416228, 18.6913636, 21.1950217, 23.6608443, 26.0948658, 28.5017022], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [4.78788587, 7.80342191, 10.6098584, 13.3058931, 15.9259782, 18.4895226, 21.009452, 23.4948662, 25.9525634, 28.3878607, 30.8050698], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.469497149, 2.68011837, 7.03617909, 10.5769435, 13.7012242, 16.5917783, 19.3334588, 21.9719867, 24.5347325, 27.039363, 29.4979524], "hwidth": [0.198851755, 0.0024631055, 0.00246317129, 0.00246319566, 0.00246320734, 0.00246321384, 0.00246321782, 0.00246322044, 0.00246322226, 0.00246322357, 0.00246322454]}, "20.5": {"Awidth": [0.42433856, 1.30353314, 2.06468581, 0, 3.50898989, 4.1943511, 4.86286056, 5.51928568, 6.166389, 6.80609472, 7.43985936], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [1.22925054, 2.00547456, 2.72867754, 0, 4.12689022, 4.8068888, 5.47912006, 6.14706834, 6.81349668, 7.48069656, 8.15064427], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.145968249, 0.760246247, 1.9160713, 0, 3.67648988, 4.43744188, 5.15873898, 5.85303843, 6.52797808, 7.18853512, 7.83815216], "hwidth": [0.199658666, 0.00327010279, 0.00327018628, 0, 0.00327023207, 0.00327024032, 0.00327024538, 0.00327024871, 0.00327025102, 0.00327025268, 0.00327025392]}, "30.5": {"Awidth": [0.939285859, 2.88550287, 4.57043031, 6.15002762, 7.68946192, 9.17457091, 0, 12.0519157, 13.4565206, 14.8436432, 16.2160294], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [2.71697186, 4.42936028, 6.02341886, 7.55836874, 9.05259067, 10.5164304, 0, 13.3823212, 14.7944258, 16.1975746, 17.5946669], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.281213814, 1.561324, 4.05079999, 6.07229925, 7.85459428, 9.50282696, 0, 12.5703491, 14.0319139, 15.4608908, 16.8643151], "hwidth": [0.199226011, 0.00283740481, 0.00283747944, 0.00283750709, 0.00283752034, 0.00283752772, 0, 0.00283753521, 0.00283753727, 0.00283753875, 0.00283753986]}, "50.5": {"Awidth": [2.57500104, 7.91058723, 12.5298751, 16.8595808, 21.0311359, 25.0807052, 29.0400129, 32.9272977, 36.7551394, 40.5327494, 44.2671617], "mA": [33.8124, 133.8124, 233.8124, 333.8124, 433.8124, 533.8124, 633.8124, 733.8124, 833.8124, 933.8124, 1033.8124], "Hwidth": [7.44199236, 12.1276583, 16.4879903, 20.6740167, 24.7396372, 28.7150764, 32.6198153, 36.4674117, 40.267876, 44.0289353, 47.7567644], "mH": [125.0, 225.0, 325.0, 425.0, 525.0, 625.0, 725.0, 825.0, 925.0, 1025.0, 1125.0], "H+width": [0.710818125, 4.11506688, 10.8662967, 16.3567535, 21.2032208, 25.6880335, 29.9421361, 34.0360202, 38.0118428, 41.8967805, 45.7093764], "hwidth": [0.198535853, 0.00214716118, 0.0021472182, 0.0021472393, 0.00214724942, 0.00214725504, 0.00214725849, 0.00214726076, 0.00214726233, 0.00214726346, 0.00214726431]}}

data/totalxscXbr_2HDM-type2_cosbeta-alpha-0p01_func_of_tb-from0p50to50p50_MH-from125p00to1125p00.json

@@ -0,0 +1 @@
+{"0.5": {"gg-fusion": [0.0, 44.0172384, 3.131992119519167, 57.3738542, 0.22828123957969065, 34.802049, 3.810693184638217e-05, 29.71982, 6.41137421784497e-08, 13.3514985, 1.6975550183272103e-08, 5.87241884, 5.8846181805191845e-09, 2.71121667, 2.359505891369453e-09, 1.32224346, 1.0432972414091775e-09, 0.677910157, 4.959936999857526e-10, 0.363041501, 2.495752250218584e-10, 0.20187531], "bb-associated_production": [0.0, 0.505581214, 0.000968716335273929, 0.0177455714, 2.8060625057216813e-05, 0.00427791285, 1.781639048659605e-09, 0.00138951076, 2.598202584338584e-12, 0.000541068057, 6.884220577152303e-13, 0.00023814855, 2.4859308130198325e-13, 0.000114534144, 1.0512710928141781e-13, 5.89121787e-05, 4.917162903481475e-14, 3.1950575e-05, 2.4714307531931758e-14, 1.80895832e-05, 1.3118399781052872e-14, 1.06111535e-05], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}, "10.5": {"gg-fusion": [0.0, 42.5669131, 0.021264172562171668, 1.86607117, 0.0039353949665838946, 0.366539641, 0.001076119736044666, 0.118216917, 0.0002300100066454934, 0.0350792927, 6.706069693583687e-05, 0.0120543296, 2.2953187134027487e-05, 0.00471900649, 0.0006329624206689621, 0.00204736349, 1.1429849314084014e-07, 0.000962703757, 1.696769076433245e-06, 0.00048261922, 8.152719111661672e-07, 0.000254738096], "bb-associated_production": [0.0, 0.409059007, 0.08587654097419911, 7.53623198, 0.019505791479856736, 1.81675432, 0.005371643122419046, 0.590100774, 0.0015066489259019558, 0.229782084, 0.0005626485581817428, 0.101137499, 0.00023658743108052665, 0.0486406361, 0.007734857651194109, 0.0250189658, 1.610982367017457e-06, 0.0135688471, 2.700915246051375e-05, 0.00768232771, 1.4422330633170248e-05, 0.0045063702], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}, "40.5": {"gg-fusion": [0.0, 43.0805641, 0.016438477412903503, 21.1735045, 0.00212548707960685, 2.89501945, 0.0004109517532152976, 0.62408017, 0.00010169952070358582, 0.172872015, 3.055817502512973e-05, 0.0577221655, 1.0604931766591764e-05, 0.0220782828, 4.1122734169047715e-06, 0.00936261274, 1.739778077629064e-06, 0.0043017882, 7.897831633677418e-07, 0.00210796789, 3.799641050949271e-07, 0.00108893334], "bb-associated_production": [0.0, 0.180779572, 0.08692448478850845, 111.962679, 0.019816283627102728, 26.990767, 0.005772921640076787, 8.76688295, 0.0020083037571626138, 3.41377732, 0.0007954557670339592, 1.50255797, 0.00034710498904462456, 0.722633797, 0.00016325755913005943, 0.371696419, 8.152800263192882e-05, 0.201586745, 4.2761775901295205e-05, 0.114133163, 2.33607706841491e-05, 0.0669492768], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}, "20.5": {"gg-fusion": [0.0, 42.7141368, 0.017225253002312018, 5.70173985, 0.00238681286915857, 0.83604021, 0.0, 0.187245533, 0.00010867028400670574, 0.0484382517, 3.0118309198036978e-05, 0.0150000385, 9.702294990875041e-06, 0.00534895948, 3.5153452036717253e-06, 0.00212822488, 1.3980732693005984e-06, 0.000923136362, 5.996466837612708e-07, 0.000429332779, 2.736163980900908e-07, 0.000211375491], "bb-associated_production": [0.0, 0.322751332, 0.08670384137822053, 28.6998831, 0.019752100024061633, 6.91866131, 0.0, 2.24725343, 0.001963199233651574, 0.875068465, 0.0007733503641154357, 0.385157253, 0.0003359930389030223, 0.18523588, 0.00015737860264775183, 0.0952785682, 7.825874711474244e-05, 0.0516736116, 4.0862043871269515e-05, 0.0292562526, 2.2214688424195797e-05, 0.0171614008], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}, "30.5": {"gg-fusion": [0.0, 42.8923005, 0.016628427719751853, 12.157171, 0.002186632661392407, 1.6908105, 0.0004243768461985402, 0.366093617, 0.00010225212578486238, 0.098976109, 2.994961444064642e-05, 0.0322474181, 0.0, 0.012070987, 3.86317179040835e-06, 0.00502281309, 1.6061389112777044e-06, 0.00227020917, 7.178274695470698e-07, 0.00109644319, 3.404658030772846e-07, 0.000559077424], "bb-associated_production": [0.0, 0.246658186, 0.08686641057950828, 63.5086988, 0.019799583478232376, 15.3099989, 0.0057645400969460955, 4.97284749, 0.0020004932487571714, 1.93640021, 0.0007915665902043775, 0.852297409, 0.0, 0.409900267, 0.00016216058885735733, 0.210837719, 8.089825125975276e-05, 0.114346244, 4.238436926319222e-05, 0.0647398644, 2.3126364371528347e-05, 0.037975703], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}, "50.5": {"gg-fusion": [0.0, 43.2776727, 0.016356856517338945, 32.7435355, 0.0020996345884951553, 4.4442492, 0.00040577789628474625, 0.957451279, 0.00010171629409098942, 0.268446142, 3.0931504387556596e-05, 0.0906821489, 1.0845911140637277e-05, 0.0350327952, 4.242745343240055e-06, 0.0149811443, 1.8086539285942253e-06, 0.00693275278, 8.26567698060891e-07, 0.0034183761, 4.000572012982143e-07, 0.00177555113], "bb-associated_production": [0.0, 0.125115487, 0.08695164516715992, 174.061824, 0.019823977231155004, 41.9609657, 0.005776265663489588, 13.6293598, 0.002010938546620191, 5.30719979, 0.0007967842198141742, 2.33593893, 0.0003478081625005821, 1.12343647, 0.00016365173131177487, 0.577854668, 8.176020699380559e-05, 0.313395113, 4.2904286747485614e-05, 0.177436148, 2.345119874554066e-05, 0.104082122], "mA": [33.8124, 33.8124, 133.8124, 133.8124, 233.8124, 233.8124, 333.8124, 333.8124, 433.8124, 433.8124, 533.8124, 533.8124, 633.8124, 633.8124, 733.8124, 733.8124, 833.8124, 833.8124, 933.8124, 933.8124, 1033.8124, 1033.8124], "mH": [125.0, 125.0, 225.0, 225.0, 325.0, 325.0, 425.0, 425.0, 525.0, 525.0, 625.0, 625.0, 725.0, 725.0, 825.0, 825.0, 925.0, 925.0, 1025.0, 1025.0, 1125.0, 1125.0]}}