Skip to content

Commit 3156627

Browse files
authored
Bring mass spec utilities into ViMMS (#331)
1 parent 3faf151 commit 3156627

37 files changed

Lines changed: 1848 additions & 57 deletions

poetry.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ jsonpickle = "^4.1.1"
3131
statsmodels = "^0.14.4"
3232
tabulate = "^0.9.0"
3333
intervaltree = "^3.1.0"
34+
sortedcontainers = "^2.4.0"
3435
events = "^0.5"
3536
pymzml = "^2.5.11"
3637
psims = "^1.3.5"
37-
mass-spec-utils = "^0.0.12"
38+
molmass = "^2025.4.14"
3839
pysmiles = "^2.0.0"
3940
numba = "^0.61.2"
4041
numba-stats = "^1.10.1"

tests/test_chemical_generation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from pathlib import Path
55

66
import pytest
7-
from mass_spec_utils.library_matching.gnps import load_mgf
7+
from vimms.mass_spec_utils.library_matching.gnps import load_mgf
88

99
from tests.conftest import HMDB, MGF_FILE, MZML_FILE, OUT_DIR, check_mzML, check_non_empty_MS2
1010
from vimms.ChemicalSamplers import (

vimms/BOMAS.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import time
33

44
import numpy as np
5-
from mass_spec_utils.data_import.mzmine import load_picked_boxes, map_boxes_to_scans
6-
from mass_spec_utils.data_import.mzml import MZMLFile
5+
from vimms.mass_spec_utils.data_import.mzmine import load_picked_boxes, map_boxes_to_scans
6+
from vimms.mass_spec_utils.data_import.mzml import MZMLFile
77

88
from vimms.Agent import TopNDEWAgent
99
from vimms.Box import BoxGrid

vimms/Box.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import intervaltree
1515
import numpy as np
16-
from mass_spec_utils.data_import.mzmine import PickedBox
16+
from vimms.mass_spec_utils.data_import.mzmine import PickedBox
1717

1818

1919
class Point:

vimms/ChemicalSamplers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import numpy as np
88
from loguru import logger
9-
from mass_spec_utils.data_import.mzml import MZMLFile
10-
from mass_spec_utils.library_matching.gnps import load_mgf
9+
from vimms.mass_spec_utils.data_import.mzml import MZMLFile
10+
from vimms.mass_spec_utils.library_matching.gnps import load_mgf
1111

1212
from vimms.Chromatograms import FunctionalChromatogram, ConstantChromatogram, EmpiricalChromatogram
1313
from vimms.Common import (

vimms/Common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from loguru import logger
2727
from tqdm.auto import tqdm
2828

29-
from mass_spec_utils.data_import.mzml import MZMLFile
29+
from vimms.mass_spec_utils.data_import.mzml import MZMLFile
3030

3131
###############################################################################
3232
# Common constants

vimms/Controller/targeted.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import csv
44

55
import numpy as np
6-
from mass_spec_utils.adduct_calculator.adduct_rules import AdductTransformer
6+
from vimms.mass_spec_utils.adduct_calculator.adduct_rules import AdductTransformer
77
from molmass import Formula
88

99
from vimms.Common import DEFAULT_ISOLATION_WIDTH, ScanParameters

vimms/DDA_vs_DIA.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import pandas as pd
99
import seaborn as sns
1010
from loguru import logger
11-
from mass_spec_utils.data_import.mzml import MZMLFile
12-
from mass_spec_utils.data_processing.mzmine import pick_peaks
11+
from vimms.mass_spec_utils.data_import.mzml import MZMLFile
12+
from vimms.mass_spec_utils.data_processing.mzmine import pick_peaks
1313

1414
from vimms.Agent import TopNDEWAgent
1515
from vimms.Box import BoxGrid

vimms/DriftCorrection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# import GPy
66

7-
from mass_spec_utils.library_matching.spectral_scoring_functions import cosine_similarity
8-
from mass_spec_utils.library_matching.spectrum import Spectrum
7+
from vimms.mass_spec_utils.library_matching.spectral_scoring_functions import cosine_similarity
8+
from vimms.mass_spec_utils.library_matching.spectrum import Spectrum
99

1010

1111
class DriftModel:

0 commit comments

Comments
 (0)