From b87a209c6cb1dfae45d4e548cdb0998bccaf66e6 Mon Sep 17 00:00:00 2001
From: Chris Jones <jonesc@hep.phy.cam.ac.uk>
Date: Tue, 11 Feb 2025 16:24:27 +0000
Subject: [PATCH] Always use EUS data paths in QMT tests

---
 Rich/Panoptes/tests/options/2022-data.py | 11 ++++++-----
 Rich/Panoptes/tests/options/2023-data.py | 11 ++++++-----
 Rich/Panoptes/tests/options/2024-data.py | 11 ++++++-----
 Rich/Panoptes/tests/options/2024-mc.py   | 11 ++++++-----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Rich/Panoptes/tests/options/2022-data.py b/Rich/Panoptes/tests/options/2022-data.py
index 198bc132f..3e0799018 100644
--- a/Rich/Panoptes/tests/options/2022-data.py
+++ b/Rich/Panoptes/tests/options/2022-data.py
@@ -13,17 +13,18 @@ import os
 
 from Moore import options
 
+# Get test name
+myName = os.getenv("QMTTEST_NAME")
+
 options.set_input_and_conds_from_testfiledb("rich-decode-2022-panoptes")
 jonPath = "/usera/jonesc/NFS/data/RunIII/Hlt2/LHCb/RefIndexCalib/2022/"
-if os.path.exists(jonPath):
+if not myName and os.path.exists(jonPath):
     options.input_files = [jonPath + "data-{i:04d}.mdf".format(i=i) for i in range(38)]
+print("Data :-", options.input_files)
 
 options.evt_max = 1000
 options.print_freq = 100
 
-# Get test name
-myName = os.getenv("QMTTEST_NAME", "RichRefIndexCalib")
-
 # If required force use of trunk geom
-if "trunk_geom" in myName:
+if myName and "trunk_geom" in myName:
     options.geometry_version = "run3/trunk"
diff --git a/Rich/Panoptes/tests/options/2023-data.py b/Rich/Panoptes/tests/options/2023-data.py
index ed03e7276..6445e954a 100644
--- a/Rich/Panoptes/tests/options/2023-data.py
+++ b/Rich/Panoptes/tests/options/2023-data.py
@@ -13,22 +13,23 @@ import os
 
 from Moore import options
 
+# Get test name
+myName = os.getenv("QMTTEST_NAME")
+
 options.set_input_and_conds_from_testfiledb("rich-decode-2023")
 options.conditions_version = "online"
 
 # If in Cambridge, use local PFNs
 jonPath = "/usera/jonesc/NFS/data/RunIII/Hlt2/LHCb/RefIndexCalib/2023/"
-if os.path.exists(jonPath):
+if not myName and os.path.exists(jonPath):
     options.input_files = [
         jonPath + "data-{i:04d}.mdf".format(i=i) for i in range(10, 107)
     ]
+print("Data :-", options.input_files)
 
 options.evt_max = 1000
 options.print_freq = 100
 
-# Get test name
-myName = os.getenv("QMTTEST_NAME", "RichRefIndexCalib")
-
 # If required force use of trunk geom
-if "trunk_geom" in myName:
+if myName and "trunk_geom" in myName:
     options.geometry_version = "run3/trunk"
diff --git a/Rich/Panoptes/tests/options/2024-data.py b/Rich/Panoptes/tests/options/2024-data.py
index 56e071b68..3d7480b61 100644
--- a/Rich/Panoptes/tests/options/2024-data.py
+++ b/Rich/Panoptes/tests/options/2024-data.py
@@ -13,23 +13,24 @@ import os
 
 from Moore import options
 
+# Get test name
+myName = os.getenv("QMTTEST_NAME")
+
 # Start with config from TestFileDB
 options.set_input_and_conds_from_testfiledb("rich-decode-2024-panoptes")
 # If in Cambridge, use local PFNs
 jonPath = "/usera/jonesc/NFS/data/RunIII/Hlt2/LHCb/RefIndexCalib/2024/"
-if os.path.exists(jonPath):
+if not myName and os.path.exists(jonPath):
     options.input_files = [
         jonPath + "data-{i:04d}.mdf".format(i=i) for i in range(0, 4)
     ]
+print("Data :-", options.input_files)
 
 options.evt_max = 1000
 options.print_freq = 100
 
-# Get test name
-myName = os.getenv("QMTTEST_NAME", "RichRefIndexCalib")
-
 # If required force use of trunk geom
-if "trunk_geom" in myName:
+if myName and "trunk_geom" in myName:
     options.geometry_version = "run3/trunk"
 
 # Due to issues with hit sorting in FT disable Mat corrections
diff --git a/Rich/Panoptes/tests/options/2024-mc.py b/Rich/Panoptes/tests/options/2024-mc.py
index 6b064abb8..b2f6f409b 100644
--- a/Rich/Panoptes/tests/options/2024-mc.py
+++ b/Rich/Panoptes/tests/options/2024-mc.py
@@ -13,18 +13,19 @@ import os
 
 from Moore import options
 
+# Get test name
+myName = os.getenv("QMTTEST_NAME")
+
 options.set_input_and_conds_from_testfiledb("rich-decode-2024-mc")
 jonPath = "/usera/jonesc/NFS/data/MC/Run3/30000000/dddb-20231017/sim-20231017-vc-md100/2024-Expected-lumi_2.0e33/DIGI/"
-if os.path.exists(jonPath):
+if not myName and os.path.exists(jonPath):
     options.input_files = [
         jonPath + "30000000_42604869_{i:08d}.digi".format(i=i) for i in range(0, 80)
     ]
-
-# Get test name
-myName = os.getenv("QMTTEST_NAME", "RichRefIndexCalib")
+print("Data :-", options.input_files)
 
 # If required force use of trunk geom
-if "trunk_geom" in myName:
+if myName and "trunk_geom" in myName:
     options.geometry_version = "run3/trunk"
 else:
     options.geometry_version = "run3/2024.Q1.2-v00.00"
-- 
GitLab