Skip to content
Snippets Groups Projects
Commit fe16dc7a authored by Michal Maciejewski's avatar Michal Maciejewski
Browse files

Merge branch 'mmacieje-master-patch-30946' into 'master'

Update lhcsmapi/pyedsl/dbquery/DbQueryBuilder.py, lhcsmapi/__init__.py files

See merge request !43
parents a973c605 99b0345a
No related branches found
No related tags found
1 merge request!43Update lhcsmapi/pyedsl/dbquery/DbQueryBuilder.py, lhcsmapi/__init__.py files
Pipeline #2405586 failed
name = "lhcsmapi"
__version__ = "1.5.3"
__version__ = "1.5.4"
def get_lhcsmapi_version() -> None:
......
......@@ -703,7 +703,7 @@ class NxcalsDbQueryBuilder(DbQueryBuilder):
:return: a DataFrame with signal features
"""
feature_query_results_df = self.nxcals_feature_query(time_params_dict, features, kwargs)
feature_query_results_df = self.nxcals_feature_query(time_params_dict, features, **kwargs)
# Fill with NaN missing entries
if 'metadata_device' in self._query_params:
......@@ -723,7 +723,7 @@ class NxcalsDbQueryBuilder(DbQueryBuilder):
:param kwargs: optional keyword/arguments to parametrise a query
:return: a DataFrame with signal features
"""
spark = self.dbconnector
spark = kwargs['dbconnector']
system = self._query_params.loc[0, 'metadata_system']
t_start = int(time_params_dict['t_start'])
t_end = int(time_params_dict['t_end'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment