diff --git a/Gui/python/TestHandler.py b/Gui/python/TestHandler.py index f132357c..ee327f8e 100644 --- a/Gui/python/TestHandler.py +++ b/Gui/python/TestHandler.py @@ -1000,7 +1000,7 @@ def setupQProcess(self): "-c", "{}".format(Test_to_Ph2ACF_Map[self.currentTest]), "-t", - "5", + "15", ], ) elif self.currentTest == "TrimbitScan": @@ -1234,7 +1234,7 @@ def saveTest(self, processIndex: int, process: QProcess): ) ) - elif "IVCurve" in self.currentTest or "IREF_GADC" in self.currentTest: + elif "IVCurve" in self.currentTest: print("copying MonitorDQM.root file to output directory") current_fc7: str = self.firmware[processIndex].getBoardName() os.system( @@ -1257,6 +1257,30 @@ def saveTest(self, processIndex: int, process: QProcess): ), ) ) + elif "IREF_GADC" in self.currentTest: + print("copying MonitorDQM.root file to output directory") + current_fc7: str = self.firmware[processIndex].getBoardName() + os.system( + "cp {0}/test/Results/Run{1}_MonitorDQM_Board_{2}*.root {3}/".format( #Chaneged from {0}/test/Results/Run{1}_MonitorDQM_Board_{2}*.root {3} + os.environ.get("PH2ACF_BASE_DIR"), + self.RunNumber, + self.firmware[processIndex].getBoardID(), + os.path.join( + self.output_dir, current_fc7 + ), + ) + ) + os.system( + "cp {0}/test/Results/Run{1}_CMSIT_{2}.xml {3}/".format( + os.environ.get("PH2ACF_BASE_DIR"), + self.RunNumber, + current_fc7, + os.path.join( + self.output_dir, current_fc7 + ), + ) + ) + else: ph2_acf_base_dir: str | None = os.environ.get("PH2ACF_BASE_DIR") if ph2_acf_base_dir is None: diff --git a/Gui/python/TestValidator.py b/Gui/python/TestValidator.py index f21a3a4d..35c687b6 100644 --- a/Gui/python/TestValidator.py +++ b/Gui/python/TestValidator.py @@ -95,6 +95,47 @@ def ResultGrader( f"{testIndexInSequence:02d}_{testName}", "sldo", ) + elif "Trimbit" in testName: + relevant_files = [ + outputDir + "/" + os.fsdecode(file) for file in os.listdir(outputDir) + ] + _1, _2 = felis.set_module( + module_name, + module_type.split(" ")[0], + module_type.split(" ")[2].replace("Quad", "2x2"), + module_version.strip("v"), + True, + ) + status, message, sanity, explanation = felis.set_result( + relevant_files, + module_name, + f"{testIndexInSequence:02d}_{testName}", + "trimbitscan", + ) + + elif "IREF" in testName: + relevant_files = [ + 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)]) + + print("relevant_files:", relevant_files) + _1, _2 = felis.set_module( + module_name, + module_type.split(" ")[0], + module_type.split(" ")[2].replace("Quad", "2x2"), + module_version.strip("v"), + True, + ) + status, message, sanity, explanation = felis.set_result( + relevant_files, + module_name, + f"{testIndexInSequence:02d}_{testName}", + "irefgadc", + ) + + elif "CommunicationTest" in testName: module_name = module_data["module"].getModuleName() comm_result = communicationTestResults.get(module_name) diff --git a/Gui/siteConfig.py b/Gui/siteConfig.py index dc7251db..ec5d4e5c 100644 --- a/Gui/siteConfig.py +++ b/Gui/siteConfig.py @@ -2,7 +2,7 @@ import logging from MonitoringSettings import Monitor_SleepTime -CONFIG_VER = 5 +CONFIG_VER = 6 # Customize the logging configuration logging.basicConfig( @@ -36,7 +36,7 @@ defaultArduino = "Arduino SA Uno R3 (CDC ACM) ACM0" #Coldbox variables -cooler = "Tessie" # "Peltier" or "Manual" or "Tessie". +cooler = "Manual" # "Peltier" or "Manual" or "Tessie". usePeltier = False #The "cooler" variable will be used in the future, but this line is needed for the current version of the GUI tessie_url = "http://coldbox:3000/" @@ -64,7 +64,7 @@ # Load instrument setup from json file # If the json filename contains 'auto', channels will be automatically assigned as listed in Working Channels -json_setup = 'jsonFiles/instruments_osu_auto.json' +json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json' with open(json_setup, 'r') as file: icicle_instrument_setup = json.load(file) @@ -83,7 +83,7 @@ "1x2":{ "voltage":2.98, "starting current":1.0, - "target current":5.6, + "target current":5.6, #set this back to 5.6 after testing "step size":.2 }, "quad":{ @@ -99,7 +99,7 @@ "1x2":{ "voltage":2.98, "starting current":3.6, - "target current":5.6, + "target current":5.6, #set this back to 5.6 after testing "step size":.2 }, "quad":{ @@ -143,7 +143,7 @@ ## Update this dictionary for your simple mode cable mappings ## CableMapping = { "0" : {"FC7": "fc7.board.1", "FMCID": "L12", "FMCPort": "0"}, - "1" : {"FC7": "fc7.board.2", "FMCID": "L12", "FMCPort": "0"}, + "1" : {"FC7": "fc7.board.1", "FMCID": "L12", "FMCPort": "0"}, } ## Establish thresholds for chip temperature readings. A chip reading above the diff --git a/Ph2_ACF b/Ph2_ACF index 8353502b..99b06c7f 160000 --- a/Ph2_ACF +++ b/Ph2_ACF @@ -1 +1 @@ -Subproject commit 8353502bfef575eba262bfab62829081cd8a9ac0 +Subproject commit 99b06c7f235f2568c1ecdce8c711503c4625d08c diff --git a/check_configuration_files.sh b/check_configuration_files.sh index d5b79561..b34df5a6 100644 --- a/check_configuration_files.sh +++ b/check_configuration_files.sh @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_VERSION=5 # Will need to change this by hand +REQUIRED_VERSION=6 # Will need to change this by hand # Loop over all files passed as arguments for FILE in "$@"; do diff --git a/felis b/felis index 9688c8d3..17d2d58f 160000 --- a/felis +++ b/felis @@ -1 +1 @@ -Subproject commit 9688c8d34bcabcfe94fcf7ef9bc1acd169c8d2c7 +Subproject commit 17d2d58fda2d7df607d17059fdc911f39bd42b2e diff --git a/icicle b/icicle index 92aeaf15..10f160a6 160000 --- a/icicle +++ b/icicle @@ -1 +1 @@ -Subproject commit 92aeaf1507bbe234b74fdf5c504b2f9fe046a1ff +Subproject commit 10f160a6f7341c285e2c5bde8a44536277b0a27e diff --git a/run_Docker.sh b/run_Docker.sh index ee0e1bd1..b03a5643 100644 --- a/run_Docker.sh +++ b/run_Docker.sh @@ -1,13 +1,13 @@ #!/bin/bash # DO NOT EDIT THIS BY HAND!!! -CONFIG_VER=5 +CONFIG_VER=6 bash check_configuration_files.sh run_Docker.sh Gui/siteConfig.py SOCK=/tmp/.X11-unix; XAUTH=/tmp/.docker.xauth; xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -; chmod 777 $XAUTH; ######### Specify the docker image to use ################# -IMAGE_NAME="osupixels/ph2_acf_gui_dev:v2.4.2" +IMAGE_NAME="osupixels/ph2_acf_gui_dev:v3-1-1" #IMAGE_NAME="majoyce2/ph2_acf_gui_purdue:latest" #IMAGE_NAME="majoyce2/ph2_acf_gui_user:latest" #IMAGE_NAME="local/testimagemay29user"