petal-qc 0.0.20__tar.gz → 0.0.21__tar.gz

{petal_qc-0.0.20 → petal_qc-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.20
+Version: 0.0.21
 Summary: A collection of scripts for Petal CORE QC.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/PetalReceptionTests.py

@@ -112,9 +112,9 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         self.create_test_box("Visual Inspection", "VISUAL_INSPECTION")
         self.create_test_box("Grounding", "GROUNDING_CHECK")
         self.create_test_box("Pipe bending", "BENDING120")
+        self.create_test_box("Delamination", "DELAMINATION")
         self.create_test_box("Weight", "PETAL_CORE_WEIGHT")
-        self.create_test_box("Bot. loc. Diam", "PETAL_CORE_LOC_DIAM")
-        self.create_test_box("Slot loc. Diam", "PETAL_CORE_SLOT_DIAM")
+        self.create_test_box("Metrology Template", "METROLOGY_TEMPLATE")
         self.create_test_box("X-rays", "XRAYIMAGING")
 
 

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/__init__.py

@@ -1,5 +1,5 @@
 """petal_qc python module."""
-__version__ = "0.0.20"
+__version__ = "0.0.21"
 
 
 def coreMetrology():

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/getPetalCoreTestSummary.py

@@ -3,6 +3,7 @@
 import json
 import sys
 import re
+import copy
 from argparse import ArgumentParser
 
 
@@ -42,10 +43,35 @@ def petalCoreTest(session, options):
         suff = options.institute
 
     core_list = session.get("listComponents", json=payload)
-    core_tests = ["PETAL_METROLOGY_FRONT", "PETAL_METROLOGY_BACK", "XRAYIMAGING", "THERMAL_EVALUATION", "BTTESTING"]
+
+    # We want details about these tests
+    core_tests = [
+        "PETAL_METROLOGY_FRONT",
+        "PETAL_METROLOGY_BACK",
+        "XRAYIMAGING",
+        "THERMAL_EVALUATION",
+        "BTTESTING",
+        "METROLOGY_TEMPLATE",
+        "PETAL_CORE_WEIGHT"
+    ]
+
+    # this is the full list
+    at_qc_tests = [
+        "VISUAL_INSPECTION",
+        "BTTESTING",
+        "GROUNDING_CHECK",
+        "BENDING120",
+        "THERMAL_EVALUATION",
+        "XRAYIMAGING",
+        "METROLOGY_TEMPLATE",
+        "PETAL_METROLOGY_FRONT",
+        "PETAL_METROLOGY_BACK",
+        "PETAL_CORE_WEIGHT",
+        "DELAMINATION",
+    ]
 
     do_check_stage = "AT_QC_SITE"
-    #do_check_stage = None
+    # do_check_stage = None
     petal_id_db = {}
 
     has_list = len(options.cores) != 0
@@ -76,19 +102,29 @@ def petalCoreTest(session, options):
                     return False
 
         print("\n\nPetal {} [{}] - {}. {}".format(SN, altid, coreStage, location))
-
-        test_list = session.get("listTestRunsByComponent", json={"filterMap":{"serialNumber": SN, "state": "ready", "testType":core_tests}})
-
+        test_status = {}
+        test_list = session.get("listTestRunsByComponent", json={"filterMap":{"serialNumber": SN, "state": "ready", "stage": "AT_QC_SITE", "testType":at_qc_tests}})
+        missing_tests = copy.deepcopy(at_qc_tests)
         for tst in test_list:
             ttype = tst["testType"]["code"]
-            if ttype not in core_tests:
-                print(ttype)
-                continue
+            if ttype in missing_tests:
+                missing_tests.remove(ttype)
+
+            #if ttype not in core_tests:
+            #    print(ttype)
+            #    continue
 
             T = session.get("getTestRun", json={"testRun": tst["id"]})
             if T["state"] != "ready":
                 print(T)
 
+
+            if ttype in test_status:
+                if int(T["runNumber"]) > int(test_status[ttype]["runNumber"]):
+                    test_status[ttype] = T
+            else:
+                test_status[ttype] = T
+
             print("-- {} [{}]".format(T["testType"]["name"], T["runNumber"]))
             if not T["passed"]:
                 print("\t## test FAILED")
@@ -96,12 +132,29 @@ def petalCoreTest(session, options):
             for D in T["defects"]:
                 print("\t{} - {}".format(D["name"], D["description"]))
 
+        passed = True
+        for ttype, T in test_status.items():
+            if not T["passed"]:
+                passed = False
+                break
+
+        if passed:
+            print("\n--- PASSED")
+        else:
+            print("\n*** FILED")
+
+        if options.show_missing:
+            print("missing tests:")
+            for tst in missing_tests:
+                print("-- {}".format(tst))
+
     with open("petal_ID_db_{}.json".format(suff), "w", encoding="utf-8") as fOut:
         json.dump(petal_id_db, fOut, indent=3)
 
 def main():
     """Main entry"""
     parser = ArgumentParser()
+    parser.add_argument("--show_missing", default=False, action="store_true", help="Show missing tests.")
     parser.add_argument("--institute", default=None, help="The petal current location")
     parser.add_argument("--cores", dest="cores", action=RangeListAction, default=[],
                         help="Create list of cores to analyze. The list is made with  numbers or ranges (ch1:ch2 or ch1:ch2:step) ")
@@ -121,4 +174,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-    

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/test/getAVStests.py

@@ -323,10 +323,10 @@ if __name__ == "__main__":
     parser.add_argument("--cores", dest="cores", action=RangeListAction, default=[],
                         help="Create list of cores to analyze. The list is made with  numbers or ranges (ch1:ch2 or ch1:ch2:step) ")
 
-    
+    opts = parser.parse_args()
     dlg = ITkDBlogin.ITkDBlogin()
     session = dlg.get_client()
 
-    main(session, options)
+    main(session, opts)
 
     dlg.die()

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/test/reportFromJSon.py

@@ -38,15 +38,17 @@ def main(options):
             data = json.load(fin)
 
         if not data["passed"]:
-            petalId = data["component"]
-            if petalId is None:
+            if data["component"] is None:
                 print("Petal {} has bad Serial number".format(petal_id))
-            if petal_id not in petal_cores:
-                petal_cores[petal_id] = {"FRONT": [], "BACK": []}
+                continue
+            
+            petalId = "{}-{}".format(petal_id, data["component"])
+            if petalId not in petal_cores:
+                petal_cores[petalId] = {"FRONT": [], "BACK": []}
 
             side = "FRONT" if "FRONT" in data["testType"] else "BACK"
             for D in data["defects"]:
-                petal_cores[petal_id][side].append("{}: {}".format(D["name"], D["description"]))
+                petal_cores[petalId][side].append("{}: {}".format(D["name"], D["description"]))
 
 
     keys = sorted(petal_cores.keys())

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/thermal/IRDataGetter.py

@@ -51,6 +51,7 @@ class IRDataGetter(object):
 
     def fine_tune_params(self, param):
         """Set default values for the parameters."""
+        param.sensor_max = -5
         return
 
     def get_IR_data(self, image, **kargs):
@@ -298,6 +299,7 @@ class IRDataDESY(IRDataGetter):
         """Set default values for the parameters."""
         param.distance = 16
         param.width = 16
+        param.sensor_max = -5
 
     def get_IR_data(self, image, **kargs):
         """Get the data from the image in the proper orientation.

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/thermal/IRPetalParam.py

@@ -1,5 +1,5 @@
 """Parameters needed for the thermal analysis of the petal."""
-
+import sys
 
 class IRPetalParam(object):
     """Default values for IR image handling."""
@@ -30,6 +30,9 @@ class IRPetalParam(object):
         self.graphana = None      # Graphana server
         self.save_pipes = False   # If true save pipe path
         self.legend = True        # if false do not plot legend
+        self.sensor_min = -sys.float_info.max # cut on lower temp for sensor contour average
+        self.sensor_max = sys.float_info.max # cut on higher temp for sensor contour average
+
 
         if values is not None:
             self.set_values(values)
@@ -79,4 +82,5 @@ class IRPetalParam(object):
         parser.add_argument("--report", action="store_true", default=False, help="True if figures kept for the report.")
         parser.add_argument("--save_pipes", default=False, action="store_true", help="SAve pipe path. Output is alias_pipe-i.txt")
         parser.add_argument("--no-legend", dest="legend", action="store_false", default=True, help="Do not show the legend in plots.")
-
+        parser.add_argument("--sensor_min", dest="sensor_min", default=P.sensor_min, help="cut on lower temp for sensor contour average")
+        parser.add_argument("--sensor_max", dest="sensor_max", default=P.sensor_max, help="cut on higher temp for sensor contour average")

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/thermal/Petal_IR_Analysis.py

@@ -88,7 +88,7 @@ def analyze_IR_image(img, pipe, sensors, iside, params) -> AnalysisResult:
     Savg = []
     Sstd = []
     for S in sensors:
-        avg, std = contours.get_average_in_contour(img, S)
+        avg, std = contours.get_average_in_contour(img, S, tmin=params.sensor_min, tmax=params.sensor_max)
         Savg.append(avg)
         Sstd.append(std)
 

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc/thermal/contours.py

@@ -8,6 +8,8 @@ import random
 import sys
 
 import matplotlib.path as mplPath
+import matplotlib.pyplot as plt
+
 import numpy as np
 
 from petal_qc.utils.Geometry import Point, remove_outliers_indx
@@ -258,8 +260,46 @@ def in_contour(x, y, C):
     path = mplPath.Path(C)
     return path.contains_point(x, y, C)
 
+def show_contour_values(img, C):
+    """Creates an image of the contour values.
+
+    Args:
+    ----
+        img: The image
+        C: The contour
+
+
+    """
+    values = []
+    path = mplPath.Path(C)
+    my, mx = img.shape
+    min_x, min_y, max_x, max_y = contour_bounds(C)
+    imin_x = int(min_x)
+    imin_y = int(min_y)
+    chst = np.zeros([int(max_y-min_y+2), int(max_x-min_x+2)])
+    for ix in range(int(min_x), int(max_x+1)):
+        if ix < 0 or ix >= mx:
+            continue
+
+        for iy in range(int(min_y), int(max_y)+1):
+            if iy < 0 or iy >= my:
+                continue
+
+            if path.contains_point([ix, iy]):
+                chst[iy-imin_y, ix-imin_x] = img[iy, ix]
+                values.append(img[iy, ix])
+
+    values = np.array(values)
+    mean = np.mean(values)
+    std = np.std(values)
 
-def get_average_in_contour(img, C, remove_outliers=None):
+    fig, ax = plt.subplots(nrows=1,ncols=2)
+    ax[0].hist(values, 25, range=(mean-3*std, mean+3*std))
+    pcm = ax[1].imshow(chst, origin='lower', vmin=mean-3*std, vmax=mean+3*std)
+    fig.colorbar(pcm, ax=ax[1])
+
+
+def get_average_in_contour(img, C, tmin=sys.float_info.min, tmax=sys.float_info.max, remove_outliers=None):
     """Gets average and std of points within contour.
 
     We are assuming here that coordinates are integers, ie,
@@ -269,7 +309,8 @@ def get_average_in_contour(img, C, remove_outliers=None):
     ----
         img: The image
         C: The contour
-        remove_outliers: If an int, 
+        tmin, tmax: only values in range [tmin, tmax] will be considered
+        remove_outliers: If an int,
 
     Returns
     -------
@@ -289,7 +330,9 @@ def get_average_in_contour(img, C, remove_outliers=None):
                 continue
 
             if path.contains_point([ix, iy]):
-                values.append(img[iy, ix])
+                val = img[iy, ix]
+                if val > tmin and val < tmax:
+                    values.append(val)
 
     values = np.array(values)
     if remove_outliers is not None and isinstance(remove_outliers, (int, float)):

{petal_qc-0.0.20 → petal_qc-0.0.21}/petal_qc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.20
+Version: 0.0.21
 Summary: A collection of scripts for Petal CORE QC.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{petal_qc-0.0.20 → petal_qc-0.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "petal_qc"
-version = "0.0.20"
+version = "0.0.21"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]