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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.19
+Version: 0.0.20
 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.19 → petal_qc-0.0.20}/petal_qc/__init__.py

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

{petal_qc-0.0.19 → petal_qc-0.0.20}/petal_qc/metrology/petal_flatness.py

@@ -24,10 +24,10 @@ from petal_qc.utils.Geometry import fit_plane
 from petal_qc.utils.Geometry import flatness_conhull, flatness_LSPL
 from petal_qc.utils.Geometry import project_to_plane
 
-from .analyze_locking_points import analyze_locking_point_data, locking_point_positions
-from .analyze_locking_points import remove_outliers
-from .Cluster import cluster_points
-from .show_data_file import show_data, TOP_VIEW
+from petal_qc.metrology.analyze_locking_points import analyze_locking_point_data, locking_point_positions
+from petal_qc.metrology.analyze_locking_points import remove_outliers
+from petal_qc.metrology.Cluster import cluster_points
+from petal_qc.metrology.show_data_file import show_data, TOP_VIEW
 
 figure_width = 14
 
@@ -132,7 +132,7 @@ def petal_flatness(orig_data, options, document=None):
 
     # group points by sensors.
     sensor_dict = {0: "R0", 10: "R1", 20: "R2", 30: "R3_0", 31: "R3_1", 40: "R4_0", 41: "R4_1", 50: "R5_0", 51: "R5_1"}
-    sensors, *_ = group_by_sensors(M, options.is_front, False)
+    sensors, *_ = group_by_sensors(M, options.is_front, True)
     all_data = np.vstack(list(sensors.values()))
 
     fig = show_data(all_data, "All points in core", view=TOP_VIEW, surf=False)
@@ -257,7 +257,7 @@ def get_iring(P, is_front):
     return -1
 
 
-def group_by_sensors(Min, is_front=True, remove_outliers=False):
+def group_by_sensors(Min, is_front=True, no_outliers=False):
     """Groups data points by sensors."""
     # Now move in Y to be on the ATLAS reference
     M = np.array(Min)
@@ -275,10 +275,11 @@ def group_by_sensors(Min, is_front=True, remove_outliers=False):
         else:
             sensors.setdefault(iring, []).append(P)
 
-    if remove_outliers:
+    if no_outliers:
         for key, val in sensors.items():
-            if remove_outliers:
-                sensors[key] = remove_outliers(sensors[key][:, 2], 0.075)
+            points = np.vstack(val)
+            indx = remove_outliers(points[:, 2])
+            sensors[key] = points[indx, :]
 
     return sensors, np.array(other)
 

petal_qc-0.0.20/petal_qc/test/reportFromJSon.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+"""List failing cores from JSon files."""
+import sys
+import argparse
+from pathlib import Path
+import json
+
+
+try:
+    import petal_qc
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from petal_qc.utils.ArgParserUtils import RangeListAction
+from petal_qc.utils.all_files import all_files
+
+
+
+def main(options):
+    """main entry."""
+    petal_cores = {}
+    for fpath in options.files:
+        fnam = str(fpath)
+        if "PPC." not in fnam:
+            continue
+
+        ipos = fnam.find("PPC")
+        lpos = fnam[ipos:].find("-")
+        petal_id = fnam[ipos:ipos+lpos]
+        pid = int(petal_id[4:])
+        
+        if len(options.cores)>0 and pid not in options.cores:
+            continue
+
+        with open(fpath, "r", encoding="utf-8") as fin:
+            data = json.load(fin)
+
+        if not data["passed"]:
+            petalId = data["component"]
+            if petalId is None:
+                print("Petal {} has bad Serial number".format(petal_id))
+            if petal_id not in petal_cores:
+                petal_cores[petal_id] = {"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"]))
+
+
+    keys = sorted(petal_cores.keys())
+    for petalId in keys:
+        print(petalId)
+        for side in ["FRONT","BACK"]:
+            if len(petal_cores[petalId][side])>0:
+                print("+-", side)
+            for D in petal_cores[petalId][side]:
+                print("  ", D)
+
+        print("\n")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument('files', nargs='*', help="Input files")
+    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()
+    
+    
+    folder = Path("/tmp/petal-metrology/results")
+    # folder = Path("~/tmp/petal-metrology/Production/Results").expanduser()
+    opts.files = []
+    for fnam in all_files(folder, "*.json"):
+        opts.files.append(fnam)
+    
+    main(opts)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.19
+Version: 0.0.20
 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.19 → petal_qc-0.0.20}/pyproject.toml

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

petal_qc-0.0.19/petal_qc/test/reportFromJSon.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-"""List failing cores from JSon files."""
-import sys
-import argparse
-from pathlib import Path
-import json
-
-
-
-def main(options):
-    """main entry."""
-    petal_cores = {}
-    for fnam in options.files:
-        ifile = Path(fnam).expanduser().resolve()
-        with open(ifile, "r", encoding="utf-8") as fin:
-            data = json.load(fin)
-
-        if not data["passed"]:
-            petalId = 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[petalId][side].append("{}: {}".format(D["name"], D["description"]))
-
-
-    keys = sorted(petal_cores.keys())
-    for petalId in keys:
-        print(petalId)
-        for side in ["FRONT","BACK"]:
-            if len(petal_cores[petalId][side])>0:
-                print("+-", side)
-            for D in petal_cores[petalId][side]:
-                print("  ", D)
-
-        print("\n")
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument('files', nargs='*', help="Input files")
-    opts = parser.parse_args()
-    
-    from petal_qc.utils.all_files import all_files
-    
-    opts.files = []
-    for fnam in all_files(Path("~/tmp/petal-metrology/Production/Results").expanduser(), "*.json"):
-        opts.files.append(fnam)
-    
-    main(opts)