add wait=True to count_stream

NSLS-II-XPD · Aug 30, 2024 · bee5c37 · bee5c37
1 parent bf3a73d
commit bee5c37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/scripts/_LDRD_Kafka.py b/scripts/_LDRD_Kafka.py
@@ -766,7 +766,7 @@ def macro_11_absorbance(self, stream_name):
         ## Apply percnetile filtering for absorption spectra, defaut percent_range = [15, 85]
         abs_per = da.percentile_abs(self.qepro_dic['QEPro_x_axis'], 
                                     self.qepro_dic['QEPro_output'], 
-                                    percent_range=[5, 65])
+                                    percent_range=[10, 70])
 
         print(f'\n*** start to check absorbance at 365b nm in stream: {stream_name} is positive or not***\n')
         # abs_array = qepro_dic['QEPro_output'][1:].mean(axis=0)
@@ -1056,10 +1056,10 @@ def macro_17_add_queue(self, stream_name, qserver_process, RM):
                                 pump_list=qin.pump_list, 
                                 precursor_list=qin.precursor_list, 
                                 mixer=qin.mixer)
-                RM.item_add(scanplan, pos=1)
+                RM.item_add(scanplan, pos=0)
 
-                restplan = BPlan('sleep_sec_q', 5)
-                RM.item_add(restplan, pos=2)
+                restplan = BPlan('sleep_sec_q', 2)
+                RM.item_add(restplan, pos=0)
 
                 RM.queue_start()
 

diff --git a/scripts/_synthesis_queue_RM.py b/scripts/_synthesis_queue_RM.py
@@ -195,7 +195,7 @@ def synthesis_queue_xlsx(parameter_obj):
 		#### Kafka check data here.
 
 		## 5. Sleep for 5 seconds for Kafak to check good/bad data
-		restplan = BPlan('sleep_sec_q', 5)
+		restplan = BPlan('sleep_sec_q', 2)
 		RM.item_add(restplan, pos=pos)
 
 

diff --git a/scripts/inputs_qserver_kafka_v2.xlsx b/scripts/inputs_qserver_kafka_v2.xlsx
diff --git a/startup/31-flow_plan.py b/startup/31-flow_plan.py
@@ -219,7 +219,7 @@ def count_stream(det, stream_name="primary", md=None):
     @bpp.stage_decorator([det])
     @bpp.run_decorator(md=md)
     def _inner_count():
-        yield from bps.trigger(det)
+        yield from bps.trigger(det, wait=True)
         yield from bps.create(name=stream_name)
         reading = (yield from bps.read(det))
         yield from bps.save()
@@ -261,28 +261,26 @@ def take_a_uvvis_csv_q(sample_type='test', plot=False, csv_path=None, data_agent
 
     if spectrum_type == 'Absorbtion':
         if LED.get()=='Low' and UV_shutter.get()=='High' and qepro.correction.get()==correction_type and qepro.spectrum_type.get()==spectrum_type:
-            uid = (yield from count([qepro], md=_md))
+            pass
         else:
             yield from bps.abs_set(qepro.correction, correction_type, wait=True)
             yield from bps.abs_set(qepro.spectrum_type, spectrum_type, wait=True)
-            # yield from LED_off()
-            # yield from shutter_open()
             yield from bps.mv(LED, 'Low', UV_shutter, 'High')
-            yield from bps.sleep(2)
-            uid = (yield from count_stream(qepro, stream_name="take_a_uvvis", md=_md))
+
+        yield from bps.sleep(2)
+        uid = (yield from count_stream(qepro, stream_name="take_a_uvvis", md=_md))
 
 
     else:
         if LED.get()=='High' and UV_shutter.get()=='Low' and qepro.correction.get()==correction_type and qepro.spectrum_type.get()==spectrum_type:
-            uid = (yield from count([qepro], md=_md))
+            pass
         else:
             yield from bps.abs_set(qepro.correction, correction_type, wait=True)
             yield from bps.abs_set(qepro.spectrum_type, spectrum_type, wait=True)
-            # yield from shutter_close()
-            # yield from LED_on()
             yield from bps.mv(LED, 'High', UV_shutter, 'Low')
-            yield from bps.sleep(2)
-            uid = (yield from count_stream(qepro, stream_name="take_a_uvvis", md=_md))
+
+        yield from bps.sleep(2)
+        uid = (yield from count_stream(qepro, stream_name="take_a_uvvis", md=_md))
 
     yield from bps.mv(LED, 'Low', UV_shutter, 'Low')