Closedown
This commit is contained in:
@@ -115,7 +115,7 @@
|
||||
<Component id="spinnerRounds" linkSize="5" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="jLabel16" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="spinnerMag" min="-2" pref="66" max="-2" attributes="0"/>
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
print "start"
|
||||
abort()
|
||||
sleep(1.0)
|
||||
print "after"
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user