diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java index 883ddf9..1f3a940 100644 --- a/plugins/EnergyScan.java +++ b/plugins/EnergyScan.java @@ -111,8 +111,8 @@ public class EnergyScan extends Panel { args.put("ID2", jRadioButton2.isSelected() ? 1 : 2); args.put("MCP_1", jCheckBox2.isSelected() ? 1 : 2); args.put("MCP_2", jCheckBox3.isSelected() ? 1 : 2); - args.put("Cam_start", (Double) jSpinner1.getValue()); - args.put("Cam_end", (Double) jSpinner2.getValue()); + args.put("Cam_start", jSpinner1.getValue()); + args.put("Cam_end", jSpinner2.getValue()); buttonAbort.setEnabled(true); diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 1879afe..cf5b760 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -63,12 +63,12 @@ def _startPlot(type): cur = 0 time.sleep(3.0) if (MCP_1 == 1 or MPC_2 ==2): - MCP1 = [[0 for x in range(1)] for x in range(NrCounters)] - MCP2 = [[0 for x in range(1)] for x in range(NrCounters)] + MCP1 = [[0 for x in range(1)] for x in range(NrCounters.read())] + MCP2 = [[0 for x in range(1)] for x in range(NrCounters.read())] output_file_MCP1 = output_path+"MCP1"+file_prefix+"_" + suffix + ".dat" output_file_MCP2 = output_path+"MCP2"+file_prefix+"_" + suffix + ".dat" - MCP1out.open(output_file_MCP1, "w+") - MCP2out.open(output_file_MCP2, "w+") + MCP1out = open(output_file_MCP1, "w+") + MCP2out = open(output_file_MCP2, "w+") MCP1out.write("rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep) MCP2out.write("rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep) while running: