Skip to content

Commit 433038b

Browse files
committed
prepare for v0.4.0 and conda package
1 parent f6dc0a0 commit 433038b

File tree

6 files changed

+66
-26
lines changed

6 files changed

+66
-26
lines changed

README.md

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,9 @@ Run LikelihoodCombiner from the command line:
5050

5151
```bash
5252
LikelihoodCombiner_dir=</installation/path>/likelihood_combiner
53-
python $LikelihoodCombiner_dir/likelihood_combiner/combiner.py $LikelihoodCombiner_dir/config/example_config.yml
53+
python $LikelihoodCombiner_dir/scripts/{local|cluster}.py $LikelihoodCombiner_dir/config/example_config.yml
5454
```
5555

56-
Alternatively, import LikelihoodCombiner as a module in a Python script:
57-
58-
```python
59-
import yaml
60-
from likelihood_combiner.combiner import run_combiner
61-
62-
with open('</installation/path>/config/example_config.yml', 'r') as myconfig:
63-
config = yaml.safe_load(myconfig)
64-
65-
# Combining limits
66-
sigmavULs = {}
67-
sigmavULs_Jnuisance = {}
68-
for channel in config['Configuration']['channels']:
69-
run_combiner(config, channel, sigmavULs, sigmavULs_Jnuisance)
70-
```
71-
7256
### Mock data
7357

7458
The data you can find in the LikelihoodCombiner, where produced with [gLike](https://github.com/javierrico/gLike/) using the [mock data](https://github.com/javierrico/gLike/tree/master/data). These txt files **don't** correspond to IACT observations of Segue 1 or Ursa Major II and are only included for testing the code framework.

bld.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"%PYTHON%" setup.py install
2+
if errorlevel 1 exit 1

build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
$PYTHON setup.py install

config/gloryduck_config.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
Hardware:
2-
cpu_counts: all
2+
cpu_counts: 30
33
Data:
4-
data_directory: /Users/tmiener/Documents/likelihood_combiner/data/
5-
cl_bands: true
4+
data_directory: /data2/users/tjark/likelihood_combiner/data/
65
simulations: 300
7-
J_nuisance: true
8-
JFactor_table: /Users/tmiener/Documents/likelihood_combiner/data/Jfactor_Geringer-SamethTable.txt
6+
j_nuisance: true
7+
j_factors: 'GeringerSameth'
8+
#j_factors: 'Bonnivard'
99
# Define the sigma ranges
1010
sigmaV_min: 1e-28
1111
sigmaV_max: 1e-18
1212
sigmaV_nPoints: 1001
1313
Configuration:
14-
channels: ['bb', 'ee', 'mumu', 'tautau', 'tt', 'hh', 'gammagamma', 'WW', 'ZZ']
14+
channels: ['bb', 'tautau', 'ee', 'mumu', 'tt', 'gammagamma', 'WW', 'ZZ']
1515
sources: ['BootesI', 'CanesVenaticiI', 'CanesVenaticiII', 'Carina', 'ComaBerenices', 'Draco', 'Fornax', 'Hercules', 'LeoI', 'LeoII', 'LeoIV', 'LeoT', 'LeoV', 'Sculptor', 'Segue1', 'Segue2', 'Sextans', 'UrsaMajorI', 'UrsaMajorII', 'UrsaMinor']
16-
collaborations: ['HAWC', 'FermiLAT', 'HESS', 'MAGIC', 'VERITAS']
16+
collaborations: {'HAWC': 2.6, 'Fermi-LAT': 2.6, 'MAGIC': 2.6, 'VERITAS': 2.6, 'HESS': 0.1}
17+
#collaborations: {'HAWC': 9.9, 'Fermi-LAT': 9.9, 'MAGIC': 9.9, 'VERITAS': 9.9, 'HESS': 0.1}
1718
Output:
18-
output_directory: /Users/tmiener/Documents/likelihood_combiner/gloryduck_output/
19+
output_directory: /data2/users/tjark/likelihood_combiner/GloryDuck/
1920
hdf5_dataset: gloryduck_lklcom.h5
2021
collaboration_plot: true
22+
23+

meta.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package:
2+
name: likelihood_combiner
3+
version: "0.4.0"
4+
5+
source:
6+
git_url: https://github.com/TjarkMiener/likelihood_combiner
7+
git_rev: v0.4.0
8+
9+
build:
10+
number: 0
11+
12+
requirements:
13+
build:
14+
- python
15+
- matplotlib
16+
- numpy
17+
- scipy
18+
- pandas
19+
- pyyaml
20+
- pytables
21+
host:
22+
- python
23+
- matplotlib
24+
- numpy
25+
- scipy
26+
- pandas
27+
- pyyaml
28+
- pytables
29+
run:
30+
- python
31+
- matplotlib
32+
- numpy
33+
- scipy
34+
- pandas
35+
- pyyaml
36+
- pytables
37+
test:
38+
imports:
39+
- likelihood_combiner
40+
41+
about:
42+
home: https://github.com/TjarkMiener/likelihood_combiner
43+
license: GPL-3.0 License
44+
license_file: LICENSE
45+
summary: LikelihoodCombiner combines likelihoods from different experiments.
46+
extra:
47+
recipe-maintainers:
48+
- TjarkMiener
49+
- nietootein

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from setuptools import setup, find_packages
22

33
setup(name='lklcom',
4-
version='0.3.0',
4+
version='0.4.0',
55
description='LikelihoodCombiner combines likelihoods from different experiments.',
66
url='https://github.com/TjarkMiener/likelihood_combiner',
77
license='BSD-3-Clause',

0 commit comments

Comments
 (0)