remove interest-ppint based processing

Author: StephanPreibisch

src/main/java/net/preibisch/stitcher/algorithm/globalopt/ExecuteGlobalOpt.java

@@ -76,8 +76,7 @@ public void run()
 			}
 
 			final boolean isSavedFaG = savedFiltering != null;
-			final boolean preAlign = false; // no pre-align for ICP
-			final GlobalOptimizationParameters params = expertMode ? GlobalOptimizationParameters.askUserForParameters(!isSavedFaG, preAlign) : GlobalOptimizationParameters.askUserForSimpleParameters();
+			final GlobalOptimizationParameters params = GlobalOptimizationParameters.askUserForSimpleParameters();
 			if ( params == null )
 				return;
 

src/main/java/net/preibisch/stitcher/gui/popup/CalculatePCPopupExpertBatch.java

@@ -31,10 +31,10 @@
 public class CalculatePCPopupExpertBatch extends JMenu implements ExplorerWindowSetable
 {
 
+	private static final long serialVersionUID = 804355154792175254L;
 	final CalculatePCPopup phaseCorrSimple;
 	final CalculatePCPopup phaseCorr;
 	final CalculatePCPopup lucasKanade;
-	final PairwiseInterestPointRegistrationPopup interestPoint;
 	boolean wizardMode;
 
 	public CalculatePCPopupExpertBatch( String description, boolean wizardMode )
@@ -50,13 +50,11 @@ public CalculatePCPopupExpertBatch( String description, boolean wizardMode )
 
 		phaseCorr = new CalculatePCPopup( wizardMode ? "Phase Correlation" : "Phase Correlation (expert)", false, Method.PHASECORRELATION, wizardMode );
 		lucasKanade = new CalculatePCPopup( "Lucas-Kanade", false, Method.LUCASKANADE, wizardMode );
-		interestPoint = new PairwiseInterestPointRegistrationPopup( "Interest point based", wizardMode );
 
 		if(!wizardMode)
 			this.add(phaseCorrSimple);
 		this.add( phaseCorr );
 		this.add( lucasKanade );
-		this.add( interestPoint );
 	}
 
 	@Override
@@ -66,7 +64,6 @@ public JComponent setExplorerWindow( ExplorerWindow< ? > panel )
 			this.phaseCorrSimple.setExplorerWindow( panel );
 		this.phaseCorr.setExplorerWindow( panel );
 		this.lucasKanade.setExplorerWindow( panel );
-		this.interestPoint.setExplorerWindow( panel );
 		return this;
 	}
 

src/main/java/net/preibisch/stitcher/gui/popup/PairwiseInterestPointRegistrationPopup.java

@@ -32,6 +32,7 @@
 
 import net.preibisch.legacy.io.IOFunctions;
 import net.preibisch.mvrecon.fiji.plugin.interestpointregistration.global.GlobalOptimizationParameters;
+import net.preibisch.mvrecon.fiji.plugin.interestpointregistration.global.GlobalOptimizationParameters.PreAlign;
 import net.preibisch.mvrecon.fiji.plugin.util.MouseOverPopUpStateChanger;
 import net.preibisch.mvrecon.fiji.plugin.util.MouseOverPopUpStateChanger.StateChanger;
 import net.preibisch.mvrecon.fiji.spimdata.SpimData2;
@@ -229,8 +230,6 @@ public void actionPerformed( ActionEvent e )
 
 				// remember for macro recording
 				ICPRefinement.defaultRefinementChoice = icpType.ordinal();
-				final boolean preAlign = false;
-				GlobalOptimizationParameters.defaultPrealign = preAlign;
 				GlobalOptimizationParameters globalOptParams;
 
 				if ( icpType == ICPType.Expert )
@@ -245,7 +244,7 @@ public void actionPerformed( ActionEvent e )
 					if ( !ICPRefinement.getGUIParametersSimple( icpType, data, params, downsamplingChoice, thresholdChoice, distanceChoice ) )
 						return;
 
-					globalOptParams = GlobalOptimizationParameters.getGlobalOptimizationParametersForSelection( GlobalOptimizationParameters.defaultSimple, preAlign );
+					globalOptParams = GlobalOptimizationParameters.getGlobalOptimizationParametersForSelection( GlobalOptimizationParameters.defaultSimple, false );
 				}
 
 				if ( globalOptParams == null )