Skip to content

Commit 3765890

Browse files
committed
Fix a bug parsing the wrong mass-offset list (detailed vs non-detailed).
1 parent 3310874 commit 3765890

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

MSFragger-GUI/src/com/dmtavt/fragpipe/tools/skyline/WriteSkyMods.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public WriteSkyMods(Path path, PropsFile pf, int modsMode, boolean matchUnimod,
7979
String massOffsetSites = pf.getProperty("msfragger.restrict_deltamass_to");
8080
String massOffsetRemainders = pf.getProperty("msfragger.remainder_fragment_masses");
8181
String detailedMassOffsetStr = pf.getProperty("msfragger.mass_offsets_detailed");
82+
boolean useDetailedMassOffsets = pf.containsKey("msfragger.use_detailed_offsets") && Boolean.parseBoolean(pf.getProperty("msfragger.use_detailed_offsets"));
8283
String labileMode = pf.getProperty("msfragger.labile_search_mode");
8384
boolean isLabile = labileMode.equals("labile") || labileMode.equals("nglycan");
8485
boolean isOglyco = modsMode == 1;
@@ -126,7 +127,7 @@ public WriteSkyMods(Path path, PropsFile pf, int modsMode, boolean matchUnimod,
126127
generateGlycoMods(massOffsetSites, nglycoList, (float) 203.07937, new ElementalComposition("C8H13N1O5"), false, unimodMods, nonUnimodMods); // hardcoded N-glycan remainder
127128
} else {
128129
// non-glyco - use regular method for mass offsets conversion
129-
if (massOffsetStr != null && !massOffsetStr.isEmpty()) {
130+
if (!useDetailedMassOffsets && massOffsetStr != null && !massOffsetStr.isEmpty()) {
130131
String[] ss = massOffsetStr.split("[\\s/]");
131132
for (String s : ss) {
132133
mass = Float.parseFloat(s);
@@ -150,7 +151,7 @@ public WriteSkyMods(Path path, PropsFile pf, int modsMode, boolean matchUnimod,
150151
}
151152
}
152153

153-
if (detailedMassOffsetStr != null && !detailedMassOffsetStr.isEmpty()) {
154+
if (useDetailedMassOffsets && detailedMassOffsetStr != null && !detailedMassOffsetStr.isEmpty()) {
154155
m = p3.matcher(detailedMassOffsetStr);
155156
while(m.find()) {
156157
mass = Float.parseFloat(m.group(1));

0 commit comments

Comments
 (0)