aind-dynamic-foraging-basic-analysis 0.3.36__tar.gz → 0.3.38__tar.gz

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-dynamic-foraging-basic-analysis
-Version: 0.3.36
+Version: 0.3.38
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -23,7 +23,6 @@ Requires-Dist: aind-dynamic-foraging-data-utils>=0.1.25
 Requires-Dist: aind_hierarchical_bootstrap
 Requires-Dist: aind_dynamic_foraging_models
 Provides-Extra: dev
-Requires-Dist: aind-dynamic-foraging-basic-analysis; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/pyproject.toml

@@ -35,7 +35,6 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    'aind-dynamic-foraging-basic-analysis',
     'black',
     'coverage',
     'flake8',

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/src/aind_dynamic_foraging_basic_analysis/__init__.py

@@ -1,6 +1,6 @@
 """Init package"""
 
-__version__ = "0.3.36"
+__version__ = "0.3.38"
 
 from .metrics.foraging_efficiency import compute_foraging_efficiency  # noqa: F401
 from .plot.plot_foraging_session import plot_foraging_session  # noqa: F401

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py

@@ -1,7 +1,7 @@
 """
-    Tools for computing trial by trial metrics
-    df_trials = compute_trial_metrics(nwb)
-    df_trials = compute_bias(nwb)
+Tools for computing trial by trial metrics
+df_trials = compute_trial_metrics(nwb)
+df_trials = compute_bias(nwb)
 
 """
 
@@ -239,13 +239,7 @@ def add_intertrial_licking(df_trials, df_licks):
 
 
 def get_average_signal_window_multi(
-    nwbs,
-    alignment_event,
-    offsets,
-    channel,
-    data_column='data_z',
-    censor=True,
-    output_col=None
+    nwbs, alignment_event, offsets, channel, data_column="data_z", censor=True, output_col=None
 ):
     """
     Wrapper for get_average_signal_window to process a
@@ -280,7 +274,7 @@ def get_average_signal_window_multi(
             channel=channel,
             data_column=data_column,
             censor=censor,
-            output_col=output_col
+            output_col=output_col,
         )
         nwb.df_trials = df_trials
     return nwbs
@@ -291,7 +285,7 @@ def get_average_signal_window(
     alignment_event,
     offsets,
     channel,
-    data_column='data_z',
+    data_column="data_z",
     censor=True,
     output_col=None,
 ):
@@ -331,7 +325,7 @@ def get_average_signal_window(
     """
 
     # Check alignment_event ends with 'in_session'
-    if not alignment_event.endswith('in_session'):
+    if not alignment_event.endswith("in_session"):
         raise ValueError(f"alignment_event '{alignment_event}' must end with 'in_session'.")
 
     if not hasattr(nwb, "df_trials"):
@@ -380,10 +374,10 @@ def get_average_signal_window(
     )
 
     avg_activity = etr.groupby("event_number").mean()
-    avg_activity['trial'] = df_trials.trial.values
+    avg_activity["trial"] = df_trials.trial.values
     avg_activity = avg_activity.rename(columns={data_column: output_col})
 
     # Merge on 'trial'
-    df_trials = df_trials.merge(avg_activity[['trial', output_col]], on='trial', how='left')
+    df_trials = nwb.df_trials.merge(avg_activity[["trial", output_col]], on="trial", how="left")
 
     return df_trials

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/src/aind_dynamic_foraging_basic_analysis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-dynamic-foraging-basic-analysis
-Version: 0.3.36
+Version: 0.3.38
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -23,7 +23,6 @@ Requires-Dist: aind-dynamic-foraging-data-utils>=0.1.25
 Requires-Dist: aind_hierarchical_bootstrap
 Requires-Dist: aind_dynamic_foraging_models
 Provides-Extra: dev
-Requires-Dist: aind-dynamic-foraging-basic-analysis; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{aind_dynamic_foraging_basic_analysis-0.3.36 → aind_dynamic_foraging_basic_analysis-0.3.38}/src/aind_dynamic_foraging_basic_analysis.egg-info/requires.txt

@@ -14,7 +14,6 @@ aind_hierarchical_bootstrap
 aind_dynamic_foraging_models
 
 [dev]
-aind-dynamic-foraging-basic-analysis
 black
 coverage
 flake8