Attempt to #72

Author: vigoux

application.py

@@ -954,14 +954,14 @@ def experiment(self):
 
                 n_c = 1
                 self._bnc.run()
-                self.avh.startAll(p_N_c)
+                tp_scopes = None
 
                 while n_c <= p_N_c and self.experiment_on:
 
                     self.processing_text["text"] = "Processing experiment :\n"\
                         + "\tAverage : {}/{}\n".format(n_c, p_N_c)\
                         + "\tDelay : {}/{}".format(n_d, p_N_d)
-
+                    self.avh.startAll(1)
                     self._bnc.sendtrig()
                     self.after(int(p_T_tot))
                     self.update()
@@ -973,7 +973,13 @@ def experiment(self):
                                                                     p_N_c,
                                                                     n_d,
                                                                     p_N_d))
-                self.avh.waitAll()
+                    self.avh.waitAll()
+                    if tp_scopes is None:
+                        tp_scopes = self.avh.getScopes()
+                    else:
+                        to_add = self.avh.getScopes()
+                        for key in tp_scopes:
+                            tp_scopes[key] += to_add[key]
                 self._bnc.stop()
                 n_d += 1
 
@@ -983,7 +989,7 @@ def experiment(self):
                                 float(pulse.experimentTuple[BNC.DELAY].get()) \
                                 + n_d * \
                                 float(pulse.experimentTuple[BNC.dPHASE].get())
-                tp_scopes = self.avh.getScopes()
+                # tp_scopes = self.avh.getScopes()
                 self.avh.stopAll()
                 self.spectra_storage.putSpectra(raw_timestamp, n_d, tp_scopes)
                 self.liveDisplay.putSpectrasAndUpdate(

spectro.py

@@ -408,7 +408,7 @@ def Callbackfunc(self, Avh_Pointer, int_pointer):
 
             tp_spectrum = Spectrum(list(lambdaList), list(spect))
             print(max(list(spect)))
-            self.put((Avh_val, tp_spectrum))
+            self.put(tp_spectrum)
 
         else:
             raise c_AVA_Exceptions(int_val)
@@ -622,7 +622,7 @@ def prepareMeasure(self, device, intTime=10, triggerred=False,
         Meas.m_SaturationDetection = int(triggerred)
 
         # Trigger configuration.
-        Meas.m_Trigger.m_Mode = ctypes.c_ubyte(1 if triggerred else 0)
+        Meas.m_Trigger.m_Mode = ctypes.c_ubyte(0)
         Meas.m_Trigger.m_Source = ctypes.c_ubyte(0)
         Meas.m_Trigger.m_SourceType = ctypes.c_ubyte(0)
 
@@ -692,29 +692,9 @@ def getScope(self, device):
 
         logger_ASH.debug("Gathering {} scopes.".format(device))
 
-        # Get the number of pixels.
-        numPix = ctypes.c_short()
-        AVS_DLL.AVS_GetNumPixels(device, ctypes.byref(numPix))
-
-        # Prepare data structures and get pixel values.
-        spect = (ctypes.c_double * numPix.value)()
-        timeStamp = ctypes.c_uint()
-        AVS_DLL.AVS_GetScopeData(
-            device,
-            ctypes.byref(timeStamp),
-            ctypes.byref(spect)
-        )
-
-        # Get lambdas for all pixels.
-        lambdaList = (ctypes.c_double * numPix.value)()
-        AVS_DLL.AVS_GetLambda(device, ctypes.byref(lambdaList))
-
-        logger_ASH.debug("{} scopes gathered.".format(device))
-
-        # Clear Callback_Measurment for further observations
-        self.devList[device][1].clear()
+        id, callback = self.devList[device]
 
-        return self.devList[device][0], Spectrum(list(lambdaList), list(spect))
+        return id, callback.get()
 
     def stopMeasure(self, device):
         """