Jet Substructure

.github/workflows/quick_validation.yml

@@ -1,67 +1,67 @@
-name: Quick Validation 
+name: Quick Validation
 
 on:
-  push:
-    branches:
-    - main
-    - release/*
-  # Each pull request should be validated before merging with main or dev
-  pull_request:
-    branches:
-    - main
-    - dev
-  # Enables manual action execution.
-  workflow_dispatch:
+    # push:
+    # branches:
+    # - main
+    # - release/*
+    # Each pull request should be validated before merging with main or dev
+    # pull_request:
+    # branches:
+    # - main
+    # - dev
+    # Enables manual action execution.
+    workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  test:
-    name: OS ${{ matrix.os }}, Python ${{ matrix.python-version }}
-    runs-on: ${{ matrix.os }}
+    test:
+        name: OS ${{ matrix.os }}, Python ${{ matrix.python-version }}
+        runs-on: ${{ matrix.os }}
 
-    strategy:
-      matrix:
-        python-version: ['3.8']
-        os: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python version ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+        strategy:
+            matrix:
+                python-version: ["3.8"]
+                os: [ubuntu-latest]
 
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip 
-          python -m pip install -r requirements.txt
-          echo $PWD && cd validation
-          python -m pip install -e .
-
-      - name: List installed dependencies
-        run: python -m pip list
-
-      - name: Print help message
-        run: |
-          ./validation/scripts/validation_bootstrap -h
-
-      - name: Validate Parton-Level analyses
-        run: |
-          ./validation/scripts/validation_bootstrap -P
+        steps:
+            - uses: actions/checkout@v2
 
-      - name: Validate Hadron-Level analyses
-        run: |
-          ./validation/scripts/validation_bootstrap -H
+            - name: Set up Python version ${{ matrix.python-version }}
+              uses: actions/setup-python@v2
+              with:
+                  python-version: ${{ matrix.python-version }}
 
-      - name: Validate Reco-Level analyses
-        run : |
-          ./validation/scripts/validation_bootstrap -R
+            - name: Install dependencies
+              run: |
+                  python -m pip install --upgrade pip 
+                  python -m pip install -r requirements.txt
+                  echo $PWD && cd validation
+                  python -m pip install -e .
 
-      #- name : Validate Expert mode
-      #  run : |
-      #    ./validation/scripts/validation_bootstrap -e
+            - name: List installed dependencies
+              run: python -m pip list
 
-      - name : Validate FastJet interface
-        run : |
-          ./validation/scripts/validation_bootstrap --fastjet
+            - name: Print help message
+              run: |
+                  ./validation/scripts/validation_bootstrap -h
+
+            - name: Validate Parton-Level analyses
+              run: |
+                  ./validation/scripts/validation_bootstrap -P
+
+            - name: Validate Hadron-Level analyses
+              run: |
+                  ./validation/scripts/validation_bootstrap -H
+
+            - name: Validate Reco-Level analyses
+              run: |
+                  ./validation/scripts/validation_bootstrap -R
+
+            #- name : Validate Expert mode
+            #  run : |
+            #    ./validation/scripts/validation_bootstrap -e
+
+            - name: Validate FastJet interface
+              run: |
+                  ./validation/scripts/validation_bootstrap --fastjet

.gitignore

@@ -1,3 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# PyCharm type checker
+.idea/
+
+# VScode type checker
+.vscode/
+
  .github_meta.log
 */*.pyc
 */*/*.pyc
@@ -13,5 +148,19 @@ tools/SampleAnalyzer/Test/Makefile_*
 */*/*.log
 doc/??????_mode.log
 doc/??????_mode.pdf
+.ma5history
+architecture.ma5
+setup.sh
+setup.csh
+tools/SampleAnalyzer/Commons/Makefile
+tools/SampleAnalyzer/Configuration/Makefile
+tools/SampleAnalyzer/Process/Makefile
+PortabilityTags.h
 .DS_Store
 ANALYSIS_*
+samples/*
+tools/fastjet
+tools/HEPTopTagger
+tools/zlib
+fastjet-config
+tools/SampleAnalyzer/Bin

README.md

@@ -249,16 +249,17 @@ authors thank you for this.
 In the following you can find supported third party software that can be used within MadAnalysis 5.
 The [latest release](https://github.com/MadAnalysis/madanalysis5/releases) of MadAnalysis 5 has been tested with enlisted versions.
 
-- [FastJet](http://fastjet.fr) v3.3.3
+- [FastJet](http://fastjet.fr) v3.4.0
+- [FastJet Contrib](https://fastjet.hepforge.org/contrib/) v1.048
 - [Delphes](https://github.com/delphes/delphes) v3.5.0
 - [ROOT](https://root.cern) v6.04.08
-- [pyhf](https://github.com/scikit-hep/pyhf) v0.7.3
+- [Spey](https://spey.readthedocs.io/) v0.2.5
 
 ### Authors
 
 MadAnalysis 5 is openly developed by the core dev team consisting of:
 
-- [Jack Y. Araz](mailto:jack.araz@durham.ac.uk)
+- [Jack Y. Araz](mailto:j.araz@ucl.ac.uk)
 - [Benjamin Fuks](mailto:fuks@lpthe.jussieu.fr)
 - [Eric Conte](mailto:eric.conte@iphc.cnrs.fr)
 

bin/ma5

@@ -74,8 +74,8 @@ sys.path.insert(0, servicedir)
 
 # Release version
 # Do not touch it !!!!!
-version = "1.11.0"
-date = "2025/04/23"
+version = "2.0.9"
+date = "2025/10/29"
 
 # Loading the MadAnalysis session
 import madanalysis.core.launcher

doc/README.md

@@ -16,3 +16,7 @@ Information can also be found in the following files.
                      project from its early days to now.
 - [PAD](./PAD.md): guidelines to submit a new analysis to our Public Analysis Database
                    (PAD).
+
+Further details on the usage of specific modules can be found in the following files:
+- [Jet Substructure](../tools/SampleAnalyzer/Interfaces/substructure/README.md)
+- [HEPTopTagger](../tools/SampleAnalyzer/Interfaces/HEPTopTagger/README.md)

doc/makedoc

@@ -2,11 +2,11 @@
 
 ################################################################################
 #  
-#  Copyright (C) 2012-2018 Eric Conte, Benjamin Fuks
+#  Copyright (C) 2012-2022 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
-#  
+#
 #  This file is part of MadAnalysis 5.
-#  Official website: <https://launchpad.net/madanalysis5>
+#  Official website: <https://github.com/MadAnalysis/madanalysis5>
 #  
 #  MadAnalysis 5 is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by