Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Gui/python/TestHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ def copyMostRecentRootFile(self, RunNumber, base_dir, output_dir, test):
name = name.replace("Threshold", "Thr")

# Construct the search pattern for files
search_pattern = f"{base_dir}/Run{RunNumber}_{name}.root"
search_pattern = f"{base_dir}/Run{RunNumber}_{name}_Board*.root"
logger.debug(f"Looking for {search_pattern}")

# Find all matching files
Expand All @@ -1323,11 +1323,12 @@ def copyMostRecentRootFile(self, RunNumber, base_dir, output_dir, test):
# When using multiple FC7s root files will get overwritten so need to attach
# what fc7 the test was run on to file name
fc7_in_use: str = base_dir.split("/")[-1].replace(".", "_")
file_name: str = latest_file.split("/")[-1]
logger.debug(
f"Copying {latest_file} to {output_dir}/{fc7_in_use}_{file_name}"
)
os.system(f"cp {latest_file} {output_dir}/{fc7_in_use}_{file_name}")
for file in matching_files:
file_name: str = file.split("/")[-1]
logger.debug(
f"Copying {file} to {output_dir}/{fc7_in_use}_{file_name}"
)
os.system(f"cp {file} {output_dir}/{fc7_in_use}_{file_name}")

def saveTest(self, processIndex: int, process: QProcess):
logger.debug("Inside saveTest")
Expand Down
7 changes: 6 additions & 1 deletion Gui/python/TestValidator.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,14 @@ def ResultGrader(
# if chip.getStatus()
# ]

#relevant_files = [
# outputDir + "/" + os.fsdecode(file) for file in os.listdir(outputDir)
#]
relevant_files = [
outputDir + "/" + os.fsdecode(file) for file in os.listdir(outputDir)
outputDir + "/" + os.fsdecode(file) for file in os.listdir(outputDir) if module_name in file or file.endswith(".xml")
]
dqmpattern = re.compile(rf"_Hybrid_{module_hybridID}\.root$")
relevant_files.extend([outputDir + "/" + os.fsdecode(file) for file in os.listdir(outputDir) if dqmpattern.search(file)])

logger.debug(f"{relevant_files=}")
_1, _2 = felis.set_module(
Expand Down
Loading