diff --git a/Control/CalypsoExample/Reconstruction/CMakeLists.txt b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
index b7329daa28e45b663f6ea7b33e8155b004ee2d6e..5dbb5a46c9943df6d18019963f0387aa3c608c9b 100644
--- a/Control/CalypsoExample/Reconstruction/CMakeLists.txt
+++ b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
@@ -30,7 +30,12 @@ atlas_add_test( ProdRecoPilotTracks
     SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-pilot_tracks-filtered.raw TI12Data
     PROPERTIES TIMEOUT 300 )
 
-atlas_add_test( ProdRecoTI12-2022
-    SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-006525-filtered.raw TI12Data02
+# Test of TI12Data02 geometry (should auto-select from run number)
+atlas_add_test( ProdRecoTI12-02-2022
+    SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-006525-filtered.raw
     PROPERTIES TIMEOUT 300 )
 
+# Test of TI12Data03 geometry (should auto-select from run number)
+atlas_add_test( ProdRecoTI12-03-2022
+    SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-007833-00003-TrigMask08.raw
+    PROPERTIES TIMEOUT 300 )
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index 51b23a0cb1aef8691d4a29bd399c28ac7707c578..bcbdf389f95422f17321313f40f4da6d55986323 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -73,11 +73,6 @@ else:
             print(f"Found run number {runnumber}, using original TI12 configuration")
             runtype = "TI12Data"
 
-    elif runtype == "2022":
-
-        # 2022 production data
-        runtype = "TI12Data03"
-
 print(f"Starting reconstruction of {filepath.name} with type {runtype}")
 if args.nevents > 0:
     print(f"Reconstructing {args.nevents} events by command-line option")
diff --git a/Control/CalypsoExample/rawdata/Faser-Physics-007833-00003-TrigMask08.raw b/Control/CalypsoExample/rawdata/Faser-Physics-007833-00003-TrigMask08.raw
new file mode 100644
index 0000000000000000000000000000000000000000..55004da5cc7d612760d61e2fe6a7d2d9edede69a
Binary files /dev/null and b/Control/CalypsoExample/rawdata/Faser-Physics-007833-00003-TrigMask08.raw differ