Merge branch 'develop'

SModelS · Aug 2, 2024 · 94cd867 · 94cd867
2 parents 8e23185 + 9d101e2
commit 94cd867
Show file tree

Hide file tree

Showing 49 changed files with 1,177 additions and 9,680 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ docs/manual/source/recipes/compareUL.py
 docs/manual/source/recipes/runAsLibrary.py
 docs/manual/source/recipes/runWithParameterFile.py
 docs/manual/source/recipes/compute_likelihood.py
+docs/manual/source/recipes/lheLLPExample.py
 docs/manual/source/recipes/lo_xsecs_from_slha.py
 docs/manual/source/recipes/load_database.py
 docs/manual/source/recipes/lookup_efficiency.py
@@ -75,6 +76,7 @@ docs/manual/source/RunSModelS.rst
 docs/manual/source/SlhaChecker.rst
 docs/manual/source/ToolBox.rst
 docs/manual/source/XSecComputer.rst
+docs/manual/source/XSecResummino.rst
 docs/manual/source/FixPermissions.rst
 docs/manual/source/InteractivePlots.rst
 docs/manual/source/images/iplots_parameters.py

diff --git a/Makefile b/Makefile
@@ -14,8 +14,8 @@ ifndef HAS_CXX
 endif
 
 resolve_deps: ## resolve the deps via pip
- @echo "try to resolve the python dependencies via pip"
- smodels/installation.py -R
+ @echo "trying to resolve the python dependencies via pip:"
+ @smodels/installation.py -R
 
 smodels_externaltools: resolve_deps externaltools
  @echo

diff --git a/ReleaseNotes b/ReleaseNotes
@@ -21,7 +21,7 @@ Release v3.0.0, Mon 5 Aug 2024
  * Database extension: added results from 10 (or 11?) ATLAS and 6 CMS analyses (hfm=HistFactory model, cov=covariance matrix for SR combination):
  - results from ATLAS:
  ATLAS-SUSY-2018-33 (EM), ATLAS-SUSY-2018-16 (EM+hfm), ATLAS-SUSY-2018-13 (EM), ATLAS-SUSY-2018-09 (UL),
- ATLAS-EXOT-2019-03 (UL), ATLAS-EXOT-2018-48 (UL), ATLAS-EXOT-2018-06 (UL, tbc!), ATLAS-EXOT-2013-11 (UL)
+ ATLAS-EXOT-2019-03 (UL), ATLAS-EXOT-2018-48 (UL), ATLAS-EXOT-2018-06 (UL), ATLAS-EXOT-2013-11 (UL)
  - results from CMS:
  CMS-SUS-21-007 (UL), CMS-EXO-20-008 (UL), CMS-EXO-20-004 (EM+cov), CMS-EXO-19-012 (UL),
  CMS-EXO-16-057 (UL), CMS-EXO-12-059 (UL)
@@ -45,8 +45,7 @@ Release v2.3.2, Wed 30 Aug 2023
 =======================================================
 
  * fixed bug in initialisation of analysis combination
- * added smodels version to output of "txt" printer
-
+ * smodels version now printed in all output formats
 
 Release v2.3.1, Mon 17 Jul 2023
 =======================================================

