diff --git a/plugins/EnergyScan_TBT.form b/plugins/EnergyScan_TBT.form index 37b3c83..59f77c4 100644 --- a/plugins/EnergyScan_TBT.form +++ b/plugins/EnergyScan_TBT.form @@ -115,7 +115,7 @@ - + diff --git a/plugins/EnergyScan_TBT.java b/plugins/EnergyScan_TBT.java index ccde9ee..2127efb 100644 --- a/plugins/EnergyScan_TBT.java +++ b/plugins/EnergyScan_TBT.java @@ -118,7 +118,7 @@ public class EnergyScan_TBT extends Panel { buttonAbort.setEnabled(true); - runAsync("EnergyScan", args).handle((ok, ex) -> { + runAsync("EnergyScan_TBT", args).handle((ok, ex) -> { try { buttonAbort.setEnabled(false); if (ex != null) { @@ -340,7 +340,7 @@ public class EnergyScan_TBT extends Panel { .addComponent(jLabel5) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(spinnerRounds, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(22, 22, 22) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel16) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(spinnerMag, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE) diff --git a/script/AbortTest.py b/script/AbortTest.py deleted file mode 100644 index a4c3167..0000000 --- a/script/AbortTest.py +++ /dev/null @@ -1,4 +0,0 @@ -print "start" -abort() -sleep(1.0) -print "after" \ No newline at end of file diff --git a/script/EnergyScan_TBT.py b/script/EnergyScan_TBT.py index 5819aaa..f89237b 100644 --- a/script/EnergyScan_TBT.py +++ b/script/EnergyScan_TBT.py @@ -23,7 +23,6 @@ if str(SET_OFFSETS) == "1": caput(OTF_OFF2,OFFSET2-40) #detune ID2 wait_channel(OTF_DONE, 1, type = 'i') print "Offsets are set" - import sys sys.exit(0) else: print "Running full script"