Simplify file structure

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.0.0
 files = setup.py alea/__init__.py
 commit = True
 tag = True

.github/workflows/pypi_install.yml

@@ -0,0 +1,36 @@
+# PyPI upload alea after a release (or manually).
+## Mostly based on https://github.com/marketplace/actions/pypi-publish
+name: PyPI
+
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # Setup steps
+      - name: Setup python
+        uses: actions/setup-python@v4.2.0
+        with:
+          python-version: '3.8'
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: pip install wheel
+
+      - name: Build package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Publish a Python distribution to PyPI
+        # Do the publishing
+        # Might want to add but does not work on workflow_dispatch :
+        # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user:  ${{ secrets.token }}
+          password: ${{ secrets.pypi_password }}

.gitignore

@@ -1,28 +1,20 @@
-alea.egg-info/
-alea/__pycache__/
-alea/likelihoods/__pycache__/
-build/
-dist/
-src/
+pdf_cache
+sbatch_submission
+__pycache__
+.ipynb_checkpoints
+*.egg-info
+*.eggs
+*.svg
 *.swp
-*sbatch_submission*
 *.log
-*pdf_cache*
 *.tar.gz
-development_scripts/*hdf
-.vscode
-*/jobs/*
-*png
-*pdf
+*.png
+*.pdf
+*.ipynb
+!notebooks/*.ipynb
 *.h5
 *.hdf5
-!examples/*.h5
-*submission_*
-*root*
-*.ipynb_checkpoints*
-*.session.vim*
-*.env*
-__pycache__/
-*ipynb
-!examples/*.ipynb
-debug.py
+!templates/*.h5
+!templates/*.hdf5
+docs/build
+build

README.md

@@ -1,6 +1,6 @@
-# alea
+# Alea
 A tool to perform toyMC-based inference constructions
 
-`alea` is a public version of previously private XENON likelihood definition and inference construction code (""binference"" that used the blueice repo https://github.com/JelleAalbers/blueice. 
+`alea` is a public package inherited the spirits of previously private XENON likelihood definition and inference construction code `binference` that based on the blueice repo https://github.com/JelleAalbers/blueice. 
 
-Binference was developed for XENON1T WIMP searches by Knut Dundas Morå, and for the first XENONnT results by Robert Hammann, Knut Dundas Morå and Tim Wolf
+Binference was developed for XENON1T WIMP searches by Knut Dundas Morå, and for the first XENONnT results by Robert Hammann, Knut Dundas Morå and Tim Wolf.

alea/__init__.py

@@ -1,7 +1,15 @@
-from alea import likelihoods
+__version__ = '0.0.0'
 
-from alea import plotting
-from alea import simulators
-from alea import template_source
-from alea import toymc_running
-from alea import utils
+from . import model
+from .model import *
+
+from . import models
+
+from . import utils
+from .utils import *
+
+from . import parameters
+from .parameters import *
+
+from . import simulators
+from .simulators import *

alea/likelihoods/ll_nt_from_config.py → alea/_likelihoods/ll_nt_from_config.py

@@ -8,7 +8,7 @@
 import h5py
 import numpy as np
 import scipy.stats as sps
-from alea.plotting import pdf_plotter
+from alea._plotting import pdf_plotter
 from alea.simulators import simulate_interpolated
 from blueice.inference import bestfit_scipy, one_parameter_interval
 from blueice.likelihood import LogLikelihoodSum