Changeset 35


Ignore:
Timestamp:
Aug 11, 2010, 4:07:29 PM (10 years ago)
Author:
j@…
bzr:base-revision:
j@dannynavarro.net-20100809093152-nh07pvvlrde4qyac
bzr:committer:
Danny Navarro <j@dannynavarro.net>
bzr:file-ids:

mzcms/parsers.py parsers.py-20100806092910-g1sxvv1o5b9umkof-1
bzr:mapping-version:
v4
bzr:repository-uuid:
724254b2-fbe6-419d-9466-c04ef4c9d29d
bzr:revision-id:
j@dannynavarro.net-20100809093614-khwr3ax29z5bvx1p
bzr:revno:
35
bzr:revprop:branch-nick:
trunk
bzr:root:
trunk
bzr:timestamp:
2010-08-09 11:36:14.976000071 +0200
bzr:user-agent:
bzr2.1.2+bzr-svn1.0.3
svn:original-date:
2010-08-09T09:36:14.976000Z
Message:

Renamed annotations to psms in parsers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mzcms/parsers.py

    r33 r35  
    148148        frag_mode = self._parse_frag_mode(dat_file)
    149149        nativeid_psms = self._parse_psms(dat_file)
    150         nativeid_spectra = self._parse_spectra(datfile)
    151         for native_id, annotations in nativeid_annotations.items():
    152             for annotation in annotations:
    153                 annotation['#SpectraFile'] = pkl_fn
    154                 annotation['FragMode'] = frag_mode
    155                 annotation.update(nativeid_spectra[native_id])
    156                 yield annotation
     150        nativeid_spectra = self._parse_spectra(dat_file)
     151        for native_id, psms in nativeid_psms.items():
     152            for psm in psms:
     153                psm['#SpectraFile'] = pkl_fn
     154                psm['FragMode'] = frag_mode
     155                psm.update(nativeid_spectra[native_id])
     156                yield psm
    157157
    158158def apply_mods(peptide_str, mod_str):
Note: See TracChangeset for help on using the changeset viewer.