more conditional imports: mimocorb

redP_mimoCoRB.py

@@ -21,14 +21,9 @@ def redP_to_rb(source_list=None, sink_list=None, observe_list=None, config_dict=
 
     :param config_dict: configuration dictionary
 
-      - events_required: number of events to be simulated or 0 for infinite
-      - sleeptime: (mean) time between events
-      - random: random time between events according to a Poission process
+      - events_required: number of events to taken
       - number_of_samples, sample_time_ns, pretrigger_samples and analogue_offset
-        describe the waveform data to be generated (as for oscilloscope setup)
-
-    Internal parameters of the simulated physics process (the decay of a muon)
-    are (presently) not exposed to user.
+      - decimation index, invert fags, trigger mode and trigger direction for RedPitaya
     """
 
     # initialize mimocorb class inside redPoscidaq

redPoscdaq.py

@@ -52,7 +52,10 @@ import matplotlib
 from matplotlib.figure import Figure
 from multiprocessing import Event
 
-from mimocorb.buffer_control import rbPut
+# !!! for conditional import from npy_append_array !!!
+def import_mimocorb():
+    global rbPut
+    from mimocorb.buffer_control import rbPut
 
 # !!! for conditional import from npy_append_array !!!
 def import_npy_append_array():
@@ -208,7 +211,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
         self.invert2 = 0 if "invert_channel2" not in self.confd else self.confd["invert_channel2"]
         self.readInterval = 1000 # used to control update of oscilloscope display
         # other parameters
-        self.filename = ''  # file name for data export 
+        self.filename = ''  # file name for data export, '' means disable
 
     def parse_args(self):
         parser = argparse.ArgumentParser(description=__doc__)
@@ -246,6 +249,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
         # other parameters
         self.filename = args.file
         if self.filename:
+            # data recording with npy_append_array()
             import_npy_append_array()
 
         
@@ -896,6 +900,8 @@ class redP_consumer():
 class redP_mimocorb():            
     def __init__(self, source_list=None, sink_list=None, observe_list=None, config_dict=None,
                  **rb_info):
+        # import rbPut() from mimoCoRB 
+        import_mimocorb()
         # initialize mimoCoRB interface 
         self.action = rbPut(config_dict=config_dict, sink_list=sink_list, **rb_info)
         self.number_of_channels = len(self.action.sink.dtype)
@@ -917,6 +923,10 @@ class redP_mimocorb():
            sys.exit()
            
 def run_rpControl(callback=None, conf_dict=None):
+    if conf_dict is not None:
+        # need module rbPut() from mimoCoRB, import here 
+        import_mimocorb()
+
     # start redPidaya GUI under Qt5 
     app = QApplication(sys.argv)
     dpi = app.primaryScreen().logicalDotsPerInch()

run_daq.py

+#! /usr/bin/env python3
+"""
+run mimoCoRB data acquisition suite
+"""
+
+import argparse
+import sys, time
+from mimocorb.buffer_control import run_mimoDAQ
+
+# define command line arguments ...
+parser = argparse.ArgumentParser(description=__doc__)
+parser.add_argument('filename', nargs='?', default = "setup.yaml",
+                    help = "configuration file")
+parser.add_argument('-v','--verbose', type=int, default=2,
+                    help="verbosity level (2)")
+parser.add_argument('-d','--debug', action='store_true',
+                    help="switch on debug mode (False)")
+# ... and parse command line input
+args = parser.parse_args()
+
+print("\n*==* script " + sys.argv[0] + " running \n")
+daq = run_mimoDAQ(args.filename, verbose=args.verbose, debug=args.debug)
+
+daq.setup()
+
+daq.run()
+
+# wait for user confirmation (useful if started via GUI)
+# input(30*' '+'Finished, good bye !  Type <ret> to exit -> ')
+
+print("\n*==* script " + sys.argv[0] + " finished " + time.asctime() + "\n")