From d26738085bcc67dd11d38250044578a64f3330d4 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-01.psi.ch>
Date: Tue, 28 Jun 2016 16:57:07 +0200
Subject: [PATCH] Closedown

---
 config/devices.properties         |  2 +-
 plugins/GunSolenoidAlignment.java | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/config/devices.properties b/config/devices.properties
index e9dae38..f583ed0 100755
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,4 +1,4 @@
-$gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true
+gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true
 gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true
 #SINSB01_phase=ch.psi.pshell.epics.Positioner|VA-SINSB01-RSYS100:SET-BEAM-PHASE VA-SINSB01-RSYS100:GET-BEAM-PHASE|||true
 #BC1_energy=ch.psi.pshell.epics.ChannelDouble|VA-SINBC02-DBPM140:ENERGY|Read||true
diff --git a/plugins/GunSolenoidAlignment.java b/plugins/GunSolenoidAlignment.java
index b1a0568..2763ad4 100644
--- a/plugins/GunSolenoidAlignment.java
+++ b/plugins/GunSolenoidAlignment.java
@@ -4,7 +4,6 @@
 
 import ch.psi.pshell.plot.LinePlotErrorSeries;
 import ch.psi.pshell.plot.LinePlotJFree;
-import ch.psi.pshell.plot.LinePlotSeries;
 import ch.psi.pshell.plot.Plot;
 import ch.psi.pshell.scan.Scan;
 import ch.psi.pshell.scan.ScanListener;
@@ -14,13 +13,9 @@ import ch.psi.pshell.ui.Panel;
 import ch.psi.pshell.ui.Plugin;
 import ch.psi.utils.Convert;
 import ch.psi.utils.State;
-import java.awt.Color;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -87,11 +82,7 @@ public class GunSolenoidAlignment extends Panel {
         double[] y = (double[]) Convert.toDouble(hy);
         LinePlotErrorSeries hull = new LinePlotErrorSeries(scanSeries.getName() + "H", scanSeries.getColor());
         centroidPlot.addSeries(hull);
-        //hull.setData((double[]) Convert.toDouble(x), (double[]) Convert.toDouble(y));
-        for (int i=0; i<x.length; i++){
-            hull.appendData(x[i], y[i], Double.NaN,  Double.NaN);
-        }
-    
+        hull.setData((double[]) Convert.toDouble(x), (double[]) Convert.toDouble(y));    
     }
 
     @SuppressWarnings("unchecked")