V1.7.2 merge

V1.7.2
Rappsilber-Laboratory · Feb 25, 2020 · 62dc0e8 · 62dc0e8
2 parents d93058d + 2bd6044
commit 62dc0e8
Show file tree

Hide file tree

Showing 47 changed files with 1,233 additions and 313 deletions.
diff --git a/nbactions.xml b/nbactions.xml
@@ -10,7 +10,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-Xmx4g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
+                <exec.args>-Xmx7g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
@@ -24,7 +24,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -Xmx4g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
+                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -Xmx7g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
                 <exec.executable>java</exec.executable>
                 <jpda.listen>true</jpda.listen>
             </properties>
@@ -39,7 +39,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-Xmx4g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
+                <exec.args>-Xmx7g  -ea -classpath %classpath rappsilber.gui.SimpleXiGui</exec.args>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>rappsilber</groupId>
     <artifactId>xiSEARCH</artifactId>
-    <version>1.7.1</version>
+    <version>1.7.2</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

diff --git a/src/main/java/rappsilber/applications/MultipleTargetModification.java b/src/main/java/rappsilber/applications/MultipleTargetModification.java
@@ -317,7 +317,7 @@ public void process(SpectraAccess input, ResultWriter output, AtomicBoolean thre
 
                             double mgcShiftedDelta =  0;//mgcScore - topShiftedCrosslinkedScoreMGCScore;
 
-                            evaluateMatch(spectra, ap, bp, cl, betaCount, scanMatches, mgcScore, mgcDelta, mgcShiftedDelta, alphaMGC, betaMGC, mgxScore, mgxDelta, mgxID,0, false);
+                            evaluateMatch(spectra, ap, bp, cl, 0, 0, betaCount, scanMatches, mgcScore, mgcDelta, mgcShiftedDelta, alphaMGC, betaMGC, mgxScore, mgxDelta, mgxID,0, false);
                         }
                     }
                     spectra.free();