DAQ: Updated spreadsheet and automation params

daq/src/aaredaq/daq.py

@@ -1278,23 +1278,30 @@ class AareDAQ:
         return params
 
     def get_collection_params(self, prefer_smart: bool = False) -> tuple[SimpleScanParameters, str]:
-        spreadsheet_params = self.spreadsheet_params()
+        spreadsheet_params, file_prefix = self.spreadsheet_params()
         logger.debug(f"spreadsheet_params: {spreadsheet_params}")
+        smart_params = self.__cfg.auto_params
+        default_params = SimpleScanParameters(exp_time_s=0.04, dtz=110, incr_omega_deg=0.2)
+        #if file_prefix is not None:
+        #    default_params.file_prefix = file_prefix
+        #self.__aare.send_msg_to_db(self.sample,event_type=SampleEventType(''), comment=f'smart_params: {smart_params}')
         if prefer_smart:
-            # Smart params priority
-            if self.smart_params:
-                return self.smart_params, "smart_params"
+            if smart_params:
+                #if file_prefix:
+                #    smart_params.file_prefix = file_prefix
+                return smart_params, "smart_params"
             if spreadsheet_params:
                 return spreadsheet_params, "spreadsheet_params"
         else:
-            # Spreadsheet params priority (current default)
             if spreadsheet_params:
                 return spreadsheet_params, "spreadsheet_params"
-            if self.smart_params:
-                return self.smart_params, "smart_params"
+            if smart_params:
+                #if file_prefix:
+                #    smart_params.file_prefix = file_prefix
+                return smart_params, "smart_params"
+
+        return default_params, "defaults"
 
-        # Fallback to defaults
-        return SimpleScanParameters(exp_time_s=0.04, dtz=110, incr_omega_deg=0.2), "defaults"
 
     def measure(self, sample: SampleShortInfo) -> float:
         start = time.perf_counter()