mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-11-30 04:56:52 +01:00
simplify read_flow_obs names handling
This commit is contained in:
parent
eb94260116
commit
5bad13f91e
1 changed files with 4 additions and 6 deletions
|
|
@ -1000,7 +1000,8 @@ def _read_flow_obs(path: str, prefix: str, c: float, dtr_cnfg: int=1, version: s
|
||||||
|
|
||||||
truncated_file = file[:-len(postfix)]
|
truncated_file = file[:-len(postfix)]
|
||||||
|
|
||||||
if "names" not in kwargs:
|
rep_names = kwargs.get("names", [])
|
||||||
|
if len(rep_names) == 0:
|
||||||
try:
|
try:
|
||||||
idx = truncated_file.index('r')
|
idx = truncated_file.index('r')
|
||||||
except Exception:
|
except Exception:
|
||||||
|
|
@ -1008,9 +1009,6 @@ def _read_flow_obs(path: str, prefix: str, c: float, dtr_cnfg: int=1, version: s
|
||||||
raise Exception("Automatic recognition of replicum failed, please enter the key word 'names'.")
|
raise Exception("Automatic recognition of replicum failed, please enter the key word 'names'.")
|
||||||
ens_name = truncated_file[:idx]
|
ens_name = truncated_file[:idx]
|
||||||
rep_names.append(ens_name + '|' + truncated_file[idx:].split(".")[0])
|
rep_names.append(ens_name + '|' + truncated_file[idx:].split(".")[0])
|
||||||
else:
|
|
||||||
names = kwargs.get("names")
|
|
||||||
rep_names = names
|
|
||||||
|
|
||||||
deltas.append(Q_top)
|
deltas.append(Q_top)
|
||||||
|
|
||||||
|
|
@ -1046,8 +1044,8 @@ def qtop_projection(qtop: Obs, target: int=0) -> Obs:
|
||||||
for n in qtop.deltas:
|
for n in qtop.deltas:
|
||||||
proj_qtop.append(np.array([1 if round(qtop.r_values[n] + q) == target else 0 for q in qtop.deltas[n]]))
|
proj_qtop.append(np.array([1 if round(qtop.r_values[n] + q) == target else 0 for q in qtop.deltas[n]]))
|
||||||
|
|
||||||
reto = Obs(proj_qtop, qtop.names, idl=[qtop.idl[name] for name in qtop.names])
|
qtop_projected = Obs(proj_qtop, qtop.names, idl=[qtop.idl[name] for name in qtop.names])
|
||||||
return reto
|
return qtop_projected
|
||||||
|
|
||||||
|
|
||||||
def read_qtop_sector(path: str, prefix: str, c: float, target: int=0, **kwargs) -> Obs:
|
def read_qtop_sector(path: str, prefix: str, c: float, target: int=0, **kwargs) -> Obs:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue