Skip to content

Commit

Permalink
Merge pull request #60 from jiangyi15/p0.1.6
Browse files Browse the repository at this point in the history
switch version to v0.1.6
  • Loading branch information
jiangyi15 committed Oct 28, 2021
2 parents 26f2e64 + fee0b0f commit d48ddd5
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 8 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,32 @@

[Full Changelog](https://github.com/jiangyi15/tf-pwa/compare/v0.1.5...HEAD)

## [v0.1.6](https://github.com/jiangyi15/tf-pwa/tree/v0.1.6) (2021-10-28)

[Full Changelog](https://github.com/jiangyi15/tf-pwa/compare/v0.1.5...v0.1.6)

**<font color=red>Numeric</font>**

- Support parity transfomation, for charge conjugation process. The old method
is still aviable for `cp_trans: False`
[#53](https://github.com/jiangyi15/tf-pwa/pull/53)

- Update default options: `center_mass: False`, `r_boost: True`,
`random_z: True`. [#60](https://github.com/jiangyi15/tf-pwa/pull/60)

**Added**

- Support Custom DecayChain. [#59](https://github.com/jiangyi15/tf-pwa/pull/59)
- Support to export `Saved Model` format of tensorflow.
[#58](https://github.com/jiangyi15/tf-pwa/pull/58)
- Error propagation with automatic differentiation.
[#56](https://github.com/jiangyi15/tf-pwa/pull/56)
[#57](https://github.com/jiangyi15/tf-pwa/pull/57)
- New Decay model `gls-cpv` for CP violation.
[#55](https://github.com/jiangyi15/tf-pwa/pull/55)
- Support Identical particles.
[#54](https://github.com/jiangyi15/tf-pwa/pull/54)

**Changed**

- Force hessian matrix positive defined by adding some value for eigen value.
Expand Down
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "0.1.5" %}
{% set version = "0.1.6" %}

package:
name: tf-pwa
Expand Down
6 changes: 3 additions & 3 deletions tf_pwa/config_loader/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def load_p4(self, fnames):
def cal_angle(self, p4):
if isinstance(p4, (list, tuple)):
p4 = {k: v for k, v in zip(self.get_dat_order(), p4)}
center_mass = self.dic.get("center_mass", True)
r_boost = self.dic.get("r_boost", False)
random_z = self.dic.get("random_z", False)
center_mass = self.dic.get("center_mass", False)
r_boost = self.dic.get("r_boost", True)
random_z = self.dic.get("random_z", True)
data = cal_angle_from_momentum(
p4,
self.decay_struct,
Expand Down
3 changes: 3 additions & 0 deletions tf_pwa/tests/config_cfit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ data:
data_eff_value: "toy_data/data_eff_value.dat"
phsp_eff_value: "toy_data/phsp_eff_value.dat"
dat_order: [B, C, D]
center_mass: True
random_z: False
r_boost: False
data: ["toy_data/data.dat"]
phsp: ["toy_data/PHSP.dat"]

Expand Down
2 changes: 2 additions & 0 deletions tf_pwa/tests/config_cfit_cached.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ data:
data_eff_value: "toy_data/data_eff_value.dat"
phsp_eff_value: "toy_data/phsp_eff_value.dat"
dat_order: [B, C, D]
random_z: False
r_boost: False
data: ["toy_data/data.dat"]
phsp: ["toy_data/PHSP.dat"]
cached_amp: True
Expand Down
2 changes: 2 additions & 0 deletions tf_pwa/tests/config_toy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ data:
data: ["toy_data/data.dat"]
bg: ["toy_data/bg.dat"]
phsp: ["toy_data/PHSP.dat"]
random_z: False
r_boost: False
bg_weight: 0.1

decay:
Expand Down
2 changes: 2 additions & 0 deletions tf_pwa/tests/config_toy2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ data:
bg: ["toy_data/bg.dat"]
phsp: ["toy_data/PHSP.dat"]
bg_weight: 0.1
random_z: False
r_boost: False
use_tf_function: True
cached_int: True
cached_data: "toy_data/data.npy"
Expand Down
2 changes: 2 additions & 0 deletions tf_pwa/tests/config_toy3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ data:
bg: [["toy_data/bg.dat"], ["toy_data/bg.dat"]]
phsp: [["toy_data/PHSP.dat"], ["toy_data/PHSP.dat"]]
bg_weight: [0.1, 0.1]
random_z: False
r_boost: False
cached_amp: True
use_mix_likelihood: True

Expand Down
8 changes: 4 additions & 4 deletions tutorials/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ decay:

particle:
$top:
A: { J: 1, P: -1, spins: [-1, 1] }
A: { J: 1, P: -1, m0: 4.6, spins: [-1, 1] }
$finals:
B: { J: 1, P: -1 }
C: { J: 1, P: -1 }
D: { J: 0, P: -1 }
B: { J: 1, P: -1, m0: 2.00698 }
C: { J: 1, P: -1, m0: 2.01028 }
D: { J: 0, P: -1, m0: 0.13957 }
R_BC: { J: 1, Par: 1, m0: 4.16, g0: 0.1 }
R_BD: { J: 1, Par: 1, m0: 2.43, g0: 0.3 }
R_CD: { J: 1, Par: 1, m0: 2.42, g0: 0.03 }
Expand Down

0 comments on commit d48ddd5

Please sign in to comment.