Param output only if not display

src/AIS/AISParameters.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class AISParameters implements Serializable, Cloneable, ManagedParameters {
@@ -51,7 +52,7 @@ public class AISParameters implements Serializable, Cloneable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("nmeaSource");
 			ps.put(new PrivatePamParameterData(this, field) {

src/AIS/AISPositionReport.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import NMEA.NMEABitArray;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.LatLong;
 
 /**
@@ -160,7 +161,7 @@ sensor.
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/AIS/AISStaticData.java

@@ -6,6 +6,7 @@ import java.util.Calendar;
 import NMEA.NMEABitArray;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamCalendar;
 
 public class AISStaticData extends AISReport implements Serializable, ManagedParameters{
@@ -393,7 +394,7 @@ public class AISStaticData extends AISReport implements Serializable, ManagedPar
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/Acquisition/AcquisitionParameters.java

@@ -10,6 +10,7 @@ import Array.Preamplifier;
 import PamController.PamController;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamguardMVC.PamConstants;
 
@@ -320,7 +321,7 @@ public class AcquisitionParameters implements Serializable, Cloneable, ManagedPa
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("channelList");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Acquisition/DaqStatusModuleHeader.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import binaryFileStorage.BinaryHeader;
 import binaryFileStorage.BinaryObjectData;
@@ -30,7 +31,7 @@ class DaqStatusModuleHeader extends ModuleHeader implements Serializable, Manage
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("daqName");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Acquisition/FileInputParameters.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Used by FileInputSystem
@@ -78,7 +79,7 @@ public class FileInputParameters implements Serializable, Cloneable, ManagedPara
 			return null;
 		}
 
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 }

src/Acquisition/SoundCardParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import simulatedAcquisition.SimProcess;
 
 /**
@@ -47,7 +48,7 @@ public class SoundCardParameters implements Serializable, Cloneable, ManagedPara
 			return null;
 		}
 
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 }

src/Acquisition/filedate/StandardFileDateSettings.java

@@ -6,6 +6,7 @@ import java.util.TimeZone;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import soundtrap.STXMLFile;
 
 public class StandardFileDateSettings implements Serializable, Cloneable, ManagedParameters {
@@ -150,7 +151,7 @@ public class StandardFileDateSettings implements Serializable, Cloneable, Manage
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 }

src/Acquisition/gpstiming/PPSParameters.java

@@ -6,6 +6,7 @@ import Acquisition.AcquisitionControl;
 import Acquisition.AcquisitionDialog;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class PPSParameters implements Cloneable, Serializable, ManagedParameters {
 
@@ -36,7 +37,7 @@ public class PPSParameters implements Cloneable, Serializable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/AirgunDisplay/AirgunParameters.java

@@ -6,6 +6,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.LatLong;
 
@@ -95,7 +96,7 @@ public class AirgunParameters implements Serializable, Cloneable, ManagedParamet
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		try {
 			Field field = this.getClass().getDeclaredField("dimE");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Array/Hydrophone.java

@@ -28,6 +28,7 @@ import java.util.Arrays;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import pamMaths.PamVector;
 import PamView.PamSymbol;
@@ -478,7 +479,7 @@ public class Hydrophone implements Serializable, Cloneable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet pps = PamParameterSet.autoGenerate(this);
+		PamParameterSet pps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		Field f;
 		try {
 			f = this.getClass().getDeclaredField("coordinate");

src/Array/HydrophoneLocator.java

@@ -7,6 +7,7 @@ import Array.streamerOrigin.StreamerDataIterator;
 import GPS.GpsData;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.LatLong;
 import PamguardMVC.PamDataBlock;
@@ -225,7 +226,7 @@ abstract public class HydrophoneLocator implements Serializable, Cloneable, Mana
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("pamArray");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Array/PamArray.java

@@ -35,6 +35,7 @@ import Array.streamerOrigin.StreamerDataIterator;
 import GPS.GpsData;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.LatLong;
 import PamUtils.PamArrayUtils;
@@ -1600,7 +1601,7 @@ public class PamArray implements Serializable, Cloneable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("streamers");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Array/Preamplifier.java

@@ -25,6 +25,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * 
@@ -79,7 +80,7 @@ public class Preamplifier implements Serializable, Cloneable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Array/Streamer.java

@@ -17,6 +17,7 @@ import PamController.PamController;
 import PamController.masterReference.MasterReferencePoint;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.LatLong;
 import PamUtils.PamCalendar;
@@ -767,7 +768,7 @@ public class Streamer implements Serializable, Cloneable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("coordinate");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Array/streamerOrigin/OriginSettings.java

@@ -3,6 +3,7 @@ package Array.streamerOrigin;
 import PamController.SettingsObject;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Class to hold settings for the different origin methods. 
@@ -47,7 +48,7 @@ public abstract class OriginSettings implements SettingsObject, Cloneable, Manag
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/ArrayAccelerometer/ArrayAccelParams.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import mcc.MccJniInterface;
 import mcc.mccjna.MCCConstants;
 
@@ -67,7 +68,7 @@ public class ArrayAccelParams implements Serializable, Cloneable, ManagedParamet
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Azigram/AzigramParameters.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamView.GroupedSourceParameters;
 import PamguardMVC.PamConstants;
@@ -44,7 +45,7 @@ public class AzigramParameters implements Serializable, ManagedParameters, Clone
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("name");
 			ps.put(new PrivatePamParameterData(this, field) {

src/Filters/FilterParameters_2.java

@@ -7,6 +7,7 @@ import org.w3c.dom.Element;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * FilterPArameters for use when the filter is on it's own (within a FilterController)
@@ -39,7 +40,7 @@ public class FilterParameters_2 implements Serializable, Cloneable, ManagedParam
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Filters/FilterParams.java

@@ -30,6 +30,7 @@ import org.w3c.dom.Element;
 import PamController.PamControlledUnit;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.FrequencyFormat;
 
 /**
@@ -358,7 +359,7 @@ public class FilterParams implements Serializable, Cloneable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/GPS/GPSParameters.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class GPSParameters implements Serializable, Cloneable, ManagedParameters {
@@ -175,7 +176,7 @@ public class GPSParameters implements Serializable, Cloneable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("nmeaSource");
 			ps.put(new PrivatePamParameterData(this, field) {

src/IshmaelDetector/IshDetParams.java

@@ -17,6 +17,7 @@ import java.lang.reflect.Field;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamView.GroupedSourceParameters;
 
 public class IshDetParams implements Serializable, Cloneable, ManagedParameters {
@@ -96,7 +97,7 @@ public class IshDetParams implements Serializable, Cloneable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("inputDataSource");
 			ps.put(new PrivatePamParameterData(this, field) {

src/IshmaelDetector/IshDisplayParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Ishamel display parameters for the Spectrogram plug in. 
@@ -42,7 +43,7 @@ public class IshDisplayParams implements Serializable, Cloneable, ManagedParamet
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 	

src/KernelSmoothing/KernelSmoothingParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class KernelSmoothingParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -25,7 +26,7 @@ public class KernelSmoothingParameters implements Serializable, Cloneable, Manag
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Localiser/DelayMeasurementParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import fftFilter.FFTFilterParams;
 
 /**
@@ -157,7 +158,7 @@ public class DelayMeasurementParams implements Serializable, Cloneable, ManagedP
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Localiser/algorithms/genericLocaliser/MCMC/MCMCParams2.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class MCMCParams2 implements Serializable, Cloneable, ManagedParameters  {
 	
@@ -126,7 +127,7 @@ public class MCMCParams2 implements Serializable, Cloneable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Localiser/algorithms/genericLocaliser/MCMC/old/MCMCParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 
 public class MCMCParams implements Serializable, Cloneable, ManagedParameters  {
@@ -64,7 +65,7 @@ public class MCMCParams implements Serializable, Cloneable, ManagedParameters  {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Localiser/algorithms/timeDelayLocalisers/hyperbolic/HyperbolicParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 
 /**
@@ -69,7 +70,7 @@ public class HyperbolicParams implements Serializable, Cloneable, ManagedParamet
 	
 		@Override
 		public PamParameterSet getParameterSet() {
-			PamParameterSet ps = PamParameterSet.autoGenerate(this);
+			PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 			return ps;
 		}
 

src/Localiser/controls/RawOrFFTParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import Spectrogram.WindowFunction;
 
 /**
@@ -104,7 +105,7 @@ public class RawOrFFTParams implements Serializable, Cloneable, RawOrFFTParamsIn
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/Map/MapDetectionsParameters.java

@@ -7,6 +7,7 @@ import java.util.ListIterator;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * PArameters for MapDetectionsManager which 
@@ -65,7 +66,7 @@ public class MapDetectionsParameters implements Serializable, Cloneable, Managed
 		
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/Map/MapParameters.java

@@ -27,6 +27,7 @@ import java.lang.reflect.Field;
 import Array.Hydrophone;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class MapParameters implements Serializable, Cloneable, ManagedParameters {
@@ -301,7 +302,7 @@ public class MapParameters implements Serializable, Cloneable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/Map/gridbaselayer/GridbaseParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class GridbaseParameters implements Cloneable, Serializable, ManagedParameters {
 
@@ -25,7 +26,7 @@ public class GridbaseParameters implements Cloneable, Serializable, ManagedParam
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 	

src/NMEA/NMEAParameters.java

@@ -24,6 +24,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import serialComms.jserialcomm.PJSerialComm;
 
 public class NMEAParameters implements Serializable, Cloneable, ManagedParameters {
@@ -149,7 +150,7 @@ public class NMEAParameters implements Serializable, Cloneable, ManagedParameter
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamController/PamControlledUnitSettings.java

@@ -36,6 +36,7 @@ import org.apache.commons.io.input.ClassLoaderObjectInputStream;
 import PamModel.PamModel;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamView.dialog.warn.WarnOnce;
 
 
@@ -398,7 +399,7 @@ public class PamControlledUnitSettings implements Serializable, ManagedParameter
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamController/UsedModuleInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Very simple class used in an ArrayList of used modules that 
@@ -53,7 +54,7 @@ public class UsedModuleInfo implements Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamController/settings/output/xml/PamguardXMLWriter.java

@@ -43,6 +43,7 @@ import PamController.PamguardVersionInfo;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterData;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamCalendar;
 import PamUtils.XMLUtils;
 import PamguardMVC.PamDataBlock;
@@ -64,6 +65,7 @@ public class PamguardXMLWriter implements PamSettings {
 	private static final Set<Class<?>> WRAPPER_TYPES = getWrapperTypes();
 	
 	private XMLWriterSettings writerSettings = new XMLWriterSettings();
+	private boolean excludeDisplaySettings;
 //	private String xmlNameSpace;
 	
 	private static PamguardXMLWriter singleInstance;
@@ -454,7 +456,6 @@ public class PamguardXMLWriter implements PamSettings {
 	 * @return xml element
 	 */
 	public Element writeUnitSettings(Document doc, Element parent, PamSettings pamSettingsUnit) {
-
 		int[] settingInds = findSettings(null, pamSettingsUnit.getUnitName());
 		PamSettings[] settingsObjects = null;
 		if (settingInds != null) {
@@ -499,6 +500,9 @@ public class PamguardXMLWriter implements PamSettings {
 			Element settingEl = doc.createElement("CONFIGURATION");
 			moduleData.appendChild(settingEl);
 			for (int i = 0; i < toWrite.length; i++) {
+				if (wantObject(toWrite[i]) == false) {
+					continue;
+				}
 				Element setEl = writeSettings(doc, toWrite[i], new ArrayList<Object>());
 				if (setEl != null) {
 					settingEl.appendChild(setEl);
@@ -509,6 +513,32 @@ public class PamguardXMLWriter implements PamSettings {
 		return moduleData;
 	}
 
+	/**
+	 * USed by the Tethys writer to avoid writing display settings. 
+	 * @param pamSettings
+	 * @return
+	 */
+	private boolean wantObject(PamSettings pamSettings) {
+		if (excludeDisplaySettings == false) {
+			return true;
+		}
+		Object obj = pamSettings.getSettingsReference();
+		if (obj == null) {
+			return false;
+		}
+		if (obj instanceof ManagedParameters) {
+			ManagedParameters managedParams = (ManagedParameters) obj;
+			PamParameterSet paramSet = managedParams.getParameterSet();
+			if (paramSet == null) {
+				return false;
+			}
+			if (paramSet.getParameterSetType() == ParameterSetType.DISPLAY && excludeDisplaySettings) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Write settings for a settings object, using the standard retreived object
 	 * from the settings. 
@@ -539,6 +569,7 @@ public class PamguardXMLWriter implements PamSettings {
 	 * @return
 	 */
 	private Element writeSettings(Document doc, PamSettings pamSettings, Object data, ArrayList<Object> objectHierarchy) {
+		
 		Element el = doc.createElement("SETTINGS");
 		el.setAttribute("Type", pamSettings.getUnitType());
 		el.setAttribute("Name", pamSettings.getUnitName());
@@ -850,9 +881,18 @@ public class PamguardXMLWriter implements PamSettings {
 	 * @return indexes of settings. 
 	 */
 	private int[] findSettings(String type, String name) {
+		if (settingsSets == null) {
+			makeSettingsList();
 			if (settingsSets == null) {
 				return null;
 			}
+		}
+		if (usedSettingsSets == null) {
+			usedSettingsSets = new boolean[settingsSets.size()];
+		}
+		else if (usedSettingsSets.length < settingsSets.size()) {
+			usedSettingsSets = Arrays.copyOf(usedSettingsSets, settingsSets.size());
+		}
 		int[] found = new int[settingsSets.size()];
 		int nFound = 0;
 		for (int i = 0; i < settingsSets.size(); i++) {
@@ -871,7 +911,7 @@ public class PamguardXMLWriter implements PamSettings {
 		return Arrays.copyOf(found, nFound);
 	}
 
-	private ArrayList<PamSettings> makeSettingsList() {
+	public ArrayList<PamSettings> makeSettingsList() {
 		PamSettingManager settingsManager = PamSettingManager.getInstance();
 		settingsSets = settingsManager.getOwners();
 		if (settingsSets == null) {
@@ -1001,6 +1041,20 @@ public class PamguardXMLWriter implements PamSettings {
 		return true;
 	}
 
+	/**
+	 * @return the excludeDisplaySettings
+	 */
+	public boolean isExcludeDisplaySettings() {
+		return excludeDisplaySettings;
+	}
+
+	/**
+	 * @param excludeDisplaySettings the excludeDisplaySettings to set
+	 */
+	public void setExcludeDisplaySettings(boolean excludeDisplaySettings) {
+		this.excludeDisplaySettings = excludeDisplaySettings;
+	}
+
 //	public void setStaticNameSpace(String xmlNameSpace) {
 //		this.xmlNameSpace = xmlNameSpace;
 //	}

src/PamController/settings/output/xml/XMLWriterSettings.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class XMLWriterSettings implements Serializable, Cloneable, ManagedParameters {
 
@@ -34,7 +35,7 @@ public class XMLWriterSettings implements Serializable, Cloneable, ManagedParame
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamController/soundMedium/GlobalMediumParams.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import PamController.soundMedium.GlobalMedium.SoundMedium;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Stores parameters for the current medium. 
@@ -41,7 +42,7 @@ public class GlobalMediumParams implements Serializable, Cloneable, ManagedParam
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamModel/PamModelSettings.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class PamModelSettings implements Cloneable, Serializable, ManagedParameters {
 
@@ -74,7 +75,7 @@ public class PamModelSettings implements Cloneable, Serializable, ManagedParamet
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamModel/parametermanager/PamParameterSet.java

@@ -29,6 +29,9 @@ public class PamParameterSet {
 	
 	private static boolean printDebug = false;
 	
+	public enum ParameterSetType {DETECTOR, DISPLAY};
+	
+	private ParameterSetType parameterSetType;
 	/**
 	 * Standard modifiers to exclude. This is important for many classes which will tend to 
 	 * do crazy things such as incorporate ALL of their final fields, e.g. when a Color 
@@ -55,8 +58,10 @@ public class PamParameterSet {
 	 * in the STANDARD_MODIFIER_EXCLUSIONS list (FINAL or STATIC).
 	 * @return Created parameter set. 
 	 */
-	public static PamParameterSet autoGenerate(Object parentObject) {
-		return autoGenerate(parentObject, STANDARD_MODIFIER_EXCLUSIONS);
+	public static PamParameterSet autoGenerate(Object parentObject, ParameterSetType parameterSetType) {
+		PamParameterSet paramSet = autoGenerate(parentObject, STANDARD_MODIFIER_EXCLUSIONS);
+		paramSet.setParameterSetType(parameterSetType);
+		return paramSet;
 	}
 	
 	/**
@@ -287,4 +292,18 @@ public class PamParameterSet {
 		return parameterDatas.remove(paramName);
 	}
 
+	/**
+	 * @return the parameterSetType
+	 */
+	public ParameterSetType getParameterSetType() {
+		return parameterSetType;
+	}
+
+	/**
+	 * @param parameterSetType the parameterSetType to set
+	 */
+	public void setParameterSetType(ParameterSetType parameterSetType) {
+		this.parameterSetType = parameterSetType;
+	}
+
 }

src/PamUtils/Coordinate3d.java

@@ -26,6 +26,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Class definition for a x,y coordinate number type.
@@ -168,7 +169,7 @@ public class Coordinate3d implements Serializable , Cloneable, PamCoordinate, Ma
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamUtils/LatLong.java

@@ -15,6 +15,7 @@ import java.text.NumberFormat;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamguardMVC.PamConstants;
 import net.sf.geographiclib.Geodesic;
 import net.sf.geographiclib.PolygonArea;
@@ -833,7 +834,7 @@ public class LatLong implements Serializable, Cloneable, Transferable, PamCoordi
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-	PamParameterSet ps = PamParameterSet.autoGenerate(this);
+	PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 	try {
 		Field field = this.getClass().getDeclaredField("height");
 		ps.put(new PrivatePamParameterData(this, field) {

src/PamUtils/time/GlobalTimeParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class GlobalTimeParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -91,7 +92,7 @@ public class GlobalTimeParameters implements Serializable, Cloneable, ManagedPar
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamUtils/time/TimeDisplayParameters.java

@@ -5,6 +5,7 @@ import java.util.TimeZone;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class TimeDisplayParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -34,7 +35,7 @@ public class TimeDisplayParameters implements Serializable, Cloneable, ManagedPa
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamUtils/time/nmea/NMEATimeParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class NMEATimeParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -26,7 +27,7 @@ public class NMEATimeParameters implements Serializable, Cloneable, ManagedParam
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamUtils/time/ntp/NTPTimeParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class NTPTimeParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -32,7 +33,7 @@ public class NTPTimeParameters implements Serializable, Cloneable, ManagedParame
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamView/ColourArray.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * A series of functions for creating arrays of colours
@@ -410,7 +411,7 @@ public class ColourArray implements Cloneable, Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamView/GroupedSourceParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamUtils;
 import PamView.dialog.GroupedSourcePanel;
 
@@ -210,7 +211,7 @@ public class GroupedSourceParameters implements Serializable, Cloneable, Managed
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/PamView/GuiFrameSettings.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import PamController.PamControlledUnit;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 /**
@@ -55,7 +56,7 @@ public class GuiFrameSettings implements Serializable, Cloneable, ManagedParamet
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		try {
 			Field field = this.getClass().getDeclaredField("unitFrameInfo");
 			ps.put(new PrivatePamParameterData(this, field) {
@@ -89,7 +90,7 @@ public class GuiFrameSettings implements Serializable, Cloneable, ManagedParamet
 		
 		@Override
 		public PamParameterSet getParameterSet() {
-			PamParameterSet ps = PamParameterSet.autoGenerate(this);
+			PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 			try {
 				Field field = this.getClass().getDeclaredField("guiFrame");
 				ps.put(new PrivatePamParameterData(this, field) {

src/PamView/PamSymbol.java

@@ -38,6 +38,7 @@ import javax.swing.JPanel;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamView.PamColors.PamColor;
 import PamView.symbol.SymbolData;
 
@@ -808,7 +809,7 @@ public class PamSymbol extends PamSymbolBase implements Serializable, Icon, Clon
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamView/paneloverlay/OverlayDataInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class OverlayDataInfo implements Serializable, Cloneable, ManagedParameters {
 	
@@ -31,7 +32,7 @@ public class OverlayDataInfo implements Serializable, Cloneable, ManagedParamete
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamView/paneloverlay/overlaymark/MarkDataSelectorParams.java

@@ -6,6 +6,7 @@ import java.util.Hashtable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamguardMVC.PamDataBlock;
 
@@ -73,7 +74,7 @@ public class MarkDataSelectorParams implements Serializable, Cloneable, ManagedP
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		try {
 			Field field = this.getClass().getDeclaredField("overlayChoices");
 			ps.put(new PrivatePamParameterData(this, field) {

src/PamView/symbol/ManagedSymbolData.java

@@ -3,7 +3,11 @@ package PamView.symbol;
 import java.io.Serializable;
 import java.util.Hashtable;
 
-public class ManagedSymbolData implements Cloneable, Serializable {
+import PamModel.parametermanager.ManagedParameters;
+import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
+
+public class ManagedSymbolData implements Cloneable, Serializable, ManagedParameters {
 
 	public static final long serialVersionUID = 1L;
 	
@@ -34,5 +38,10 @@ public class ManagedSymbolData implements Cloneable, Serializable {
 		return symbolOptions;
 	}
 
+	@Override
+	public PamParameterSet getParameterSet() {
+		return PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
+	}
+
 	
 }

src/PamguardMVC/RawDataDisplayOptions.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class RawDataDisplayOptions implements Serializable, Cloneable, ManagedParameters {
 
@@ -13,7 +14,7 @@ public class RawDataDisplayOptions implements Serializable, Cloneable, ManagedPa
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/PamguardMVC/blockprocess/PamBlockParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import gpl.GPLParameters;
 
 /**
@@ -44,7 +45,7 @@ public class PamBlockParams implements Cloneable, Serializable, ManagedParameter
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 	

src/PamguardMVC/dataSelector/DataSelectParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Data select parameters. 
@@ -53,7 +54,7 @@ abstract public class DataSelectParams implements Serializable, ManagedParameter
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 	

src/PamguardMVC/dataSelector/DataSelectorSettings.java

@@ -7,6 +7,7 @@ import java.util.Hashtable;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class DataSelectorSettings implements Serializable, ManagedParameters {
 
@@ -42,7 +43,7 @@ public class DataSelectorSettings implements Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("selectorParams");
 			ps.put(new PrivatePamParameterData(this, field) {

src/PamguardMVC/datakeeper/DataKeeperSettings.java

@@ -7,6 +7,7 @@ import java.util.Hashtable;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class DataKeeperSettings implements Serializable, Cloneable, ManagedParameters {
 
@@ -51,7 +52,7 @@ public class DataKeeperSettings implements Serializable, Cloneable, ManagedParam
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("keepTimeData");
 			ps.put(new PrivatePamParameterData(this, field) {

src/PamguardMVC/toad/GenericTOADSourceParams.java

@@ -6,6 +6,7 @@ import Localiser.DelayMeasurementParams;
 import Localiser.controls.RawOrFFTParams;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * General parameters for detection TOAD measurement. Is split 
@@ -67,7 +68,7 @@ public class GenericTOADSourceParams implements Cloneable, Serializable, Managed
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/RightWhaleEdgeDetector/RWEParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class RWEParameters implements Serializable, Cloneable, ManagedParameters {
 
@@ -41,7 +42,7 @@ public class RWEParameters implements Serializable, Cloneable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/SoundRecorder/RecorderSettings.java

@@ -16,6 +16,7 @@ import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterData;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamUtils;
 import PamguardMVC.PamRawDataBlock;
 import SoundRecorder.trigger.RecorderTrigger;
@@ -443,7 +444,7 @@ public class RecorderSettings implements Serializable, Cloneable, ManagedParamet
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("channelBitmap");
 			ps.put(new PrivatePamParameterData(this, field) {

src/SoundRecorder/trigger/RecorderTriggerData.java

@@ -6,6 +6,7 @@ import java.lang.reflect.Field;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Information for triggered recordings to tell each recorder how long
@@ -271,7 +272,7 @@ public class RecorderTriggerData implements Serializable, Cloneable, ManagedPara
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("lastTriggerStart");
 			ps.put(new PrivatePamParameterData(this, field) {

src/alarm/AlarmParameters.java

@@ -6,6 +6,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class AlarmParameters implements Serializable, Cloneable, ManagedParameters {
@@ -103,7 +104,7 @@ public class AlarmParameters implements Serializable, Cloneable, ManagedParamete
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		try {
 			Field field = this.getClass().getDeclaredField("hadHold");
 			ps.put(new PrivatePamParameterData(this, field) {

src/alarm/actions/email/SendEmailSettings.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import alarm.actions.serial.AlarmSerialSettings;
 
 /**
@@ -158,7 +159,7 @@ public class SendEmailSettings implements Serializable, Cloneable, ManagedParame
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/alarm/actions/serial/AlarmSerialSettings.java

@@ -8,6 +8,7 @@ import com.fazecast.jSerialComm.SerialPort;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import serialComms.SerialPortConstants;
 import serialComms.jserialcomm.PJSerialComm;
 
@@ -68,7 +69,7 @@ public class AlarmSerialSettings  implements Serializable, Cloneable, ManagedPar
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/alarm/actions/sound/PlaySoundParams.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import alarm.AlarmParameters;
 
 public class PlaySoundParams implements Cloneable, Serializable, ManagedParameters {
@@ -33,7 +34,7 @@ public class PlaySoundParams implements Cloneable, Serializable, ManagedParamete
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 	

src/alarm/actions/udp/AlarmUDPParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class AlarmUDPParams implements Serializable, Cloneable, ManagedParameters {
 
@@ -25,7 +26,7 @@ public class AlarmUDPParams implements Serializable, Cloneable, ManagedParameter
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/amplifier/AmpParameters.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamguardMVC.PamConstants;
 
@@ -41,7 +42,7 @@ public class AmpParameters implements Cloneable, Serializable, ManagedParameters
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("rawDataSource");
 			ps.put(new PrivatePamParameterData(this, field) {

src/analogarraysensor/ArraySensorParams.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import Array.sensors.ArrayDisplayParameters;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class ArraySensorParams implements Serializable, Cloneable, ManagedParameters {
 
@@ -47,7 +48,7 @@ public class ArraySensorParams implements Serializable, Cloneable, ManagedParame
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/analoginput/AnalogDeviceParams.java

@@ -6,6 +6,7 @@ import java.util.Hashtable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import analoginput.calibration.CalibrationData;
 
@@ -63,7 +64,7 @@ public class AnalogDeviceParams implements Serializable, Cloneable, ManagedParam
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("calibrationTable");
 			ps.put(new PrivatePamParameterData(this, field) {

src/analoginput/AnalogInputParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class AnalogInputParams implements Serializable, Cloneable, ManagedParameters {
 	
@@ -13,7 +14,7 @@ public class AnalogInputParams implements Serializable, Cloneable, ManagedParame
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/analoginput/AnalogRangeData.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class AnalogRangeData implements Serializable, Cloneable, Comparable<AnalogRangeData>, ManagedParameters {
 
@@ -119,7 +120,7 @@ public class AnalogRangeData implements Serializable, Cloneable, Comparable<Anal
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/analoginput/brainboxes/BrainBoxParams.java

@@ -5,6 +5,7 @@ import java.util.Hashtable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import analoginput.AnalogDeviceParams;
 import analoginput.AnalogRangeData;
 
@@ -36,7 +37,7 @@ public class BrainBoxParams implements Serializable, Cloneable, ManagedParameter
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/analoginput/calibration/CalibrationData.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Really simple calibration data class - may change at later date to 
@@ -37,7 +38,7 @@ public class CalibrationData implements Serializable, Cloneable, ManagedParamete
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/analoginput/measurementcomputing/MCCParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import analoginput.AnalogDeviceParams;
 
 public class MCCParameters implements Serializable, Cloneable, ManagedParameters {
@@ -36,7 +37,7 @@ public class MCCParameters implements Serializable, Cloneable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/angleMeasurement/AngleLoggingParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class AngleLoggingParameters extends Object implements Cloneable,
 		Serializable, ManagedParameters {
@@ -34,7 +35,7 @@ public class AngleLoggingParameters extends Object implements Cloneable,
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/angleMeasurement/AngleParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class AngleParameters extends Object implements Serializable, Cloneable, ManagedParameters {
 	
@@ -103,7 +104,7 @@ public class AngleParameters extends Object implements Serializable, Cloneable,
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/angleVetoes/AngleVeto.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Data for a single angle veto. Note that the channel
@@ -73,7 +74,7 @@ public class AngleVeto implements Serializable, Cloneable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/angleVetoes/AngleVetoParameters.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 /**
@@ -100,7 +101,7 @@ public class AngleVetoParameters implements Serializable, Cloneable, ManagedPara
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("vetoList");
 			ps.put(new PrivatePamParameterData(this, field) {

src/annotation/calcs/snr/SNRAnnotationParameters.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class SNRAnnotationParameters implements Cloneable, Serializable, ManagedParameters {
 
@@ -33,7 +34,7 @@ public class SNRAnnotationParameters implements Cloneable, Serializable, Managed
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/annotation/handler/AnnotationChoices.java

@@ -8,6 +8,7 @@ import java.util.Iterator;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 /**
@@ -78,7 +79,7 @@ public class AnnotationChoices implements Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("annotationOptions");
 			ps.put(new PrivatePamParameterData(this, field) {

src/annotation/handler/AnnotationOptions.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Annotation options. Does nothing but used as a base 
@@ -61,7 +62,7 @@ public class AnnotationOptions implements Serializable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/annotationMark/spectrogram/SpectrogramMarkParams.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import annotation.DataAnnotationType;
 import annotation.handler.AnnotationChoices;
 
@@ -31,7 +32,7 @@ public class SpectrogramMarkParams implements Serializable, ManagedParameters {
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
 		return ps;
 	}
 

src/backupmanager/FileLocation.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Information on a file path or folder path that can be used with the 
@@ -42,7 +43,7 @@ public class FileLocation implements Serializable, Cloneable, ManagedParameters
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 	

src/backupmanager/settings/BackupSettings.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public abstract class BackupSettings implements Serializable, Cloneable, ManagedParameters {
 
@@ -40,7 +41,7 @@ public abstract class BackupSettings implements Serializable, Cloneable, Managed
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/beamformer/BeamAlgorithmParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import beamformer.algorithms.basicFreqDomain.BasicFreqDomParams;
 
 /*
@@ -336,7 +337,7 @@ public abstract class BeamAlgorithmParams implements Serializable, Cloneable, Ma
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/beamformer/BeamFormerParams.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.DeepCloner;
 import PamView.GroupedSourceParameters;
@@ -325,7 +326,7 @@ public class BeamFormerParams implements Cloneable, Serializable, ManagedParamet
 	 */
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("algorithmParamsTable");
 			ps.put(new PrivatePamParameterData(this, field) {

src/bearinglocaliser/BearingLocaliserParams.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import Localiser.controls.RawOrFFTParamsInterface;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamView.GroupedSourceParameters;
 import bearinglocaliser.algorithms.BearingAlgorithmParams;
@@ -188,7 +189,7 @@ public class BearingLocaliserParams implements Serializable, Cloneable, RawOrFFT
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("algorithmParamsTable");
 			ps.put(new PrivatePamParameterData(this, field) {

src/bearinglocaliser/algorithms/BearingAlgorithmParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class BearingAlgorithmParams implements Serializable, Cloneable, ManagedParameters {
 
@@ -60,7 +61,7 @@ public class BearingAlgorithmParams implements Serializable, Cloneable, ManagedP
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/binaryFileStorage/BinaryFooter.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamCalendar;
 
 public class BinaryFooter implements Serializable, ManagedParameters {
@@ -230,7 +231,7 @@ public class BinaryFooter implements Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/binaryFileStorage/BinaryHeader.java

@@ -9,6 +9,7 @@ import java.lang.reflect.Field;
 import PamController.PamguardVersionInfo;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamUtils.PamCalendar;
 
@@ -289,7 +290,7 @@ public class BinaryHeader implements Serializable, ManagedParameters {
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("pamguard");
 			ps.put(new PrivatePamParameterData(this, field) {

src/binaryFileStorage/BinaryStoreSettings.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import PamController.PamFolders;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class BinaryStoreSettings implements Serializable, Cloneable, ManagedParameters {
 	
@@ -90,7 +91,7 @@ public class BinaryStoreSettings implements Serializable, Cloneable, ManagedPara
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/cepstrum/CepstrumParams.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 public class CepstrumParams implements Serializable, Cloneable, ManagedParameters {
 
@@ -25,7 +26,7 @@ public class CepstrumParams implements Serializable, Cloneable, ManagedParameter
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 }

src/clickDetector/BTDisplayParameters.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import clickDetector.tdPlots.ClickSymbolOptions;
 
@@ -137,7 +138,7 @@ public class BTDisplayParameters implements Serializable, Cloneable, ManagedPara
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("showSpeciesList");
 			ps.put(new PrivatePamParameterData(this, field) {

src/clickDetector/BasicClickIdParameters.java

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 
 
@@ -83,7 +84,7 @@ public class BasicClickIdParameters implements Serializable, Cloneable, ManagedP
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/clickDetector/ClickAlarm.java

@@ -33,6 +33,7 @@ import javax.sound.sampled.Clip;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 /**
@@ -209,7 +210,7 @@ public class ClickAlarm implements Comparable<ClickAlarm>, Serializable, Cloneab
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("fileIsLoaded");
 			ps.put(new PrivatePamParameterData(this, field) {

src/clickDetector/ClickBinaryModuleFooter.java

@@ -12,6 +12,7 @@ import PamController.PamController;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
 import PamModel.parametermanager.PrivatePamParameterData;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import binaryFileStorage.BinaryHeader;
 import binaryFileStorage.BinaryObjectData;
 import binaryFileStorage.ModuleFooter;
@@ -128,7 +129,7 @@ public class ClickBinaryModuleFooter extends ModuleFooter implements ManagedPara
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("clickDetectorName");
 			ps.put(new PrivatePamParameterData(this, field) {

src/clickDetector/ClickBinaryModuleHeader.java

@@ -2,6 +2,7 @@ package clickDetector;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import binaryFileStorage.BinaryHeader;
 import binaryFileStorage.BinaryObjectData;
 import binaryFileStorage.ModuleHeader;
@@ -28,7 +29,7 @@ public class ClickBinaryModuleHeader extends ModuleHeader implements ManagedPara
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 }

src/clickDetector/ClickClassifiers/ClickTypeCommonParams.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 
 /**
  * Superclass for click parameters, including the ClickTypeParms and
@@ -191,7 +192,7 @@ abstract public class ClickTypeCommonParams implements Cloneable, Serializable,
 	
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		return ps;
 	}
 

src/clickDetector/ClickClassifiers/basicSweep/SweepClassifierParameters.java

@@ -7,6 +7,7 @@ import java.util.Vector;
 import PamModel.SMRUEnable;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class SweepClassifierParameters implements Serializable, Cloneable, ManagedParameters {
@@ -72,7 +73,7 @@ public class SweepClassifierParameters implements Serializable, Cloneable, Manag
 
 	@Override
 	public PamParameterSet getParameterSet() {
-		PamParameterSet ps = PamParameterSet.autoGenerate(this);
+		PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
 		try {
 			Field field = this.getClass().getDeclaredField("classifierSets");
 			ps.put(new PrivatePamParameterData(this, field) {