using new function tognerate data

karabo_devices/shared_mem_processor/src/onlinemid_karabo/processor.py

@@ -33,7 +33,7 @@ from TrainMatcher import TrainMatcher
 
 from calngUtils import shmem_utils, trackers
 
-from onlinemid import agipd_module_name_from_mid_agipd_source, hash_from_dict
+from onlinemid import agipd_module_name_from_mid_agipd_source, agipd_module_name_from_agipd_module_number, hash_from_dict, generate_test_data
 
 from onlinexpcsutils import onlinexpcsutils
 import runningstats
@@ -312,49 +312,49 @@ class OnlineMIDProcessor(TrainMatcher.TrainMatcher):
     my_generated_train_id = 21249888900
     def triggerSampleOutput(self):
 
-        self.log.INFO("generating sample output")
-        print("generating sample output")
+        self.log.WARNING("generating sample output")
         
-        myGroupName = self.get('deviceId')[-2:]
         
         def generate_data(q):
-            seconds = time.time()
-            
-
-
-            detectorData = onlinexpcsutils.get_test_data((50, 512, 128), q=q, photonEnergy=1)
+            detectorData = onlinexpcsutils.get_test_data(q=q)
             return detectorData
         
+        myGroupName = self.get('deviceId')[-2:]
         
         for count in range(200):
             my_detector_data_list = list()        
 
             q = 0.1 + 0.08*math.sin(0.1*count)
             if myGroupName == "G1":
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(0) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(1) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(2) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(3) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(0) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(1) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(2) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(3) , generate_data(q)))
             if myGroupName == "G2":
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(4) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(5) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(6) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(7) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(4) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(5) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(6) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(7) , generate_data(q)))
             if myGroupName == "G3":
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(8)  , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(9)  , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(10) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(11) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(8)  , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(9)  , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(10) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(11) , generate_data(q)))
             if myGroupName == "G4":
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(12) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(13) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(14) , generate_data(q)))
-                my_detector_data_list.append((onlinexpcsutils.agipd_source_module_no_to_unique_string_id(15) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(12) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(13) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(14) , generate_data(q)))
+                my_detector_data_list.append((agipd_module_name_from_agipd_module_number(15) , generate_data(q)))
             
             OnlineMIDProcessor.my_generated_train_id += 1
             self.handle_detector_data_list(OnlineMIDProcessor.my_generated_train_id, my_detector_data_list)
             time.sleep(0.4) 
 
+        self.log.WARNING("generating sample output ENDED")
+        
+        
+        
+
     
     def handle_detector_data_list(self, train_id, detector_data_list, numPixelPerGainStage=None):
         print("in gandle detector data")