bugfixes

ba2dc33c · Jan Pospisil · 0c0a02a7 · ba2dc33c
Commit ba2dc33c authored Nov 03, 2016 by Jan Pospisil
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

FFPG_CLI.py sw/FFPG_CLI.py +9 -7

No files found.
--- a/sw/FFPG_CLI.py
+++ b/sw/FFPG_CLI.py
@@ -2,7 +2,7 @@
 # coding: utf8

 import sys
-# from Ffpg import *
+from Ffpg import *

 def myInt(s):
    if s.isdigit():
@@ -96,6 +96,8 @@ pg = Ffpg(fmcSlot)
 if polarity == "stop":
    pg.StopChannel(channel)
    pg.DisableChannel(channel)
+    print "Done, channel stopped."
+    print ""
    sys.exit();

 # initialize the driver
@@ -114,6 +116,12 @@ if triggerPhase > -1:
 else:
    print("   (Skipping this calibration, no calibration data (-1) provided.)")

+# create bunched pulses
+pg.ResetBadState(channel)
+pg.CreateBunchPulses(channel, pulseDelay, pulseWidth, bunches, polarity)
+pg.EnableChannel(channel)
+pg.StartChannel(channel)
+
 # print some info
 pg.PrintVersion()
 # print("Actual temperature: "+str(pg.temp.ReadTemperature()) + " °C")
@@ -123,12 +131,6 @@ pg.PrintControl()
 pg.PrintStatus()
 pg.PrintDebug()

-# create bunched pulses
-pg.ResetBadState(channel)
-pg.CreateBunchPulses(channel, pulseDelay, pulseWidth, bunches, polarity)
-pg.EnableChannel(channel)
-pg.StartChannel(channel)
-
 print ""
 print "Done."
 print ""