From 635ecb4c962a903e2aeb4ba96fa5f985ee92bad2 Mon Sep 17 00:00:00 2001
From: Mikkel Pedersen <mkklpdrsn@gmail.com>
Date: Thu, 9 Nov 2023 12:59:24 +0100
Subject: [PATCH] fix(full): Add full steps

---
 pollination/annual_daylight/entry.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pollination/annual_daylight/entry.py b/pollination/annual_daylight/entry.py
index 8b9d710..9ac5a4e 100644
--- a/pollination/annual_daylight/entry.py
+++ b/pollination/annual_daylight/entry.py
@@ -1,5 +1,6 @@
 from pollination_dsl.dag import Inputs, DAG, task, Outputs
 from dataclasses import dataclass
+from pollination.honeybee_radiance_postprocess.grid import MergeFolderData
 
 # input/output alias
 from pollination.alias.inputs.model import hbjson_model_grid_input
@@ -188,10 +189,25 @@ def post_process_annual_daylight(
             {
                 'from': AnnualDaylightPostProcess()._outputs.visualization,
                 'to': 'visualization.vsf'
-            },
+            }
+        ]
+
+    @task(
+        template=MergeFolderData,
+        needs=[prepare_folder_annual_daylight, annual_daylight_raytracing],
+        sub_paths={
+            'dist_info': 'grid/_redist_info.json'
+        }
+    )
+    def restructure_results(
+        self, input_folder='initial_results/final',
+        dist_info=prepare_folder_annual_daylight._outputs.resources,
+        extension='ill'
+    ):
+        return [
             {
-                'from': AnnualDaylightPostProcess()._outputs.grid_summary,
-                'to': 'grid_summary.csv'
+                'from': MergeFolderData()._outputs.output_folder,
+                'to': 'results/__static_apertures__/default/total'
             }
         ]
 
@@ -200,6 +216,11 @@ def post_process_annual_daylight(
         description='Result visualization in VisualizationSet format.'
     )
 
+    results = Outputs.folder(
+        source='results', description='Folder with raw result files (.ill) that '
+        'contain illuminance matrices for each sensor at each timestep of the analysis.'
+    )
+
     metrics = Outputs.folder(
         source='metrics', description='Annual metrics folder.'
     )