Merge pull request #110 from MannLabs/development

Development
MannLabs · Sep 8, 2023 · a024f05 · a024f05
2 parents 525529a + 6ed2b85
commit a024f05
Show file tree

Hide file tree

Showing 40 changed files with 17,776 additions and 116 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.3
+current_version = 1.1.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/alphabase/__init__.py b/alphabase/__init__.py
@@ -2,7 +2,7 @@
 
 
 __project__ = "alphabase"
-__version__ = "1.0.3"
+__version__ = "1.1.0"
 __license__ = "Apache"
 __description__ = "An infrastructure Python package of the AlphaX ecosystem"
 __author__ = "Mann Labs"

diff --git a/alphabase/_modidx.py b/alphabase/_modidx.py
diff --git a/alphabase/constants/const_files/psm_reader.yaml b/alphabase/constants/const_files/psm_reader.yaml
@@ -132,6 +132,8 @@ diann:
     'sequence': 'Stripped.Sequence'
     'charge': 'Precursor.Charge'
     'rt': 'RT'
+    'rt_start': 'RT.Start'
+    'rt_stop': 'RT.Stop'
     'ccs': 'CCS'
     'mobility': ['IM','IonMobility']
     'proteins': 'Protein.Names'
@@ -147,7 +149,7 @@ spectronaut_report:
   fixed_C57: False
   column_mapping:
     'raw_name': 'R.FileName'
-    'rt': 'EG.ApexRT'
+    'rt': ['EG.ApexRT','EG.MeanApexRT']
     'proteins': ['PG.ProteinNames','PG.ProteinGroups']
     'genes': 'PG.Genes'
     'uniprot_ids': 'PG.UniProtIds'