diff --git a/pollination/three_phase/three_phase/_multiply_matrix.py b/pollination/three_phase/three_phase/_multiply_matrix.py index 33b9a5a..6d7cff9 100644 --- a/pollination/three_phase/three_phase/_multiply_matrix.py +++ b/pollination/three_phase/three_phase/_multiply_matrix.py @@ -51,7 +51,7 @@ def multiply_threephase_matrix( return [ { 'from': MatrixMultiplicationThreePhase()._outputs.output_matrix, - 'to': 'temp/{{identifier}}.ill' + 'to': 'temp/{{self.identifier}}.ill' } ] @@ -69,6 +69,6 @@ def binary_to_npy( return [ { 'from': BinaryToNpy()._outputs.output_file, - 'to': '../../results/{{light_path}}/{{state_id}}/total/{{grid_id}}.npy' + 'to': '../../results/{{self.light_path}}/{{self.state_id}}/total/{{self.grid_id}}.npy' } ] diff --git a/pollination/three_phase/three_phase/calculation.py b/pollination/three_phase/three_phase/calculation.py index 01d5906..210793a 100644 --- a/pollination/three_phase/three_phase/calculation.py +++ b/pollination/three_phase/three_phase/calculation.py @@ -119,7 +119,7 @@ def daylight_mtx_calculation( @task( template=MultiplyMatrixDag, loop=multiplication_info, - needs=[daylight_mtx_calculation], + needs=[calculate_view_matrix, daylight_mtx_calculation], sub_paths={ 'view_matrix': '{{item.vmtx}}', 't_matrix': 'bsdf/{{item.tmtx}}',