Commit c3329b72 authored by Mathieu Courcelles's avatar Mathieu Courcelles

Merge branch 'dev' into 'master'

Dev

See merge request !21
parents 72fc92b0 0847a17d
Pipeline #15340077 passed with stages
in 1 minute and 39 seconds
No preview for this file type
# -*- coding: utf-8 -*-
# Generated by Django 1.11.8 on 2017-12-20 14:03
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('CLMSVault_app', '0017_auto_20171211_0931'),
]
operations = [
migrations.AlterField(
model_name='clpeptide',
name='cross_link',
field=models.BooleanField(default=False, verbose_name='Cross-link'),
),
]
......@@ -439,7 +439,7 @@ class CLPeptide(AdminURLMixin, models.Model):
link_type = models.CharField(max_length=50, choices=LINK_TYPE_CHOICES)
cross_link = models.BooleanField('Inter-peptide cross-link', default=False)
cross_link = models.BooleanField('Cross-link', default=False)
not_decoy = models.BooleanField(default=False)
......
......@@ -126,11 +126,13 @@ class KojakParser:
fields['delta'] = row['dScore']
fields['error'] = row['PPM Error']
row['Peptide #1'] = row['Peptide #1'].replace('-15N', '')
fields['peptide1'] = row['Peptide #1']
fields['peptide_wo_mod1'] = re.sub('(\[.+?\])', '', row['Peptide #1'])
fields['peptide_position1'] = -1
row['Peptide #2'] = row['Peptide #2'].replace('-15N', '')
fields['peptide2'] = row['Peptide #2']
fields['peptide_wo_mod2'] = re.sub('(\[.+?\])', '', row['Peptide #2'])
fields['peptide_position2'] = -1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment