test _LDRD_Kafka and fix bugs

NSLS-II-XPD · Jul 24, 2024 · 67b9444 · 67b9444
1 parent d340eff
commit 67b9444
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/scripts/_LDRD_Kafka.py b/scripts/_LDRD_Kafka.py
@@ -12,8 +12,9 @@
 # import _get_pdf as gp
 
 # import torch
-# from prepare_agent_pdf import build_agen
+from prepare_agent_pdf import build_agen
 # from diffpy.pdfgetx import PDFConfig
+from tiled.client import from_uri
 
 
 
@@ -34,11 +35,12 @@ def _kafka_process():
             'dummy_kafka', 'csv_path', 'key_height', 'height', 'distance', 'PLQY', 
             'rate_label_dic_key', 'rate_label_dic_value', 'new_points_label', 
             'use_good_bad', 'post_dilute', 'write_agent_data', 'agent_data_path', 
-            'USE_AGENT_iterate', 'peak_target',  
+            'USE_AGENT_iterate', 'peak_target', 'agent', 
             'iq_to_gr', 'iq_to_gr_path', 'cfg_fn', 'bkg_fn', 'iq_fn',  
             'search_and_match', 'mystery_path', 'results_path', 
             'fitting_pdf', 'fitting_pdf_path', 'cif_fn', 'gr_fn', 
             'use_sandbox', 'write_to_sandbox', 'sandbox_tiled_client', 
+            'fn_TBD', 
             ]
 
     return kafka_list
@@ -73,8 +75,8 @@ def __init__(self, parameters_list, xlsx_fn, sheet_name='inputs'):
         if self.inputs.agent==[]:
             self.inputs.agent.append(
                 build_agen(
-                    peak_target=self.inputs.peak_target, 
-                    agent_data_path=self.inputs.agent_data_path)
+                    peak_target=self.inputs.peak_target[0], 
+                    agent_data_path=self.inputs.agent_data_path[0])
                     )
 
         ## self.inputs.sandbox_tiled_client[0] is just the uri of sandbox

diff --git a/scripts/prepare_agent_pdf.py b/scripts/prepare_agent_pdf.py
@@ -114,7 +114,7 @@ def build_agen(peak_target=660, peak_tolerance=5, size_target=6, agent_data_path
         r_2_min = 0.70
         try: 
             if data['r_2'] < r_2_min:
-                print(f'Skip because "r_2" of {df["uid"][i]} is {data["r_2"]:.2f} < {r_2_min}.')
+                print(f'Skip because "r_2" of {data["uid"]} is {data["r_2"]:.2f} < {r_2_min}.')
             else: 
                 x = {k:[data[k]] for k in agent.dofs.names}
                 y = {k:[data[k]] for k in agent.objectives.names}