Fix galaxies_via_instance_from to include scaling_galaxies

Replace early-return + operator merge with list accumulation so that
both extra_galaxies and scaling_galaxies are always added to the galaxy
list. The old pattern caused scaling_galaxies to be silently dropped
when extra_galaxies was also present (integer key collision in af.Collection +).

Same fix applied to aggregator/galaxies.py _galaxies_from.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 2 people

autogalaxy/aggregator/galaxies.py

@@ -68,6 +68,10 @@ def _galaxies_from(fit: af.Fit, instance: af.ModelInstance) -> List[Galaxy]:
         if hasattr(instance, "extra_galaxies"):
             if instance.extra_galaxies is not None:
                 galaxies = galaxies + instance.extra_galaxies
+                
+        if hasattr(instance, "scaling_galaxies"):
+            if instance.scaling_galaxies is not None:
+                galaxies = galaxies + instance.scaling_galaxies
 
         galaxies_list.append(galaxies)
 

autogalaxy/analysis/analysis/analysis.py

@@ -77,13 +77,17 @@ def galaxies_via_instance_from(
         -------
         A list of galaxies that is used to then fit the dataset.
         """
+        galaxy_list = list(instance.galaxies)
+
         if hasattr(instance, "extra_galaxies"):
             if getattr(instance, "extra_galaxies", None) is not None:
-                return Galaxies(
-                    galaxies=instance.galaxies + instance.extra_galaxies,
-                )
+                galaxy_list += list(instance.extra_galaxies)
+
+        if hasattr(instance, "scaling_galaxies"):
+            if getattr(instance, "scaling_galaxies", None) is not None:
+                galaxy_list += list(instance.scaling_galaxies)
 
-        return Galaxies(galaxies=instance.galaxies)
+        return Galaxies(galaxies=galaxy_list)
 
     def dataset_model_via_instance_from(
         self, instance: af.ModelInstance