From c73f2d09680a79b1a0e76eaeee50c2cf89a01b80 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Oct 2017 11:31:51 +0200 Subject: [PATCH] --- devices/Beam phase.properties | 6 +++--- devices/CurrentCamera.properties | 26 +++++++++++++------------- devices/WireScanner motor.properties | 8 ++++---- devices/cam_server.properties | 10 +++++----- plugins/SchottkyScan.form | 4 ++-- plugins/SchottkyScan.java | 4 ++-- script/Diagnostics/ICT_timing_fine.py | 4 ++-- script/RFscan/SchottkyScan.py | 24 +++++++++++++----------- 8 files changed, 44 insertions(+), 42 deletions(-) diff --git a/devices/Beam phase.properties b/devices/Beam phase.properties index 41ae543..26af9c2 100644 --- a/devices/Beam phase.properties +++ b/devices/Beam phase.properties @@ -1,9 +1,9 @@ -#Wed Sep 06 08:02:31 CEST 2017 +#Thu Oct 19 11:15:53 CEST 2017 maxValue=360.0 minValue=-360.0 offset=0.0 precision=3 -resolution=0.01 -rotation=false +resolution=0.1 +rotation=true scale=1.0 unit=deg diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index aa80125..46b9fc5 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,17 +1,17 @@ -#Mon Sep 25 17:43:34 CEST 2017 +#Thu Oct 19 11:30:30 CEST 2017 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= -colormap=Grayscale -colormapAutomatic=false -colormapMax=400.0 -colormapMin=0.0 +colormap=Flame +colormapAutomatic=true +colormapMax=32950.0 +colormapMin=73.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=2002 -imageWidth=1616 +imageHeight=2148 +imageWidth=2272 invert=false -regionStartX=517 -regionStartY=80 +regionStartX=129 +regionStartY=7 rescaleFactor=1.0 rescaleOffset=0.0 roiHeight=-1 @@ -22,9 +22,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=0.0 -spatialCalOffsetY=0.0 -spatialCalScaleX=1.0 -spatialCalScaleY=1.0 +spatialCalOffsetX=-338.45430435361357 +spatialCalOffsetY=-323.5054840514664 +spatialCalScaleX=-7.617446735341062 +spatialCalScaleY=-7.774538616246088 spatialCalUnits=mm transpose=false diff --git a/devices/WireScanner motor.properties b/devices/WireScanner motor.properties index d48df13..0465f72 100644 --- a/devices/WireScanner motor.properties +++ b/devices/WireScanner motor.properties @@ -1,12 +1,12 @@ -#Fri Jul 28 09:51:47 CEST 2017 -defaultSpeed=5000.0 +#Tue Oct 03 14:58:01 CEST 2017 +defaultSpeed=4000.0 estbilizationDelay=0 hasEnable=false homingType=None maxSpeed=8000.0 -maxValue=64000.0 +maxValue=51500.0 minSpeed=50.0 -minValue=-47600.0 +minValue=-56900.0 offset=0.0 precision=1 resolution=0.1 diff --git a/devices/cam_server.properties b/devices/cam_server.properties index 7a1dcb6..0d47335 100644 --- a/devices/cam_server.properties +++ b/devices/cam_server.properties @@ -1,4 +1,4 @@ -#Tue Sep 05 18:51:43 CEST 2017 +#Mon Oct 02 18:51:27 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=NaN @@ -16,9 +16,9 @@ roiY=0 rotation=0.0 rotationCrop=false scale=1.0 -spatialCalOffsetX=0.0 -spatialCalOffsetY=0.0 -spatialCalScaleX=1.0 -spatialCalScaleY=1.0 +spatialCalOffsetX=-861.4939970777481 +spatialCalOffsetY=-820.4883730911062 +spatialCalScaleX=-18.90359092620482 +spatialCalScaleY=-19.37984500632817 spatialCalUnits=mm transpose=false diff --git a/plugins/SchottkyScan.form b/plugins/SchottkyScan.form index 9f47651..164ac6d 100644 --- a/plugins/SchottkyScan.form +++ b/plugins/SchottkyScan.form @@ -177,7 +177,7 @@ - + @@ -216,7 +216,7 @@ - + diff --git a/plugins/SchottkyScan.java b/plugins/SchottkyScan.java index 29bc326..aa514ff 100644 --- a/plugins/SchottkyScan.java +++ b/plugins/SchottkyScan.java @@ -110,7 +110,7 @@ public class SchottkyScan extends Panel { labelStart.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); labelStart.setText("Start:"); - spinnerStop.setModel(new javax.swing.SpinnerNumberModel(150.0d, -180.0d, 360.0d, 1.0d)); + spinnerStop.setModel(new javax.swing.SpinnerNumberModel(150.0d, -360.0d, 360.0d, 1.0d)); labelStep.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); labelStep.setText("Step size:"); @@ -125,7 +125,7 @@ public class SchottkyScan extends Panel { labelSamples.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); labelSamples.setText("Nb Samples:"); - spinnerStart.setModel(new javax.swing.SpinnerNumberModel(-10.0d, -180.0d, 360.0d, 1.0d)); + spinnerStart.setModel(new javax.swing.SpinnerNumberModel(-10.0d, -360.0d, 360.0d, 1.0d)); javax.swing.GroupLayout panelParsLayout = new javax.swing.GroupLayout(panelPars); panelPars.setLayout(panelParsLayout); diff --git a/script/Diagnostics/ICT_timing_fine.py b/script/Diagnostics/ICT_timing_fine.py index 3f4b60b..7884101 100644 --- a/script/Diagnostics/ICT_timing_fine.py +++ b/script/Diagnostics/ICT_timing_fine.py @@ -23,9 +23,9 @@ V.initialize() t0 = t.read() start = 2.2 -stop = 12.0 +stop = 7.0 step = 0.1 -nb = 4 +nb = 10 lat = 0.150 plt = plot(None, title="Output")[0] diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index 1c0195b..804a394 100644 --- a/script/RFscan/SchottkyScan.py +++ b/script/RFscan/SchottkyScan.py @@ -12,13 +12,13 @@ if is_panel: lat = args[4] plt = args[5] else: - start = -50.0 + start = -10.0 stop = 150.0 step = 1.0 - nb = 2 - lat = 0.010 + nb = 4 + lat = 0.110 plt = plot(None, title="Output")[0] - + #Plot setup plt.clear() plt.removeMarker(None) @@ -48,8 +48,8 @@ else: bph.config.minValue = -360.0 bph.config.maxValue = 360.0 bph.config.precision = 3 -bph.config.rotation = False -bph.config.resolution = 0.01 +bph.config.rotation = True +bph.config.resolution = 0.1 bph.config.save() bph.initialize() rph.initialize() @@ -64,7 +64,7 @@ q_averager.monitored=True #Record callback: uptate of output plot def after_sample(record, scan): - plt.getSeries(0).appendData(record.positions[0], record.values[1].mean, record.values[1].stdev) + plt.getSeries(0).appendData((record.positions[0] + 90) % 360 - 90, record.values[1].mean, record.values[1].stdev) #The scan loop try: @@ -75,8 +75,9 @@ finally: rph.close() q.close() #st.close() -beamphase = r.getPositions(0) -rfphase = [val.mean for val in r.getReadable(0)] +#beamphase = r.getPositions(0) +beamphase = [(val + 90) % 360 - 90 for val in r.getPositions(0)] +rfphase = [(val.mean + 90) % 360 - 90 for val in r.getReadable(0)] rfphaserms = [val.stdev for val in r.getReadable(0)] charge = [val.mean for val in r.getReadable(1)] chargerms = [val.stdev for val in r.getReadable(1)] @@ -84,13 +85,14 @@ chargerms = [val.stdev for val in r.getReadable(1)] #Fitting and plotting i, a, b = 0, 0, 0 while charge[i] < (max(charge) * 0.20) : a = i; i = i + 1 -while charge[i] < (max(charge) * 0.80) : b = i; i = i + 1 +while charge[i] < (max(charge) * 0.60) : b = i; i = i + 1 x = beamphase[a:b+1] y = charge[a:b+1] p = (a0, a1) = fit_polynomial(y, x, 1) f = PolynomialFunction(p) x1 = -a0 / a1 if a1 != 0 else 0.0 -x2 = beamphase[charge.index(max(charge))] +#x2 = beamphase[charge.index(max(charge))] +x2 = beamphase[b+1] x_fit = frange(x1, x2, (x2-x1), True) y_fit = [f.value(val) for val in x_fit] plt.addSeries(LinePlotErrorSeries("Fit", Color.green))