diff --git a/frads/methods.py b/frads/methods.py index 49730eb..3cc3a42 100755 --- a/frads/methods.py +++ b/frads/methods.py @@ -1232,7 +1232,7 @@ def calculate_edgps( time: datetime, dni: float, dhi: float, - ambient_bounce: int = 1, + ambient_bounce: int = 0, save_hdr: Optional[Union[str, Path]] = None, ) -> float: """Calculate enhanced simplified daylight glare probability (EDGPs) for a view. @@ -1293,8 +1293,8 @@ def calculate_edgps( if save_hdr is not None: with open(save_hdr, "wb") as f: f.write(hdr) - res = pr.evalglare(hdr, ev=ev.item()) - edgps = float(res.split(b":")[1].split()[0]) + res = pr.evalglare(hdr, fast=1, correction_mode="-l-", ev=ev.item()) + edgps = float(res) os.remove(octree) return edgps diff --git a/frads/window.py b/frads/window.py index 65c8dac..4ce2315 100644 --- a/frads/window.py +++ b/frads/window.py @@ -56,7 +56,6 @@ class Layer: ir_transmittance: float rgb: PaneRGB - @dataclass class Gas: """Gas data object. @@ -247,6 +246,7 @@ def get_layers(input: List[pwc.ProductData]) -> List[Layer]: return layers + def create_pwc_gaps(gaps: List[Gap]): """Create a list of pwc gaps from a list of gaps.""" pwc_gaps = []