additional property alignment

Author: 1jhu1

lib/measures/door_enhancement/measure.py

@@ -1675,7 +1675,9 @@ def _select_rsmeans_door_hit(rsmeans_lookup_data):
             factors.setFeature("door_side_seal_gwp_per_m_kgCO2eq", float(np.mean(gwp_per_m_side_list)))
 
         # 5G) SimulationControl bucket (results)
-        results.setFeature("door_enhancement_embodied_carbon_kg", total_embodied_carbon)
+        # Canonical embodied carbon key used by wall/roof/window measures.
+        results.setFeature("door_enhancement_embodied_carbon_kgCO2eq", total_embodied_carbon)
+
 
         if rsmeans_lookup is not None and rsmeans_lookup.get("status") == "ok":
             rsmeans_summary_dict = rsmeans_lookup.get("summary", {})
@@ -1718,9 +1720,10 @@ def _select_rsmeans_door_hit(rsmeans_lookup_data):
             factors.setFeature("door_enhancement_overhead_profit_percent", rsmeans_overhead_percent)
 
             # -- SimulationControl (results) bucket: mirrored scalars + JSON --
-            results.setFeature("door_enhancement_total_material_cost_$", rsmeans_material_cost)
-            results.setFeature("door_enhancement_total_overhead_profit_cost_$", rsmeans_overhead_cost)
-            results.setFeature("door_enhancement_total_cost_with_overhead_profit_$", rsmeans_total_cost)
+            results.setFeature("door_enhancement_material_cost_$", rsmeans_material_cost)
+            results.setFeature("door_enhancement_labor_cost_$", 0.0)  # Custom costs assumed to already include labor
+            results.setFeature("door_enhancement_overhead_profit_cost_$", rsmeans_overhead_cost)
+            results.setFeature("door_enhancement_total_cost_with_overhead_and_profit_$", rsmeans_total_cost)
 
             # Three JSON payloads for full diagnostic traceability (mirrors
             # the three-payload pattern used by wall and roof insulation measures).

lib/measures/window_enhancement/measure.py

@@ -3107,9 +3107,9 @@ def _initialize_additional_property_feature_maps(
         total_embodied_carbon,
     ):
         basic_input_features = {
-            "analysis_period_years": analysis_period,
-            "gwp_statistic": gwp_statistic,
-            "measure_name": "Window Enhancement",
+            "window_enhancement_analysis_period_years": analysis_period,
+            "window_enhancement_gwp_statistic": gwp_statistic,
+            "window_enhancement_measure_name": "Window Enhancement",
         }
         # Keep only canonical reno_detail keys.
         reno_detail_features = {
@@ -3478,7 +3478,7 @@ def _update_cost_and_rsmeans_feature_maps(
             "window_enhancement_material_cost_$": total_material_cost,
             "window_enhancement_labor_cost_$": total_labor_cost,
             "window_enhancement_overhead_profit_cost_$": total_overhead_profit_cost,
-            "window_enhancement_total_cost_with_overhead_profit_$": total_cost_with_overhead_profit,
+            "window_enhancement_total_cost_with_overhead_and_profit_$": total_cost_with_overhead_profit,
             "window_enhancement_cost_factor_basis": cost_factor_basis
         })