Merge branch 'restart' of https://github.com/douggillespie/PAMGuard into restart

src/Map/MapRectProjector.java

@@ -404,7 +404,7 @@ public class MapRectProjector extends MapProjector {
 
 	private String findGpsTrackText(Point mousePoint, int ploNumberMatch) {
 		GPSControl gpsControl = GPSControl.getGpsControl();
-		if (gpsControl == null) {
+		if (gpsControl == null || mousePoint == null) {
 			return null;
 		}
 		LatLong currentPos = getDataPosition(new Coordinate3d(mousePoint.x, mousePoint.y));

src/PamController/PamController.java

@@ -1382,7 +1382,7 @@ public class PamController implements PamControllerInterface, PamSettings {
 	 * @param sayEmpties dump info even if a buffer is empty (otherwise, only ones that have stuff still)
 	 */
 	public void dumpBufferStatus(String message, boolean sayEmpties) {
-		if (2 >1) return;
+		//if (2 >1) return;
 		System.out.println("**** Dumping process buffer status: " + message);
 		ArrayList<PamControlledUnit> pamControlledUnits = pamConfiguration.getPamControlledUnits();
 		for (PamControlledUnit aUnit : pamControlledUnits) {

src/PamController/PamguardVersionInfo.java

@@ -16,7 +16,7 @@ public class PamguardVersionInfo {
 	 * @return release type 
 	 */
 	static public ReleaseType getReleaseType() {
-		return ReleaseType.CORE; 
+		return ReleaseType.OTHER; 
 	}
 	
 	/**

src/clickTrainDetector/clickTrainAlgorithms/mht/MHTClickTrainAlgorithm.java

@@ -45,6 +45,7 @@ public class MHTClickTrainAlgorithm implements ClickTrainAlgorithm, PamSettings
 	
 	public static final String MHT_NAME = "MHT detector"; 
 	
+	
 	/**
 	 * Reference to the click train control. 
 	 */
@@ -354,6 +355,7 @@ public class MHTClickTrainAlgorithm implements ClickTrainAlgorithm, PamSettings
 		TrackBitSet trackBitSet;
 		TrackDataUnits trackUnits;
 		if (nTracks>0) Debug.out.println("-------------------Grab Done Trains---------------");
+		try {
 		for (int i =0; i<nTracks; i++) {
 			trackBitSet=mhtKernal.getConfirmedTrack(i);
 			Debug.out.println("MHTAlgorithm: Confirmed Track Grab: No. " + MHTKernel.getTrueBitCount(trackBitSet.trackBitSet)  + " flag: " + trackBitSet.flag + "  chi2: " +trackBitSet.chi2Track.getChi2()); 
@@ -379,6 +381,10 @@ public class MHTClickTrainAlgorithm implements ClickTrainAlgorithm, PamSettings
 			trackCount++;
 			saveClickTrain(trackUnits, trackBitSet.chi2Track.getMHTChi2Info());
 		}
+		}
+		catch (Exception e) {
+			System.out.printf("Handled MHTClickTrainAlgorithm Exception %s in grabDoneTrains: %s\n", e.getClass().getSimpleName(), e.getMessage());
+		}
 		
 		if (nTracks>0) Debug.out.println("-------------------------------------------------");
 

src/clickTrainDetector/clickTrainAlgorithms/mht/MHTKernel.java

@@ -3,6 +3,7 @@ package clickTrainDetector.clickTrainAlgorithms.mht;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collections;
+import java.util.Comparator;
 
 import PamUtils.PamArrayUtils;
 import PamguardMVC.debug.Debug;
@@ -286,6 +287,7 @@ public class MHTKernel<T> {
 			MHTChi2<T> mhtChi2;
 			int index; 
 			synchronized(trackSynchronisation) {
+				try {
 				for (int i=0; i<possibleTracks.size(); i++) {
 
 					currentBitSet=possibleTracks.get(i).trackBitSet;
@@ -314,6 +316,10 @@ public class MHTKernel<T> {
 					newPossibilities.add(new TrackBitSet(currentBitSet, mhtChi2)); 
 				}
 				}
+				catch (Exception e) {
+					System.out.printf("*******  MHTKernel Exception %s in growProbMatrix: %s\n", e.getClass().getSimpleName(), e.getMessage());
+				}
+			}
 		}
 
 		long time2 = System.currentTimeMillis(); 
@@ -348,10 +354,21 @@ public class MHTKernel<T> {
 			//first sort the tracks by increasing chi2 values. 
 			//sort the possible tracks by chi2 values
 			//now sort the chi2 values so they correspond to the track list.  
-			Collections.sort(newPossibleTracks, (left, right)->{
-				//Note- this is definitely in the correct order
+//			Collections.sort(newPossibleTracks, (left, right)->{
+//				//Note- this is definitely in the correct order
+//				return Double.compare(left.chi2Track.getChi2(), right.chi2Track.getChi2());
+//			});		
+			try {
+			Collections.sort(newPossibleTracks, new Comparator<TrackBitSet>() {
+				@Override
+				public int compare(TrackBitSet left, TrackBitSet right) {
 					return Double.compare(left.chi2Track.getChi2(), right.chi2Track.getChi2());
+				}
 			});
+			}
+			catch (Exception e) {
+				System.out.printf("Handled  MHTKernel Exception %s in pruneProbMatrix: %s\n", e.getClass().getSimpleName(), e.getMessage());
+			}
 
 			//			for (int i=0; i<newPossibleTracks.size(); i++) {
 			//				System.out.print("Possibility chi2: " + i +  "  " + String.format("%.3f", newPossibleTracks.get(i).chi2Track.getChi2()));