Allow component lineage with no binning (#180)

* Allow componnet lineage with no binning * Simplification * Simplification
XENONnT · Jul 31, 2024 · f77ae6b · f77ae6b
1 parent 6042ee6
commit f77ae6b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 53 deletions.
diff --git a/appletree/component.py b/appletree/component.py
@@ -570,24 +570,25 @@ def new_component(self, llh_name: Optional[str] = None, pass_binning: bool = Tru
 
     @property
     def lineage(self):
-        return {
-            **{
-                "rate_name": self.rate_name,
-                "norm_type": self.norm_type,
+        bins_dict = dict()
+        if hasattr(self, "bins") or hasattr(self, "bins_type"):
+            bins_dict = {
                 "bins": (
                     tuple(b.tolist() for b in self.bins) if self.bins is not None else self.bins
                 ),
                 "bins_type": self.bins_type,
-                "code": self.code,
-            },
-            **{
-                "instances": dict(
-                    zip(
-                        self.instances,
-                        [_cached_functions[self.llh_name][p].lineage for p in self.instances],
-                    )
+            }
+        return {
+            "rate_name": self.rate_name,
+            "norm_type": self.norm_type,
+            "code": self.code,
+            "instances": dict(
+                zip(
+                    self.instances,
+                    [_cached_functions[self.llh_name][p].lineage for p in self.instances],
                 )
-            },
+            ),
+            **bins_dict,
         }
 
 

diff --git a/appletree/context.py b/appletree/context.py
@@ -399,14 +399,14 @@ def update_parameter_config(self, likelihoods):
     def lineage(self):
         return {
             **self.instruct,
-            **{"par_config": self.par_config},
             **{
+                "par_config": self.par_config,
                 "likelihoods": dict(
                     zip(
                         self.likelihoods.keys(),
                         [v.lineage for v in self.likelihoods.values()],
                     )
-                )
+                ),
             },
         }
 

diff --git a/appletree/likelihood.py b/appletree/likelihood.py
@@ -415,23 +415,19 @@ def print_likelihood_summary(self, indent: str = " " * 4, short: bool = True):
     @property
     def lineage(self):
         return {
-            **{
-                "config": self._config,
-                "file_path": (
-                    os.path.basename(self._data_file_name)
-                    if not utils.FULL_PATH_LINEAGE
-                    else get_file_path(self._data_file_name)
-                ),
-                "sha256": calculate_sha256(get_file_path(self._data_file_name)),
-            },
-            **{
-                "components": dict(
-                    zip(
-                        self.components.keys(),
-                        [v.lineage for v in self.components.values()],
-                    )
+            "config": self._config,
+            "file_path": (
+                os.path.basename(self._data_file_name)
+                if not utils.FULL_PATH_LINEAGE
+                else get_file_path(self._data_file_name)
+            ),
+            "sha256": calculate_sha256(get_file_path(self._data_file_name)),
+            "components": dict(
+                zip(
+                    self.components.keys(),
+                    [v.lineage for v in self.components.values()],
                 )
-            },
+            ),
         }
 
     @property
@@ -591,15 +587,11 @@ def print_likelihood_summary(self, indent: str = " " * 4, short: bool = True):
     @property
     def lineage(self):
         return {
-            **{
-                "config": self._config,
-            },
-            **{
-                "components": dict(
-                    zip(
-                        self.components.keys(),
-                        [v.lineage_hash for v in self.components.values()],
-                    )
+            "config": self._config,
+            "components": dict(
+                zip(
+                    self.components.keys(),
+                    [v.lineage_hash for v in self.components.values()],
                 )
-            },
+            ),
         }
diff --git a/appletree/plugin.py b/appletree/plugin.py
@@ -94,19 +94,15 @@ def sanity_check(self):
     @property
     def lineage(self):
         return {
-            **{
-                "depends_on": self.depends_on,
-                "provides": self.provides,
-                "parameters": self.parameters,
-            },
-            **{
-                "takes_config": dict(
-                    zip(
-                        self.takes_config.keys(),
-                        [v.lineage for v in self.takes_config.values()],
-                    )
+            "depends_on": self.depends_on,
+            "provides": self.provides,
+            "parameters": self.parameters,
+            "takes_config": dict(
+                zip(
+                    self.takes_config.keys(),
+                    [v.lineage for v in self.takes_config.values()],
                 )
-            },
+            ),
         }
 
     @property