diff --git a/backlogger/input/sfcf.py b/backlogger/input/sfcf.py index 5b9370f..d8566d0 100644 --- a/backlogger/input/sfcf.py +++ b/backlogger/input/sfcf.py @@ -1,15 +1,61 @@ import pyerrors as pe import datalad.api as dl import json +import os -corr_types = { - 'f_A': 'bi', - 'f_P': 'bi', - 'g_A': 'bi', - 'g_P': 'bi', - 'f_1': 'bb', - 'k_1': 'bb', - } + +bi_corrs = ["f_P", "fP", "f_p", + "g_P", "gP", "g_p", + "fA0", "f_A", "f_a", + "gA0", "g_A", "g_a", + "k1V1", "k1_V1", "k_v11", + "l1V1", "l1_V1", "l_v11", + "k2V2", "k2_V2", "k_v22", + "l2V2", "l2_V2", "l_v22", + "k3V3", "k3_V3", "k_v33", + "l3V3", "l3_V3", "l_v33", + "kVk", "k_V", "k_v", + "lVk", "l_V", "l_v", + "k1T01", "k1_T01", + "l1T01", "l1_T01", + "k2T02", "k2_T02", + "l2T02", "l2_T02", + "k3T03", "k3_T03", + "l3T03", "l3_T03", + "kT0k", "k_T", "k_t", + "lT0k", "l_T", "l_t", + "fAk", "f_Ak", "f_ak", + "gAk", "g_Ak", "g_ak", + "kV0", "k_V0", "k_v0", + "lV0", "l_V0", "l_v0", + "k1A2", "k1_A2", "f_av21", + "l1A2", "l1_A2", "g_av21", + "k2A3", "k2_A3", "f_av32", + "l2A3", "l2_A3", "g_av32", + "k3A1", "k3_A1", "f_av13", + "l3A1", "l3_A1", "g_av13", + "k1A3", "k1_A3", "f_av31", + "l1A3", "l1_A3", "g_av31", + "k2A1", "k2_A1", "f_av12", + "l2A1", "l2_A1", "g_av12", + "k3A2", "k3_A2", "f_av23", + "l3A2", "l3_A2", "g_av23", + ] + +bb_corrs = [ + 'F1', + 'F_1', + 'f_1', + 'F1ll', + 'k_1', + ] + +corr_types = {} + +for c in bi_corrs: + corr_types[c] = 'bi' +for c in bb_corrs: + corr_types[c] = 'bb' def read_param(path, project, file_in_project): @@ -166,7 +212,7 @@ def read_data(path, project, dir_in_project, prefix, param, version='1.0c', cfg_ """ names = kwargs.get('names', None) - directory = path + "/projects/" + project + '/' + dir_in_project + directory = os.path.join(path, "projects", project, dir_in_project) print("Getting data, this might take a while...") dl.get(directory, dataset=path) print("... done downloading.")