diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 9ab1c8e..55a4aad 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Wed Apr 12 18:41:46 CEST 2017 +#Wed Apr 12 19:35:48 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=1500.0 @@ -6,11 +6,11 @@ colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=2160 -imageWidth=2560 +imageHeight=1680 +imageWidth=1744 invert=false -regionStartX=1 -regionStartY=1 +regionStartX=433 +regionStartY=241 rescaleFactor=1.0 rescaleOffset=0.0 roiHeight=-1 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-1223.477868576451 -spatialCalOffsetY=-1024.4742906541314 -spatialCalScaleX=-8.699279809007425 -spatialCalScaleY=-8.747949625839508 +spatialCalOffsetX=-861.4939970777481 +spatialCalOffsetY=-820.4883730911062 +spatialCalScaleX=-18.90359092620482 +spatialCalScaleY=-19.37984500632817 spatialCalUnits=mm transpose=false diff --git a/plugins/SchottkyScan.java b/plugins/SchottkyScan.java index 5e9ca63..8d4f973 100644 --- a/plugins/SchottkyScan.java +++ b/plugins/SchottkyScan.java @@ -347,7 +347,7 @@ public class SchottkyScan extends Panel { private void buttonSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSetActionPerformed try { - String cmd = "caput('SINEG01-RSYS:CALC-VSUM-PHASE-OFFSET', " + spinnerPhaseRef.getValue() + ")"; + String cmd = "caput('SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE', -" + spinnerPhaseRef.getValue() + ")"; cmd += "; " + "caput('SINEG01-RSYS:CMD-LOAD-CALIB-BEAM', 1)"; evalAsync(cmd).handle((ret, ex) -> { if (ex != null){ diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index 7597ce1..4354e22 100644 --- a/script/RFscan/SchottkyScan.py +++ b/script/RFscan/SchottkyScan.py @@ -17,7 +17,7 @@ else: phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:SET-VSUM-PHASE") phase.config.minValue =-180.0 phase.config.maxValue = 180.0 -phase.config.resolution = 0.5 +phase.config.resolution = 0.1 phase.initialize() #st = Stream("ICTstream", dispatcher) @@ -25,6 +25,7 @@ phase.initialize() #st.initialize() #st.start(True) q = Channel("SINEG01-DICT215:B1_CHARGE", type = 'd', alias='ICT-Q') +phase0 = phase.read() try: qb = create_averager(q, nb, 0.100) @@ -33,6 +34,7 @@ try: charge = [val.mean for val in r.getReadable(0)] chargerms = [val.stdev for val in r.getReadable(0)] finally: + phase.write(phase0) phase.close() #st.close() q.close() @@ -42,7 +44,5 @@ y = charge x = rf_phase index_max = y.index(max(y)) phase_ref = x[index_max] - 80 -phase_offset = - phase_ref -caput("SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE", phase_offset) set_return(phase_ref) \ No newline at end of file