Use specific config for certain llh #78

dachengx · 2023-01-23T05:16:29Z

Sometimes we do need to combine two likelihoods, but they can have different maps (s). In this PR, we specify the name of llh for Map.build, so that we do not need to write many similar plugins.

Finally, we recover Rn220 & Ar37 combined fit.

Also add map_interpolator_regular_binning_1d performing 1D KNN with regular binning.

Recover Rn220 & Ar37 combine fit

github-actions · 2023-01-23T05:17:26Z

appletree/config.py

-        self.value = _cached_configs[self.name]
+        value = _cached_configs[self.name]
+        if isinstance(value, dict):
+            self.value = value[llh_name]


[pep8] _{reported by reviewdog 🐶}
WPS601 Found shadowed class attribute: value

github-actions · 2023-01-23T05:17:26Z

appletree/config.py

+        if isinstance(value, dict):
+            self.value = value[llh_name]
+        else:
+            self.value = value


[pep8] _{reported by reviewdog 🐶}
WPS601 Found shadowed class attribute: value

github-actions · 2023-01-23T05:17:26Z

appletree/component.py

@@ -289,7 +291,7 @@ def flush_source_code(self,
        # initialize new instances
        for work in self.worksheet:
            instance = work[0] + '_' + self.name
-            code += f'{instance} = {work[0]}()\n'
+            code += f"{instance} = {work[0]}('{self.llh_name}')\n"


[pep8] _{reported by reviewdog 🐶}
WPS221 Found line with high Jones Complexity: 15 > 14

coveralls · 2023-01-23T05:24:13Z

Pull Request Test Coverage Report for Build 4002889673

35 of 74 (47.3%) changed or added relevant lines in 6 files are covered.
2 unchanged lines in 1 file lost coverage.
Overall coverage increased (+0.06%) to 77.514%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
appletree/plugin.py	8	10	80.0%
appletree/component.py	13	16	81.25%
appletree/interpolation.py	3	6	50.0%
appletree/share.py	0	8	0.0%
appletree/utils.py	2	11	18.18%
appletree/config.py	9	23	39.13%

Files with Coverage Reduction	New Missed Lines	%
appletree/utils.py	2	36.63%

Totals
Change from base Build 3983747327:	0.06%
Covered Lines:	1372
Relevant Lines:	1770

💛 - Coveralls

zihaoxu98 · 2023-01-23T10:36:19Z

appletree/plugin.py

@@ -27,8 +27,10 @@ class Plugin():
    # Set using the takes_config decorator
    takes_config = immutabledict()

-    def __init__(self):
+    def __init__(self, llh_name):


Not sure if this is a good idea to require llh_name in the class lower than likelihood. Maybe give some default value?

That is a good idea.

github-actions · 2023-01-23T12:21:08Z

appletree/config.py

+        value = _cached_configs[self.name]
+        if isinstance(value, dict):
+            try:
+                self.value = value[llh_name]


[pep8] _{reported by reviewdog 🐶}
WPS601 Found shadowed class attribute: value

github-actions · 2023-01-23T12:21:08Z

appletree/config.py

+        if isinstance(value, dict):
+            try:
+                self.value = value[llh_name]
+            except:


[pep8] _{reported by reviewdog 🐶}
B001 Do not use bare except:, it also catches unexpected events like memory errors, interrupts, system exit, and so on. Prefer except Exception:. If you're sure what you're doing, be explicit and write except BaseException:.

github-actions · 2023-01-23T12:21:08Z

appletree/config.py

+        if isinstance(value, dict):
+            try:
+                self.value = value[llh_name]
+            except:


[pep8] _{reported by reviewdog 🐶}
E722 do not use bare 'except'

github-actions · 2023-01-23T12:21:08Z

appletree/config.py

+        if isinstance(file_path, dict):
+            try:
+                self.file_path = file_path[llh_name]
+            except:


[pep8] _{reported by reviewdog 🐶}
B001 Do not use bare except:, it also catches unexpected events like memory errors, interrupts, system exit, and so on. Prefer except Exception:. If you're sure what you're doing, be explicit and write except BaseException:.

github-actions · 2023-01-23T12:21:09Z

appletree/config.py

+        if isinstance(file_path, dict):
+            try:
+                self.file_path = file_path[llh_name]
+            except:


[pep8] _{reported by reviewdog 🐶}
E722 do not use bare 'except'

Otherwise the following initialization of components will overwrite map

github-actions · 2023-01-24T13:42:41Z

appletree/plugin.py


        self.sanity_check()

+        # Do not set configurations as 


[pep8] _{reported by reviewdog 🐶}
W291 trailing whitespace

github-actions · 2023-01-24T17:22:01Z

appletree/component.py

@@ -117,7 +122,7 @@ def get_normalization(self, hist, parameters, batch_size=None):
            if self._use_mcinput:
                bootstrap_name = self._plugin_class_registry['energy'].__name__
                bootstrap_name = bootstrap_name + '_' + self.name
-                n_events_selected = _cached_functions[bootstrap_name].g4.n_events_selected
+                n_events_selected = _cached_functions[self.llh_name][bootstrap_name].g4.n_events_selected


[pep8] _{reported by reviewdog 🐶}
E501 line too long (105 > 100 characters)

github-actions · 2023-01-25T04:32:59Z

appletree/interpolation.py

@@ -75,6 +75,23 @@ def curve_interpolator(pos, ref_pos, ref_val):
    return val


+@export
+@jit
+def map_interpolator_regular_binning_1d(pos, ref_pos_lowers, ref_pos_uppers, ref_val):


[pep8] _{reported by reviewdog 🐶}
WPS114 Found underscored number name pattern: map_interpolator_regular_binning_1d

I guess this is tolerable.

Use specific config for certain llh

43501e0

Recover Rn220 & Ar37 combine fit

github-actions bot reviewed Jan 23, 2023

View reviewed changes

Fix bug

6511f8d

dachengx requested a review from zihaoxu98 January 23, 2023 05:55

Merge remote-tracking branch 'origin/master' into configs_llh

9faadd0

zihaoxu98 reviewed Jan 23, 2023

View reviewed changes

Set default value and warning message for llh_name in map configuration

0e3f0b8

github-actions bot reviewed Jan 23, 2023

View reviewed changes

dachengx added 2 commits January 23, 2023 20:23

Specify exception

7b2c5e8

Do not set configuration as static method

4b9f8e8

Otherwise the following initialization of components will overwrite map

github-actions bot reviewed Jan 24, 2023

View reviewed changes

dachengx added 3 commits January 24, 2023 22:00

Update comments

4732eac

Also small fix to allow force register

cc9d436

Bug fixx when separate plugins into different global

adc06a8

github-actions bot reviewed Jan 24, 2023

View reviewed changes

Add another interpolation function

2b37056

github-actions bot reviewed Jan 25, 2023

View reviewed changes

dachengx merged commit 2fc0a8d into master Jan 25, 2023

dachengx deleted the configs_llh branch January 25, 2023 15:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use specific config for certain llh #78

Use specific config for certain llh #78

dachengx commented Jan 23, 2023 •

edited

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

coveralls commented Jan 23, 2023 •

edited

zihaoxu98 Jan 23, 2023

dachengx Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 23, 2023

github-actions bot Jan 24, 2023

github-actions bot Jan 24, 2023

github-actions bot Jan 25, 2023

dachengx Jan 25, 2023

Use specific config for certain llh #78

Use specific config for certain llh #78

Conversation

dachengx commented Jan 23, 2023 • edited

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

coveralls commented Jan 23, 2023 • edited

Pull Request Test Coverage Report for Build 4002889673

💛 - Coveralls

zihaoxu98 Jan 23, 2023

Choose a reason for hiding this comment

dachengx Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 23, 2023

Choose a reason for hiding this comment

github-actions bot Jan 24, 2023

Choose a reason for hiding this comment

github-actions bot Jan 24, 2023

Choose a reason for hiding this comment

github-actions bot Jan 25, 2023

Choose a reason for hiding this comment

dachengx Jan 25, 2023

Choose a reason for hiding this comment

dachengx commented Jan 23, 2023 •

edited

coveralls commented Jan 23, 2023 •

edited