diff --git a/docs/manual/source/recipes/browserExample3.ipynb b/docs/manual/source/recipes/browserExample3.ipynb
@@ -74,7 +74,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "ATLAS-SUSY-2018-31: SRA_L,SRA_M,SRA_H,SRB,SRC_22,SRC_24,SRC_26,SRC_28(8):T6bbHH(1)\n"
+ "ATLAS-SUSY-2018-16: CR_ewk_VV_high,CR_ewk_VV_low,CR_ewk_tau_high,CR_ewk_tau_low,CR_ewk_top_high,CR_ewk_top_low,CR_slep_VV_high,CR_slep_VV_low,CR_slep_tau_high,CR_slep_tau_low,CR_slep_top_high,CR_slep_top_low,SR_ewk_1l1T,SR_ewk_2l_ee_high_c,SR_ewk_2l_ee_high_d,SR_ewk_2l_ee_high_e,SR_ewk_2l_ee_high_f,SR_ewk_2l_ee_high_g,SR_ewk_2l_ee_high_h,SR_ewk_2l_ee_low_c,SR_ewk_2l_ee_low_d,SR_ewk_2l_ee_low_e,SR_ewk_2l_ee_low_f,SR_ewk_2l_ee_low_g,SR_ewk_2l_ee_low_h,SR_ewk_2l_ee_med_c,SR_ewk_2l_ee_med_d,SR_ewk_2l_ee_med_e,SR_ewk_2l_ee_med_f,SR_ewk_2l_high,SR_ewk_2l_low,SR_ewk_2l_med,SR_ewk_2l_mm_high_a,SR_ewk_2l_mm_high_b,SR_ewk_2l_mm_high_c,SR_ewk_2l_mm_high_d,SR_ewk_2l_mm_high_e,SR_ewk_2l_mm_high_f,SR_ewk_2l_mm_high_g,SR_ewk_2l_mm_high_h,SR_ewk_2l_mm_low_a,SR_ewk_2l_mm_low_b,SR_ewk_2l_mm_low_c,SR_ewk_2l_mm_low_d,SR_ewk_2l_mm_low_e,SR_ewk_2l_mm_low_f,SR_ewk_2l_mm_low_g,SR_ewk_2l_mm_low_h,SR_ewk_2l_mm_med_a,SR_ewk_2l_mm_med_b,SR_ewk_2l_mm_med_c,SR_ewk_2l_mm_med_d,SR_ewk_2l_mm_med_e,SR_ewk_2l_mm_med_f,SR_slep_2l_ee_high_a,SR_slep_2l_ee_high_b,SR_slep_2l_ee_high_c,SR_slep_2l_ee_high_d,SR_slep_2l_ee_high_e,SR_slep_2l_ee_high_f,SR_slep_2l_ee_high_g,SR_slep_2l_ee_high_h,SR_slep_2l_ee_low_a,SR_slep_2l_ee_low_b,SR_slep_2l_ee_low_c,SR_slep_2l_ee_low_d,SR_slep_2l_ee_low_e,SR_slep_2l_ee_low_f,SR_slep_2l_ee_low_g,SR_slep_2l_ee_low_h,SR_slep_2l_mm_high_a,SR_slep_2l_mm_high_b,SR_slep_2l_mm_high_c,SR_slep_2l_mm_high_d,SR_slep_2l_mm_high_e,SR_slep_2l_mm_high_f,SR_slep_2l_mm_high_g,SR_slep_2l_mm_high_h,SR_slep_2l_mm_low_a,SR_slep_2l_mm_low_b,SR_slep_2l_mm_low_c,SR_slep_2l_mm_low_d,SR_slep_2l_mm_low_e,SR_slep_2l_mm_low_f,SR_slep_2l_mm_low_g,SR_slep_2l_mm_low_h(86):TChiWZoff,TSlepSlep,TChiZoff,TChiWWoff(4)\n"
  ]
  }
  ],
@@ -92,7 +92,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "15\n"
+ "16\n"
  ]
  }
  ],
@@ -164,7 +164,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.12.3"
  }
  },
  "nbformat": 4,

diff --git a/docs/manual/source/recipes/combinationsmatrix.ipynb b/docs/manual/source/recipes/combinationsmatrix.ipynb
@@ -84,7 +84,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "we have selected 2 analyses\n"
+ "we have selected 4 analyses\n"
  ]
  }
  ],
