Merge branch 'meteor-960-automated-workflow-manager' into meteor-1100…

…-fibsem-tab
delmic · Feb 21, 2025 · a446468 · a446468
2 parents dbb6846 + 7710fb0
commit a446468
Show file tree

Hide file tree

Showing 28 changed files with 2,695 additions and 439 deletions.
diff --git a/install/linux/usr/share/odemis/sim/meteor-fibsem-sim.odm.yaml b/install/linux/usr/share/odemis/sim/meteor-fibsem-sim.odm.yaml
@@ -84,10 +84,14 @@ METEOR-FIBSEM-Sim: {
         # Grid centers in SEM range
         # Adjusted so that at init (0,0,0), it's at the Grid 1.
         SAMPLE_CENTERS: {"GRID 1": {'x': 0, 'y': 0, 'z': 32.e-3}, "GRID 2": {'x': 5.0e-3, 'y': 0, 'z': 32.e-3}},
+        # Mirroring values between SEM - METEOR
+        POS_COR: [0.0253126, 0.0024916],
         CALIB: {"version": "tfs_3", 
-                "dx": 0.0506252, "dy": 0.0049832,
-                "Sample pre-tilt":  0.6108652381980153, # 35°
-                "SEM-Eucentric-Focus": 7.0e-3},  # aqulios=7.0e-3, hydra=4.0e-3
+                "pre-tilt":  0.6108652381980153, # 35°
+                "SEM-Eucentric-Focus": 7.0e-3, # aqulios=7.0e-3, hydra=4.0e-3
+                "use_linked_sem_focus_compensation": false,
+                "use_3d_transforms": false,
+                "use_scan_rotation": false,},
         FAV_FM_POS_ACTIVE: {"rx": 0.12213888553625313  , "rz":  3.141592653589793}, # 7° - 270°
         FAV_SEM_POS_ACTIVE: {"rx": 0.6108652381980153, "rz": 0},  # pre-tilt 35°
         FAV_MILL_POS_ACTIVE: {"rx": 0.314159, "rz": 0},    # Note that milling angle (rx) can be changed per session

diff --git a/install/linux/usr/share/odemis/sim/meteor-tfs3-sim.odm.yaml b/install/linux/usr/share/odemis/sim/meteor-tfs3-sim.odm.yaml
@@ -67,7 +67,10 @@
         CALIB: {
             "version": "tfs_3", 
             "dx": 0.0506252, "dy": 0.0049832,
-            "Sample pre-tilt": 0.6108652381980153,
+            "pre-tilt": 0.6108652381980153,
+            "use_linked_sem_focus_compensation": false,
+            "use_3d_transforms": false,
+            "use_scan_rotation": false,
             },
         # Active tilting (rx) & rotation(rz) angles positions when switching between SEM & FM.
         FAV_FM_POS_ACTIVE: {"rx": 0.29670597283903605  , "rz":  3.141592653589793}, # 17° - 180°