Skip to content

Commit

Permalink
Merge pull request #1 from bigbio/dev
Browse files Browse the repository at this point in the history
small changes.
  • Loading branch information
ypriverol authored Oct 27, 2023
2 parents 0e9a851 + a892d81 commit 30708dc
Show file tree
Hide file tree
Showing 14 changed files with 108 additions and 499 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ testing*
/build/
results*/
venv/
node_modules
conversion_inputs
debug_dir
test_out

lint_log.txt
10 changes: 5 additions & 5 deletions bin/diann_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def convert(ctx, folder, exp_design, dia_params, diann_version, charge, missed_c
:param folder: DiannConvert specifies the folder where the required file resides. The folder contains
the DiaNN main report, protein matrix, precursor matrix, experimental design file, protein sequence
FASTA file, version file of DiaNN and mzml_info TSVs
FASTA file, version file of DiaNN and ms_info TSVs
:type folder: str
:param dia_params: A list contains DIA parameters
:type dia_params: list
Expand Down Expand Up @@ -252,8 +252,8 @@ def fasta(self) -> os.PathLike:
return self.find_suffix_file(".fa")

@property
def mzml_info(self) -> os.PathLike:
return self.find_suffix_file("mzml_info.tsv")
def ms_info(self) -> os.PathLike:
return self.find_suffix_file("ms_info.tsv")

@property
def validate_diann_version(self) -> str:
Expand Down Expand Up @@ -826,7 +826,7 @@ def mztab_PSH(report, folder, database):
:type report: pandas.core.frame.DataFrame
:param folder: DiannConvert specifies the folder where the required file resides. The folder contains
the DiaNN main report, protein matrix, precursor matrix, experimental design file, protein sequence
FASTA file, version file of DiaNN and mzml_info TSVs
FASTA file, version file of DiaNN and ms_info TSVs
:type folder: str
:param database: Path to fasta file
:type database: str
Expand All @@ -837,7 +837,7 @@ def mztab_PSH(report, folder, database):

def __find_info(dir, n):
# This line matches n="220101_myfile", folder="." to
# "myfolder/220101_myfile_mzml_info.tsv"
# "myfolder/220101_myfile_ms_info.tsv"
files = list(Path(dir).glob(f"*{n}*_info.tsv"))
# Check that it matches one and only one file
if not files:
Expand Down
Loading

0 comments on commit 30708dc

Please sign in to comment.