diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 2961933..583704f 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Fri Aug 25 16:18:27 CEST 2017 +#Fri Aug 25 16:41:04 CEST 2017 colormap=Flame colormapAutomatic=false colormapMax=50555.0 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-668.5255649055714 -spatialCalOffsetY=-423.5108650487615 -spatialCalScaleX=-8.51063846134933 -spatialCalScaleY=-8.23581684499547 +spatialCalOffsetX=-861.4939970777481 +spatialCalOffsetY=-820.4883730911062 +spatialCalScaleX=-18.90359092620482 +spatialCalScaleY=-19.37984500632817 spatialCalUnits=mm transpose=false diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py index a99d279..e669c74 100644 --- a/script/RFscan/phase_scan_caqtdm.py +++ b/script/RFscan/phase_scan_caqtdm.py @@ -71,7 +71,7 @@ try: (fit_amplitude, fit_phase_deg, fit_offset, ph_crest, fit_x, fit_y) = hfitoff(energy , rf_phase) except: raise Exception("Fit failure") - """ + # This only works when pshell is visible not in server mode to be fixed plt = plot(None,name="data")[0] plt.getSeries(0).setData(to_array(rf_phase,'d'), to_array(energy,'d')) @@ -81,7 +81,6 @@ try: 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) diff --git a/script/RFscan/phase_scan_caqtdm_set.py b/script/RFscan/phase_scan_caqtdm_set.py index ffbe1ee..ca99403 100644 --- a/script/RFscan/phase_scan_caqtdm_set.py +++ b/script/RFscan/phase_scan_caqtdm_set.py @@ -33,8 +33,8 @@ caput(station + "-RSYS:CMD-LOAD-CALIB-BEAM", 1) if do_elog == True and n > 0: title = "Set RF calibration:" + station log_msg = "" - if (phase_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-PHASE-OFFSET-BASE: %8.2f" % phase_offset + " deg (was %8.2f" % phase_offset_old + " deg)\n" - if (ampli_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-AMPLT-SCALE: %8.3f" % amplitude_scale + " MV (was %8.2f" % amplitude_scale_old + " MV)\n" - if (power_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VOLT-POWER-SCALE: %8.5f" % power_scale + " MW/MV^2 (was %8.2f" % power_scale_old + " MW/MV^2)" + if (phase_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-PHASE-OFFSET-BASE: %0.2f" % phase_offset + " deg (was %0.2f" % phase_offset_old + " deg)\n" + if (ampli_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-AMPLT-SCALE: %0.3f" % amplitude_scale + " MV (was %0.3f" % amplitude_scale_old + " MV)\n" + if (power_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VOLT-POWER-SCALE: %0.5f" % power_scale + " MW/MV^2 (was %0.5f" % power_scale_old + " MW/MV^2)" attachments = [] elog(title, log_msg, attachments) \ No newline at end of file