petal-qc 0.0.19__py3-none-any.whl → 0.0.20__py3-none-any.whl

petal_qc/__init__.py

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

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/test/reportFromJSon.py

@@ -6,23 +6,47 @@ 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 fnam in options.files:
-        ifile = Path(fnam).expanduser().resolve()
-        with open(ifile, "r", encoding="utf-8") as fin:
+    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 not in petal_cores:
-                petal_cores[petalId] = {"FRONT": [], "BACK": []}
+            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[petalId][side].append("{}: {}".format(D["name"], D["description"]))
+                petal_cores[petal_id][side].append("{}: {}".format(D["name"], D["description"]))
 
 
     keys = sorted(petal_cores.keys())
@@ -40,12 +64,15 @@ def main(options):
 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()
     
-    from petal_qc.utils.all_files import all_files
     
+    folder = Path("/tmp/petal-metrology/results")
+    # folder = Path("~/tmp/petal-metrology/Production/Results").expanduser()
     opts.files = []
-    for fnam in all_files(Path("~/tmp/petal-metrology/Production/Results").expanduser(), "*.json"):
+    for fnam in all_files(folder, "*.json"):
         opts.files.append(fnam)
     
     main(opts)

{petal_qc-0.0.19.dist-info → petal_qc-0.0.20.dist-info}/METADATA

@@ -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.dist-info → petal_qc-0.0.20.dist-info}/RECORD

@@ -1,5 +1,5 @@
 petal_qc/PetalReceptionTests.py,sha256=cSrq4PUjdV7T16ARonhsnXWPBBRuvliTKlZwEPfgRVY,10832
-petal_qc/__init__.py,sha256=lyJtmxO016y5gjORoAZhL6k14_G8Q_sAFhTvxOZYrsc,1595
+petal_qc/__init__.py,sha256=wWhkImfHsRq6bdiB9KpR1wF1DsTymn7ydqz71fLtYWw,1595
 petal_qc/dashBoard.py,sha256=U_UHNMca3H2ogD4a0Vpe4ZVUKEv2-xmGZQEZ9_aH0E4,4034
 petal_qc/getPetalCoreTestSummary.py,sha256=hTv4A8gcEkvCZLcy9ZkpwOevksz6LfK1Rb1-4ENlC7I,3706
 petal_qc/BTreport/CheckBTtests.py,sha256=CoKTnW_7gbL42rVaBy9FnH1SEYifmgg1P5Iy253vDFk,9855
@@ -21,7 +21,7 @@ petal_qc/metrology/data2csv.py,sha256=2ttMSmfGLPIaOqZGima2dH6sdnSRAFTHlEbSOfW5eb
 petal_qc/metrology/do_Metrology.py,sha256=wA3fKJrdDLGYd0lEi8uSP9uRwQeS59nX6F4VtNnm9LM,4356
 petal_qc/metrology/flatness4nigel.py,sha256=SUHwn6pCEUWQV_62-_9-VKrmUdL4gVQcSA3aTtYq958,4071
 petal_qc/metrology/gtkutils.py,sha256=1pOTxiE2EZR9zNNNT5cOetga_4NG9DzLaqQPI4c1EzE,3372
-petal_qc/metrology/petal_flatness.py,sha256=KksOFO_ZrKM4nUDHRC-3mSm1tp5C7wkE_6f9ZiH9B70,10610
+petal_qc/metrology/petal_flatness.py,sha256=f8UqAmwbSkOngFbwekeGq6cX5flSkd7JNhCYRIn39LE,10695
 petal_qc/metrology/readAVSdata.py,sha256=6GRUac9b3iOoVoGfWr6rsNj1smsw9aT0tu5wuNuumAE,25615
 petal_qc/metrology/show_data_file.py,sha256=yZPcmMy-1EWWySiBBx0hNB3tPVh19bTr0PDaXSyIF4c,4057
 petal_qc/metrology/testSummary.py,sha256=0BhcEd1BPz2Mbonzi8nyZOzNSzpUqowBFNl5cVutqsk,994
@@ -39,7 +39,7 @@ petal_qc/test/getAVSjson.py,sha256=o8AYtyr7Vnp-enznmQ-NNiivZipmxtoVrmsfnRCl0X4,9
 petal_qc/test/getAVStests.py,sha256=GNqEpncUQdvo-qSf46ltGVeezSnHB2BQsKjApS6xomY,10285
 petal_qc/test/listPetalCoreComponents.py,sha256=7U9wokRkgeZdYZKeZdAadA32BlhVK6okInuh94hmj24,2502
 petal_qc/test/prepareDESYfiles.py,sha256=uRir2fv0oGqB6hKnIqRltDW-oLz1tR2SDvVkMVxCfKI,4106
-petal_qc/test/reportFromJSon.py,sha256=3YTuWeeVtw5pITloLlwEYbx84f6k9XC_jTBK53I4mLM,1456
+petal_qc/test/reportFromJSon.py,sha256=GHx4Jk5_DTGiaxUd98mdnuFePsCqrJ_v86ufF0_wCBs,2296
 petal_qc/test/test_Graphana.py,sha256=4wADxS_ObG9n4vsCvD1GwPQnx8bFUiUOS6ZwK83wTl8,1082
 petal_qc/test/test_coreThermal.py,sha256=YRPK3DGG7Tz66K4Kka3euXgUDzW_JlIqSYicMBhb96E,1516
 petal_qc/thermal/CSVImage.py,sha256=Vt2kYmUsZWkQvxcF8fDda3HO1Rb29kPQHnEoHFCqWYo,2038
@@ -72,8 +72,8 @@ petal_qc/utils/docx_utils.py,sha256=zVmSKHDVE8cUwbXxqyPtgS0z62VCFya1DWklOpO1rCQ,
 petal_qc/utils/fit_utils.py,sha256=3KUGWpBMV-bVDkQHWBigXot8chOpjAVBJ5H5b5dbdjk,5349
 petal_qc/utils/readGraphana.py,sha256=YVOztJC3q3P7F0I9Ggeiu6Mv9rZLKgj3clkLCU7k4i4,1918
 petal_qc/utils/utils.py,sha256=CqCsNIcEg6FQb3DN70tmqeLVLlQqsRfDzhfGevlnfBc,4035
-petal_qc-0.0.19.dist-info/METADATA,sha256=APlvpqVgGnSabKIK89z6KHFwbUZIWZi4mckoVETXxrc,953
-petal_qc-0.0.19.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-petal_qc-0.0.19.dist-info/entry_points.txt,sha256=YPrZOsRBRsiKNDvsnbug0-Khj7DcN_Sdpq-tB_XjykI,505
-petal_qc-0.0.19.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
-petal_qc-0.0.19.dist-info/RECORD,,
+petal_qc-0.0.20.dist-info/METADATA,sha256=EHoZu8c1KUKkam4HCqJRmWP3cnu-AjydFTB4edKmmCI,953
+petal_qc-0.0.20.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+petal_qc-0.0.20.dist-info/entry_points.txt,sha256=YPrZOsRBRsiKNDvsnbug0-Khj7DcN_Sdpq-tB_XjykI,505
+petal_qc-0.0.20.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
+petal_qc-0.0.20.dist-info/RECORD,,

{petal_qc-0.0.19.dist-info → petal_qc-0.0.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any