Work on test15, trigger and time-tags.

218df425 · Matthieu Cattin · 87681ba7 · 218df425
Commit 218df425 authored Dec 08, 2011 by Matthieu Cattin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

test15.py test/fmcadc100m14b4cha/python/test15.py +6 -2

No files found.
--- a/test/fmcadc100m14b4cha/python/test15.py
+++ b/test/fmcadc100m14b4cha/python/test15.py
@@ -41,7 +41,7 @@ ACQ_TIMEOUT = 10

 MAX_FIRMWARE_RELOAD = 10

-PRE_TRIG_SAMPLES = 0
+PRE_TRIG_SAMPLES = 100
 POST_TRIG_SAMPLES = 1000
 NB_SHOTS = 1

@@ -75,7 +75,8 @@ def fmc_adc_init(spec, fmc):
    # Make sure all switches are OFF
    open_all_channels(fmc)
    # Set trigger
-    fmc.set_int_trig(4, 1, 45000)
+    #fmc.set_int_trig(4, 1, 45000)
+    fmc.set_soft_trig()
    # Set acquisition
    fmc.set_pre_trig_samples(PRE_TRIG_SAMPLES)
    fmc.set_post_trig_samples(POST_TRIG_SAMPLES)
@@ -197,6 +198,7 @@ def main (default_directory='.'):

    # Print configuration
    fmc.print_adc_core_config()
+    spec_fmc.print_csr()

    # Print ADC config
    fmc.print_adc_config()
@@ -209,6 +211,8 @@ def main (default_directory='.'):
    print('Make an acquisition')
    fmc.stop_acq()
    fmc.start_acq()
+    time.sleep(1)
+    fmc.sw_trig_no_wait()
    # Wait end of acquisition
    timeout = 0
    while('IDLE' != fmc.get_acq_fsm_state()):