Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ypriverol committed Aug 15, 2023
1 parent 2ed1589 commit accd8b9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 23 deletions.
43 changes: 21 additions & 22 deletions sdrf_pipelines/maxquant/maxquant.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,17 +707,17 @@ def maxquant_ify_mods(self, sdrf_mods, mqconfdir):
return ",".join(oms_mods)

def maxquant_convert(
self,
sdrf_file,
fastaFilePath,
mqconfdir,
self,
sdrf_file,
fastaFilePath,
mqconfdir,
matchBetweenRuns,
peptideFDR,
proteinFDR,
tempFolder,
raw_Folder,
numThreads,
output_path,
peptideFDR,
proteinFDR,
tempFolder,
raw_Folder,
numThreads,
output_path,
):
print("PROCESSING: " + sdrf_file + '"')

Expand Down Expand Up @@ -1693,8 +1693,7 @@ def maxquant_convert(
referenceChannel = doc.createElement("referenceChannel")
for key1, instr_val in file2instrument.items():
value2 = (
str(file2enzyme[key1]) + file2label[key1] + str(file2mods[key1]) + str(file2pctol) + str(
file2fragtol)
str(file2enzyme[key1]) + file2label[key1] + str(file2mods[key1]) + str(file2pctol) + str(file2fragtol)
)
datanalysisparams = {}
for p in file2params.keys():
Expand All @@ -1717,10 +1716,10 @@ def maxquant_convert(
"datanalysisparams": datanalysisparams,
}
if (
"Lys8" in file2label[key1]
or "Arg10" in file2label[key1]
or "Arg6" in file2label[key1]
or "Lys6" in file2label[key1]
"Lys8" in file2label[key1]
or "Arg10" in file2label[key1]
or "Arg6" in file2label[key1]
or "Lys6" in file2label[key1]
):
parameterGroup["0"]["silac_shape"] = file2silac_shape[key1]

Expand Down Expand Up @@ -1748,10 +1747,10 @@ def maxquant_convert(
}

if (
"Lys8" in file2label[key1]
or "Arg10" in file2label[key1]
or "Arg6" in file2label[key1]
or "Lys6" in file2label[key1]
"Lys8" in file2label[key1]
or "Arg10" in file2label[key1]
or "Arg6" in file2label[key1]
or "Lys6" in file2label[key1]
):
parameterGroup[str(tag)]["silac_shape"] = file2silac_shape[key1]

Expand Down Expand Up @@ -1924,8 +1923,8 @@ def maxquant_convert(
if "Lys8" in j["label"] or "Arg10" in j["label"] or "Arg6" in j["label"] or "Lys6" in j["label"]:
for lm in range(j["silac_shape"][0]):
r = j["label"].split(",")[
lm * j["silac_shape"][1]: lm * j["silac_shape"][1] + lm * j["silac_shape"][1]
]
lm * j["silac_shape"][1] : lm * j["silac_shape"][1] + lm * j["silac_shape"][1]
]
if "Arg0" in r:
r.remove("Arg0")
text = ";".join(r)
Expand Down
2 changes: 1 addition & 1 deletion sdrf_pipelines/normalyzerde/normalyzerde.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self) -> None:

# Consider unlabeled analysis for now
def convert_normalyzerde_design(
self, sdrf_file, split_by_columns, annotation_path, comparisons_path, maxquant_exp_design_file
self, sdrf_file, split_by_columns, annotation_path, comparisons_path, maxquant_exp_design_file
):
sdrf = pd.read_csv(sdrf_file, sep="\t")
sdrf = sdrf.astype(str)
Expand Down

0 comments on commit accd8b9

Please sign in to comment.