Skip to content

Output.txt now writes to fc7 directories separately #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlj5j merged 1 commit into from
Oct 28, 2025
Merged

Output.txt now writes to fc7 directories separately #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Gui/QtGUIutils/TessieCoolingApp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from PyQt5.QtCore import QTimer, pyqtSignal, QThread, QObject, pyqtSlot,QMetaObject, Qt
from PyQt5.QtGui import QFont
from Gui.python.logging_config import get_logger
import threading
import time

logger = get_logger(__name__)
Expand Down
76 changes: 52 additions & 24 deletions Gui/python/TestHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def __init__(self, runwindow, master, info, firmware, txt_files={}):
self.rd53_file = {}
self.grade = -1
self.currentTest = ""
self.outputFile = ""
self.errorFile = ""
self.outputFile = None
self.errorFile = None
self.comment = ""
self.txt_files = txt_files if txt_files != {} else {}

Expand Down Expand Up @@ -601,7 +601,6 @@ def GADC_execute_each_step(
process.setProcessChannelMode(QtCore.QProcess.MergedChannels)
process.setWorkingDirectory(os.environ.get("PH2ACF_BASE_DIR") + "/test/")

self.outputFile = self.output_dir + "/output.txt"
process.readyReadStandardOutput.connect(
lambda: self.on_readyReadStandardOutput_GADC(
process,
Expand Down Expand Up @@ -925,16 +924,21 @@ def storeTrimbitResults(self, adcmeasurements, pin_mapping):
def setupQProcess(self):
self.tempHistory = [0.0] * self.numChips
self.tempindex = 0

# NOTE: This may cause issues as I believe both instances of Ph2_ACF will write to the same place.
logger.info(f"{self.output_dir=}")
self.outputFile = self.output_dir + "/output.txt"
self.errorFile = self.output_dir + "/error.txt"

if os.path.exists(self.outputFile):
self.outputfile = open(self.outputFile, "a")
else:
self.outputfile = open(self.outputFile, "w")
# Create per-FC7 output directories
# <output_dir>/<fc7>/output.txt
# An error.txt file was created in the old version but never used.
for firmware in self.firmware:
fc7_dir = os.path.join(self.output_dir, firmware.getBoardName())
try:
os.makedirs(fc7_dir, exist_ok=True)
# Ensure files exist (open in append mode then close)
open(os.path.join(fc7_dir, "output.txt"), "a").close()
# open(os.path.join(fc7_dir, "error.txt"), "a").close()
except Exception:
logger.error(f"Failed creating output dir for {fc7_dir}")
logger.error(traceback.format_exc())

# Check if the test was aborted
if self.halt:
Expand Down Expand Up @@ -1434,9 +1438,16 @@ def on_readyReadStandardOutput(self, processIndex: int):
self.run_processes[processIndex].readAllStandardOutput().data().decode()
)

mode = "a" if os.path.exists(self.outputFile) else "w"
with open(self.outputFile, mode) as outputfile:
outputfile.write(alltext)
# Write output to the per-FC7 output file so multiple FC7s don't collide
try:
fc7name = self.firmware[processIndex].getBoardName()
outpath = os.path.join(self.output_dir, fc7name, "output.txt")
mode = "a" if os.path.exists(outpath) else "w"
with open(outpath, mode) as outputfile:
outputfile.write(alltext)
except Exception:
logger.error("Failed writing FC7 output to per-FC7 file")
logger.error(traceback.format_exc())
textline = alltext.split("\n")

for textStr in textline:
Expand Down Expand Up @@ -1747,10 +1758,15 @@ def on_readyReadStandardOutput_info(self, processIndex: int):
alltext = (
self.info_processes[processIndex].readAllStandardOutput().data().decode()
)

mode = "a" if os.path.exists(self.outputFile) else "w"
with open(self.outputFile, mode) as outputfile:
outputfile.write(alltext)
try:
fc7name = self.firmware[processIndex].getBoardName()
outpath = os.path.join(self.output_dir, fc7name, "output.txt")
mode = "a" if os.path.exists(outpath) else "w"
with open(outpath, mode) as outputfile:
outputfile.write(alltext)
except Exception:
logger.error("Failed writing FC7 info output to per-FC7 file")
logger.error(traceback.format_exc())
textline = alltext.split("\n")

for textStr in textline:
Expand All @@ -1768,8 +1784,14 @@ def on_readyReadStandardOutput_VDDsweep(self, process, fc7_index):
self.readingOutput = True

alltext = process.readAllStandardOutput().data().decode()
if hasattr(self, "outputfile") and self.outputfile:
self.outputfile.write(alltext)
try:
fc7name = self.firmware[fc7_index].getBoardName()
outpath = os.path.join(self.output_dir, fc7name, "output.txt")
with open(outpath, "a") as outputfile:
outputfile.write(alltext)
except Exception:
logger.error("Failed writing VDDsweep output to per-FC7 file")
logger.error(traceback.format_exc())
textline = alltext.split("\n")
for textStr in textline:
try:
Expand Down Expand Up @@ -1818,10 +1840,16 @@ def on_readyReadStandardOutput_GADC(

alltext = process.readAllStandardOutput().data().decode()

mode = "a" if os.path.exists(self.outputFile) else "w"
logger.debug(f"{mode=}")
with open(self.outputFile, mode) as outputfile:
outputfile.write(alltext)
try:
fc7name = self.firmware[fc7_index].getBoardName()
outpath = os.path.join(self.output_dir, fc7name, "output.txt")
mode = "a" if os.path.exists(outpath) else "w"
logger.debug(f"{mode=}")
with open(outpath, mode) as outputfile:
outputfile.write(alltext)
except Exception:
logger.error("Failed writing GADC output to per-FC7 file")
logger.error(traceback.format_exc())
textline = alltext.split("\n")

for textStr in textline:
Expand Down
Loading