diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 0996f7f..7b4cf6c 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,8 +1,8 @@ -#Sun Jul 16 09:04:28 CEST 2017 +#Tue Jul 18 09:35:41 CEST 2017 colormap=Flame colormapAutomatic=false -colormapMax=11538.652 -colormapMin=0.0 +colormapMax=1164.0 +colormapMin=-67.0 flipHorizontally=false flipVertically=false grayscale=false @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-952.508264123457 -spatialCalOffsetY=-331.5417312647646 -spatialCalScaleX=-8.510638170298318 -spatialCalScaleY=-8.235817067947012 +spatialCalOffsetX=-774.4676788150659 +spatialCalOffsetY=-530.483585305347 +spatialCalScaleX=-8.510638040502267 +spatialCalScaleY=-8.23581667712135 spatialCalUnits=mm transpose=false diff --git a/devices/camtool.properties b/devices/camtool.properties index 9d83b93..3867237 100644 --- a/devices/camtool.properties +++ b/devices/camtool.properties @@ -1,4 +1,4 @@ -#Fri Jul 14 12:20:10 CEST 2017 +#Tue Jul 18 08:47:04 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=578.797 @@ -18,9 +18,9 @@ roiY=0 rotation=0.0 rotationCrop=false scale=1.0 -spatialCalOffsetX=-861.4939970777481 -spatialCalOffsetY=-820.4883730911062 -spatialCalScaleX=-18.90359092620482 -spatialCalScaleY=-19.37984500632817 +spatialCalOffsetX=-445.47188964206686 +spatialCalOffsetY=-406.4957195962868 +spatialCalScaleX=-18.903590601802758 +spatialCalScaleY=-19.379844656211844 spatialCalUnits=mm transpose=false diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py index 5ee9e70..3d54a27 100644 --- a/script/RFscan/phase_scan_caqtdm.py +++ b/script/RFscan/phase_scan_caqtdm.py @@ -71,15 +71,15 @@ try: (fit_amplitude, fit_phase_deg, fit_offset, ph_crest, fit_x, fit_y) = hfitoff(energy , rf_phase) except: raise Exception("Fit failure") - #plt = plot([energy, fit_y], ["data", "fit"], [rf_phase, fit_x]) - plt = plot(None,name="data")[0] - plt.getSeries(0).setData(to_array(rf_phase,'d'), to_array(energy,'d')) - plt.getSeries(0).setPointSize(8) - plt.getSeries(0).setLinesVisible(False) - plt.addSeries(LinePlotSeries("fit")) - plt.getSeries(1).setData(fit_x, fit_y) - plt.getSeries(1).setPointsVisible(False) - plt.setLegendVisible(True) + plt = plot([energy, fit_y], ["data", "fit"], [rf_phase, fit_x]) + #plt = plot(None,name="data")[0] + #plt.getSeries(0).setData(to_array(rf_phase,'d'), to_array(energy,'d')) + #plt.getSeries(0).setPointSize(8) + #plt.getSeries(0).setLinesVisible(False) + #plt.addSeries(LinePlotSeries("fit")) + #plt.getSeries(1).setData(fit_x, fit_y) + #plt.getSeries(1).setPointsVisible(False) + #plt.setLegendVisible(True) caput(station + "-RSYS:GET-ONCREST-VSUM-PHASE", ph_crest) caput(station + "-RSYS:GET-ONCREST-E-GAIN", fit_amplitude) caput(station + "-RSYS:GET-FIT-PHASE-ARRAY", fit_x)