07_2025

config/config.properties

@@ -1,4 +1,4 @@
-#Tue Mar 19 14:13:19 CET 2024
+#Tue Jul 09 10:27:34 CEST 2024
 xscanMoveTimeout=600
 imageSourcesFile={config}/imaging.properties
 autoSaveScanData=true
@@ -43,6 +43,7 @@ logPath={logs}/{date}_{time}
 filePermissionsLogs=Public
 dataLayout=table
 disableDataFileLogs=false
+dataScanSaveTimestamps=false
 sessionHandling=On
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=false

config/sessions.properties

@@ -1,2 +1,2 @@
-#Wed Sep 13 14:03:47 CEST 2023
+#Wed Nov 20 14:33:45 CET 2024
 SessionCounter=89

config/settings.properties

@@ -1,4 +1,4 @@
-#Tue Mar 19 16:14:06 CET 2024
+#Thu Jul 31 09:42:18 CEST 2025
 RSYNC_USER=
 OUTLIERS_THRESHOLD=1000000000
 AUTO_SWITCH_VALVE=false

config/variables.properties

@@ -1,4 +1,4 @@
-#Tue Mar 19 16:14:24 CET 2024
-LastRunDate=240319
-FileSequentialNumber=52
-DaySequentialNumber=52
+#Sun Apr 07 18:49:56 CEST 2024
+LastRunDate=240407
+FileSequentialNumber=58
+DaySequentialNumber=1

script/Users/PEEM/Armin/Manipulator_Control/Pos-PEEMCAM-Scan/TestVscan.py

@@ -0,0 +1,50 @@
+
+
+#Pseudo motor for my motor functions, e.g. move_sim_x
+#Detector = PEEMCAM
+SHOW_COMPOSITE_IMG=True
+TRANSPOSE=False
+
+class MotorX(Writable):
+    def write(self, pos):
+        print "X=",pos
+
+class MotorY(Writable):
+    def write(self, pos):
+        print "Y=",pos        
+
+motor_x=MotorX()
+motor_y=MotorY()
+
+vector = [  [1,1] , [1,2] , [1,3] , [1,4]   , 
+            [2,1] , [2,2] , [2,3] , [2,4]   ,
+            [3,1] , [3,2] , [3,3] , [3,4]     ]
+
+bins_x,bins_y = 4,3
+composite =create_composite_image(peemcam.dataMatrix.take(), bins_x,bins_y)
+
+if SHOW_COMPOSITE_IMG:
+    display_composite_image(composite, "Composite", reset=True, force_renderer=True, transpose=TRANSPOSE)
+
+def before_read(pos, scan):
+    trigger_peemcam()
+    ProviderTIFF.setMetadata(get_diags())
+    
+def after_read(rec, scan):
+    x,y = rec.index%bins_x,  rec.index/bins_x   
+    append_composite_image(composite, rec[peemcam.dataMatrix], x, y)
+    if SHOW_COMPOSITE_IMG:
+        display_composite_image(composite, "Composite", force_renderer=True, transpose=TRANSPOSE)
+
+
+r = vscan( (motor_x,motor_y), (peemcam.dataMatrix, CADC2), vector, latency=0.1,
+            before_read= before_read, 
+            after_read=after_read,)            
+
+save_dataset("/composite", get_ip_array(composite))
+
+#Plot all sampled images
+#plot(r[peemcam.dataMatrix], title="Images")
+
+#Plot a scalar
+#plot(r[CADC2], title="Scalar")

script/Users/PEEM/Armin/Manipulator_Control/TestVscan_AK.py

@@ -0,0 +1,54 @@
+
+
+#Pseudo motor for my motor functions, e.g. move_sim_x
+#Detector = PEEMCAM
+SHOW_COMPOSITE_IMG=False
+TRANSPOSE=False
+
+class MotorX(Writable):
+    def write(self, pos):
+        print "X=",pos
+        move_x_sim(pos)
+
+class MotorY(Writable):
+    def write(self, pos):
+        print "Y=",pos
+        move_y_sim(pos)
+
+motor_x=MotorX()
+motor_y=MotorY()
+#
+#vector = [  [1,1] , [1,2] , [1,3] , [1,4]   , 
+#            [2,1] , [2,2] , [2,3] , [2,4]   ,
+#            [3,1] , [3,2] , [3,3] , [3,4]     ]
+
+vector = [ [150.0,1200.0] , [200.0,1300.0] ]
+
+bins_x,bins_y = 4,3
+composite =create_composite_image(peemcam.dataMatrix.take(), bins_x,bins_y)
+
+if SHOW_COMPOSITE_IMG:
+    display_composite_image(composite, "Composite", reset=True, force_renderer=True, transpose=TRANSPOSE)
+
+def before_read(pos, scan):
+    trigger_peemcam()
+    ProviderTIFF.setMetadata(get_diags())
+    
+def after_read(rec, scan):
+    x,y = rec.index%bins_x,  rec.index/bins_x   
+    append_composite_image(composite, rec[peemcam.dataMatrix], x, y)
+    if SHOW_COMPOSITE_IMG:
+        display_composite_image(composite, "Composite", force_renderer=True, transpose=TRANSPOSE)
+
+
+r = vscan( (motor_x,motor_y), (peemcam.dataMatrix, CADC2), vector, latency=0.1,
+            before_read= before_read, 
+            after_read=after_read,)            
+
+#save_dataset("/composite", get_ip_array(composite))
+
+#Plot all sampled images
+#plot(r[peemcam.dataMatrix], title="Images")
+
+#Plot a scalar
+#plot(r[CADC2], title="Scalar")