small changes, no debugging
This commit is contained in:
parent
8c19ebd848
commit
5407de0aff
1 changed files with 2 additions and 5 deletions
|
@ -38,7 +38,6 @@ def _db_lookup(db, ensemble, correlator_name, project=None, code=None, parameter
|
||||||
search_expr += f" AND updated_at < '{updated_before}'"
|
search_expr += f" AND updated_at < '{updated_before}'"
|
||||||
if updated_after:
|
if updated_after:
|
||||||
search_expr += f" AND updated_at > '{updated_after}'"
|
search_expr += f" AND updated_at > '{updated_after}'"
|
||||||
print(search_expr)
|
|
||||||
conn = sqlite3.connect(db)
|
conn = sqlite3.connect(db)
|
||||||
results = pd.read_sql(search_expr, conn)
|
results = pd.read_sql(search_expr, conn)
|
||||||
conn.close()
|
conn.close()
|
||||||
|
@ -52,9 +51,7 @@ def filter_results(results, **kwargs):
|
||||||
if result['code'] == 'sfcf':
|
if result['code'] == 'sfcf':
|
||||||
param = json.loads(result['parameters'])
|
param = json.loads(result['parameters'])
|
||||||
if 'offset' in kwargs:
|
if 'offset' in kwargs:
|
||||||
print("checking offset")
|
|
||||||
if kwargs.get('offset') != param['offset']:
|
if kwargs.get('offset') != param['offset']:
|
||||||
print("dropping")
|
|
||||||
drops.append(ind)
|
drops.append(ind)
|
||||||
continue
|
continue
|
||||||
if 'quark_masses' in kwargs:
|
if 'quark_masses' in kwargs:
|
||||||
|
@ -81,11 +78,11 @@ def filter_results(results, **kwargs):
|
||||||
return results.drop(drops)
|
return results.drop(drops)
|
||||||
|
|
||||||
|
|
||||||
def find_correlator(path, ensemble, correlator_name, project=None, code=None, parameters=None, created_before=None, created_after=None, updated_before=None, updated_after=None, revision=None, **kwargs):
|
def find_record(path, ensemble, correlator_name, project=None, code=None, parameters=None, created_before=None, created_after=None, updated_before=None, updated_after=None, revision=None, **kwargs):
|
||||||
db = path + '/backlogger.db'
|
db = path + '/backlogger.db'
|
||||||
if os.path.exists(db):
|
if os.path.exists(db):
|
||||||
dl.get(db, dataset=path)
|
dl.get(db, dataset=path)
|
||||||
results = _db_lookup(db, ensemble, correlator_name, project, code=None, parameters=None, created_before=created_before, created_after=created_after, updated_before=updated_before, updated_after=updated_after, revision=revision)
|
results = _db_lookup(db, ensemble, correlator_name, project, code=None, parameters=None, created_before=created_before, created_after=created_after, updated_before=updated_before, updated_after=updated_after, revision=revision)
|
||||||
results = filter_results(results, **kwargs)
|
results = filter_results(results, **kwargs)
|
||||||
print("Found " + str(len(results)) + " results")
|
print("Found " + str(len(results)) + " results")
|
||||||
return results
|
return results.reset_index()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue