diff --git a/devices/camtool.properties b/devices/camtool.properties index e6d8a6a..031b0ac 100644 --- a/devices/camtool.properties +++ b/devices/camtool.properties @@ -1,4 +1,4 @@ -#Mon Apr 03 16:51:34 CEST 2017 +#Tue Apr 04 16:00:24 CEST 2017 colormap=Temperature 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=269.4151234567901 +spatialCalOffsetY=269.5964523281596 +spatialCalScaleX=1.0 +spatialCalScaleY=1.0 spatialCalUnits=mm transpose=false diff --git a/plugins/GunScan.java b/plugins/GunScan.java index 77d438b..04a40a7 100644 --- a/plugins/GunScan.java +++ b/plugins/GunScan.java @@ -102,12 +102,12 @@ public class GunScan extends Panel { double energy_sp_std = ((DescStatsDouble) record.getValues()[1]).getStdev(); seriesEnergy.appendData(phase, energy0 * (1 +energy_mean / 1e6 / dispersion), - 0 + energy0 * (energy_std / 1e6 / dispersion) ); seriesEnergySpread.appendData(phase, energy0 * (energy_sp_mean / 1e6 / dispersion), - 0 + energy0 * (energy_sp_std / 1e6 / dispersion) ); } }