@@ -103,7 +103,10 @@
  {
  "data": {
  "text/plain": [
- "['ATLAS-SUSY-2018-41', 'ATLAS-SUSY-2019-08']"
+ "['ATLAS-SUSY-2018-41',\n",
+ " 'ATLAS-SUSY-2019-08',\n",
+ " 'CMS-SUS-20-004',\n",
+ " 'CMS-SUS-21-002']"
  ]
  },
  "execution_count": 5,
@@ -163,8 +166,9 @@
  {
  "data": {
  "text/plain": [
- "[('ATLAS-SUSY-2018-41', 'r_exp=', 0.803),\n",
- " ('ATLAS-SUSY-2019-08', 'r_exp=', 0.961)]"
+ "[('ATLAS-SUSY-2018-41', 'r_exp=', 0.869),\n",
+ " ('CMS-SUS-21-002', 'r_exp=', 1.158),\n",
+ " ('ATLAS-SUSY-2019-08', 'r_exp=', 0.96)]"
  ]
  },
  "execution_count": 9,
@@ -186,7 +190,9 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "can I combine ATLAS-SUSY-2018-41 with ATLAS-SUSY-2019-08? yes\n"
+ "can I combine ATLAS-SUSY-2018-41 with CMS-SUS-21-002? yes\n",
+ "can I combine ATLAS-SUSY-2018-41 with ATLAS-SUSY-2019-08? yes\n",
+ "can I combine CMS-SUS-21-002 with ATLAS-SUSY-2019-08? yes\n"
  ]
  }
  ],
@@ -225,7 +231,7 @@
  {
  "data": {
  "text/plain": [
- "1.162"
+ "1.674"
  ]
  },
  "execution_count": 12,
@@ -262,7 +268,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.10.6"
+ "version": "3.12.3"
  }
  },
  "nbformat": 4,

diff --git a/docs/manual/source/recipes/compareUL.ipynb b/docs/manual/source/recipes/compareUL.ipynb
@@ -85,11 +85,6 @@
  "Upper limit = 4.68E+02 [fb]\n",
  "Expected Upper limit = None\n",
  "\n",
- "Experimental Result: CMS-PAS-SUS-16-024 (upperLimit-type)\n",
- "Theory prediction xsec = 3.99E-02 [pb]\n",
- "Upper limit = 8.09E+02 [fb]\n",
- "Expected Upper limit = None\n",
- "\n",
  "Experimental Result: ATLAS-SUSY-2013-12 (upperLimit-type)\n",
  "Theory prediction xsec = 1.85E-02 [pb]\n",
  "Upper limit = 4.81E+02 [fb]\n",

diff --git a/docs/manual/source/recipes/compute_likelihood.ipynb b/docs/manual/source/recipes/compute_likelihood.ipynb
@@ -104,27 +104,16 @@
  "from smodels.installation import installDirectory\n",
  "from smodels.base.physicsUnits import fb, GeV\n",
  "from smodels.matching.theoryPrediction import theoryPredictionsFor\n",
- "from smodels.experiment.databaseObj import Database"
+ "from smodels.experiment.databaseObj import Database\n",
+ "from smodels.base import smodelsLogging\n",
+ "smodelsLogging.setLogLevel('error')\n"
  ]
  },
  {
  "cell_type": "code",
  "execution_count": 6,
  "metadata": {},
- "outputs": [
- {
- "name": "stderr",
- "output_type": "stream",
- "text": [
- "WARNING in model.setDecays() in 361: Particle H+ has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n",
- "WARNING in model.setDecays() in 361: Particle A0 has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n",
- "WARNING in model.setDecays() in 361: Particle H0 has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n",
- "WARNING in model.setDecays() in 361: Particle H- has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n",
- "WARNING in model.setDecays() in 361: Particle A0~ has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n",
- "WARNING in model.setDecays() in 361: Particle H0~ has a total width/mass = 0.01. Some results may not be valid for broad resonances!\n"
- ]
- }
- ],
+ "outputs": [],
  "source": [
  "# Define the SLHA input file name\n",
  "filename=\"inputFiles/slha/gluino_squarks.slha\"\n",