preparing for releasing v3-1-1

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:

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)

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

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

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"