petal-qc 0.0.21__py3-none-any.whl → 0.0.22__py3-none-any.whl

petal_qc/thermal/PipeFit.py

@@ -357,7 +357,7 @@ class PipeFit(object):
             dst, P = contours.find_closest_point(X[0], X[1], self.cpipe)
             D[i, :] = P - X
             ddd[i] = dst
-            W = 1 + 1.6*(y_max - X[1])/height
+            W = 1 + 2*(y_max - X[1])/height
             weights[i] = W
             sum_weights += W
 
@@ -369,7 +369,7 @@ class PipeFit(object):
             res = np.dot(ddd, weights)/sum_weights
 
         if self.debug:
-            dbg_ax. clear()
+            dbg_ax.clear()
             dbg_ax.plot(self.cpipe[:, 0], self.cpipe[:, 1])
             dbg_ax.plot(out[:, 0], out[:, 1])
             dbg_ax.set_title("area {:3f} dist {:.3f}".format(real_area, np.sum(ddd)/npts))
@@ -420,7 +420,7 @@ class PipeFit(object):
 
         return res
 
-    def fit(self, data, M0=None, factor=1.0):
+    def fit(self, data, M0=None, factor=1.0, simplify=True):
         """Do the fit.
 
         Args:
@@ -451,12 +451,15 @@ class PipeFit(object):
                 print("\n** Initial guess")
                 self.print_transform(M)
         else:
-            M = M0
+            M = M0[0:5]
 
         self.core_center, self.core_band = self.get_data_center(data)
 
-
-        self.data = contours.contour_simplify(data, 1.25*factor)
+        if simplify:
+            self.data = contours.contour_simplify(data, 1.25*factor)
+        else:
+            self.data = np.array(data)
+            
         # self.data = data
         verbose = 0
         if self.debug:
@@ -482,9 +485,9 @@ class PipeFit(object):
         self.R = M
         return M
 
-    def fit_ex(self, data, limit=5e6, factor=1):
+    def fit_ex(self, data, M0=None, limit=5e6, factor=1, simplify=True):
         """Does the regular fit and tries to correct."""
-        R = self.fit(data, factor=factor)
+        R = self.fit(data, factor=factor, M0=M0, simplify=simplify)
 
         # Check for an offset...
         if self.res.cost > limit:

petal_qc/thermal/PipeIterFit.py

@@ -0,0 +1,74 @@
+import sys
+from pathlib import Path
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+
+cwd = Path(__file__).parent
+if cwd.exists():
+    sys.path.insert(0, cwd.as_posix())
+
+from petal_qc.thermal import PipeFit, contours
+
+
+class PipeIterFit:
+    """makes an iterative fit removing outliers in each iteration."""
+
+    def __init__(self, data):
+        """Initialize class."""
+        self.data = data
+        ptype = PipeFit.PipeFit.guess_pipe_type(data)
+        self.PF = PipeFit.PipeFit(ptype)
+
+    def remove_outsiders(self, data, thrs):
+        """Removes points which are further than thrs from the fit."""
+        D = np.zeros(len(data))
+        out = self.PF.transform_data(data, self.PF.R)
+        i = 0
+        for x, y in out:
+            dst, P = contours.find_closest_point(x, y, self.PF.pipe)
+            D[i] = dst
+            i += 1
+
+        indx = np.where(D < thrs)[0]
+        return np.array(data[indx, :])
+
+    def fit(self, threshold=20, factor=1.0):
+        total_data = self.data
+        data_size = len(total_data)
+
+        fig, ax = plt.subplots(1, 1, tight_layout=True)
+
+        M0 = self.PF.fit_ex(total_data, factor=factor)
+        sample_data = self.remove_outsiders(self.PF.data, threshold)
+        last_size = len(sample_data)
+
+        # Adaptively determining the number of iterations
+        while True:
+            M0 = self.PF.fit_ex(sample_data, M0=M0, factor=factor, simplify=False)
+
+            out = self.PF.transform_data(self.PF.data, M0)
+            D = []
+            for x, y in out:
+                dst, P = contours.find_closest_point(x, y, self.PF.pipe)
+                D.append(dst)
+
+            ax.clear()
+            ax.hist(D)
+            plt.draw()
+            plt.pause(0.0001)
+            self.PF.plot()
+
+            sample_data = self.remove_outsiders(self.PF.data, 20)
+            sample_size = len(sample_data)
+            if sample_size == last_size:
+                break
+
+            last_size = sample_size
+
+        self.PF.plot()
+        return M0
+
+    def plot(self):
+        self.PF.plot()

petal_qc/thermal/create_IRCore.py

@@ -21,7 +21,7 @@ from petal_qc.thermal import IRBFile
 from petal_qc.thermal import IRCore
 from petal_qc.thermal import IRPetal
 from petal_qc.thermal import Petal_IR_Analysis
-from petal_qc.thermal import PipeFit
+from petal_qc.thermal import PipeFit, PipeIterFit
 from petal_qc.thermal.PetalColorMaps import HighContrast
 from petal_qc.thermal.IRDataGetter import IRDataGetter
 from petal_qc.thermal.IRPetalParam import IRPetalParam
@@ -182,8 +182,13 @@ def create_IR_core(options):
             ofile = output_folder(options.folder, "{}_pipe_{}.txt".format(prfx, pipe_type))
             np.savetxt(ofile, pipes[i])
 
-        PF = PipeFit.PipeFit(pipe_type)
-        R = PF.fit_ex(pipes[i], factor=getter.factor)
+        #PF = PipeFit.PipeFit(pipe_type)
+        #R = PF.fit_ex(pipes[i], factor=getter.factor)
+        
+        iPF = PipeIterFit.PipeIterFit(pipes[i])
+        PF = iPF.PF
+        R = iPF.fit(factor=getter.factor, threshold=12*getter.factor)
+        
         if options.debug or options.report:
             _X = all_3d_points[i][:, 0]
             _Y = all_3d_points[i][:, 1]

petal_qc/uploadXrays.py

@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+"""Test dashboard."""
+import os
+import sys
+import copy
+from pathlib import Path
+from argparse import ArgumentParser
+
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+    import itkdb_gtk
+
+from itkdb_gtk import ITkDBlogin, ITkDButils, UploadTest
+from petal_qc.utils.ArgParserUtils import RangeListAction
+
+
+HOME=os.getenv("HOME")
+cloud=Path("{}/Nextcloud/ITk/5-Petal_cores".format(HOME))
+
+def uploadXrays(session, options):
+    """Upload Xray tests."""
+    if len(options.cores) == 0:
+        print("I need a list of cores.")
+        return
+
+    defaults = {
+            "institution": "IFIC",
+            "runNumber": "1",
+        }
+
+    dto = ITkDButils.get_test_skeleton(session, "CORE_PETAL", "XRAYIMAGING", defaults)
+    dto["properties"]["OPERATOR"]="Nico"
+    dto["properties"]["MACHINEID"]="Xray"
+    
+    for core in options.cores:
+        petal_id = "PPC.{:03d}".format(core)
+        try:
+            obj = ITkDButils.get_DB_component(session, petal_id)
+            SN = obj["serialNumber"]
+
+        except Exception as E:
+            print("Could not find {} in DB:\n{}".format(petal_id, E))
+            continue
+
+        values = copy.deepcopy(dto)
+        print("Petal {}".format(petal_id))
+        values["component"] = SN
+
+        image = cloud / petal_id / "Rx_{}.png".format(petal_id)
+        if not image.exists():
+            print("Xray image does not esxist.\n\t{}".format(image))
+            continue
+
+        A = ITkDButils.Attachment(path=image.as_posix(), title=image.name, desc="X-ray image")
+        values["results"]["IMAGELINK"] = image.name
+        uploadW = UploadTest.UploadTest(session, values, [A, ])
+
+
+
+def main():
+    """Main entry"""
+    parser = ArgumentParser()
+    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) ")
+    options = parser.parse_args()
+
+    # ITk_PB authentication
+    dlg = ITkDBlogin.ITkDBlogin()
+    session = dlg.get_client()
+
+    try:
+        uploadXrays(session, options)
+
+    except Exception as E:
+        print(E)
+
+    dlg.die()
+
+
+
+if __name__ == "__main__":
+    main()

{petal_qc-0.0.21.dist-info → petal_qc-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.21
+Version: 0.0.22
 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.21.dist-info → petal_qc-0.0.22.dist-info}/RECORD

@@ -1,22 +1,24 @@
 petal_qc/PetalReceptionTests.py,sha256=xFFqh_TYVXOWP0H1Q4I8V8sP8p8_w5tCCrhtENN7yvM,10825
-petal_qc/__init__.py,sha256=J6xF3JrSVAdwmg2ezs6nGmQ_uRs4vyV86I9VNZOC3kU,1595
+petal_qc/__init__.py,sha256=ltg8iE7hMGTw0UPsUVJo4An7tiOxiDvom962DOfjNOs,1736
 petal_qc/dashBoard.py,sha256=U_UHNMca3H2ogD4a0Vpe4ZVUKEv2-xmGZQEZ9_aH0E4,4034
-petal_qc/getPetalCoreTestSummary.py,sha256=obHSMwdFc6Y51TaFxb1Gj5s0mfgVWZljUTz83Lt8T5w,5130
+petal_qc/getPetalCoreTestSummary.py,sha256=OnvX5zFfyfnLhmPy84kZq2XkfOH5DaDrYSXpiwrmln8,5436
+petal_qc/readTemplateTable.py,sha256=zh6j_g_AYKCJ4ajmGEoy9KI9giL7tBhZdpbUE8s2b7I,8405
+petal_qc/uploadXrays.py,sha256=j_iKGjxWAKLGTFVXivwdnhsleTuYcR4zvuSWxwzCGKU,2289
 petal_qc/BTreport/CheckBTtests.py,sha256=CoKTnW_7gbL42rVaBy9FnH1SEYifmgg1P5Iy253vDFk,9855
 petal_qc/BTreport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 petal_qc/BTreport/bustapeReport.py,sha256=M0EZQEh8G-65p6-gCOyZ0WlvnRbzQHXPwAWta9ZExnQ,6907
 petal_qc/metrology/Cluster.py,sha256=UtZ5q1EFb8f3qC0hEYBbhRg2pPbW_28aJX2EEMu00Ho,2105
 petal_qc/metrology/DataFile.py,sha256=PbFqy3-WSj69epV5EjhHc1GKhA8I74FmJYOXUjN0V20,1367
-petal_qc/metrology/PetalMetrology.py,sha256=ZEJnkR2vjNmbH7SChPtSsC1YNKgFwfa9YkHc1XNleK8,12333
+petal_qc/metrology/PetalMetrology.py,sha256=zTJ5xSGz5d9flDvnQpQnq5cWvNMP5DXJkhDw_SmLFEU,12748
 petal_qc/metrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 petal_qc/metrology/all2csv.py,sha256=KTgEGaediylwkGN7gyWyQqUjU0f9FOa3xF4z1W38EcU,1569
-petal_qc/metrology/analyze_locking_points.py,sha256=83f8nNgmXWClQnIG1plu3YYuxNmeEeTu8VKJE9izw70,20531
+petal_qc/metrology/analyze_locking_points.py,sha256=1uUN4dfBDk9NopQxyLePJ8r_qJHcsxogB1M4z7FZh6g,20912
 petal_qc/metrology/cold_noise.py,sha256=PuTaQ73WrQCJdE9ezS4UFmA3atwCuvM0ZsUOYu1ZIBw,3106
-petal_qc/metrology/compare_Cores.py,sha256=dP0i_C_VrM4s3i0RrI2g4ZcjRmgIHlAgodhGS87YYgw,9458
+petal_qc/metrology/compare_Cores.py,sha256=7t6RJ2QiJl-zmNG886jSLswS8rhD4zgipZlxjz7oTbM,9931
 petal_qc/metrology/comparisonTable.py,sha256=6Zmh-x0ahs28ZJQuHMrIiRcblUmTN1_-1otFSRNMPds,1743
 petal_qc/metrology/convert_mitutoyo.py,sha256=tpnB_fHBR8PpJeb7_q9foYKGNDRhJzxHNemmpfbSt8E,5650
 petal_qc/metrology/convert_smartscope.py,sha256=0vAEYn7ec4qTnLfjphj1QA6tK3vZsXyF6nYYj3jE5Yc,6174
-petal_qc/metrology/coreMetrology.py,sha256=rGzCyPqlfsnh2XUUDiykQFlRt3kkFkrQqVOhOJUNhyU,13427
+petal_qc/metrology/coreMetrology.py,sha256=Dg5aVLOQzdl1IK15iugtnsqKks1ydePelkWFuFH5MUc,12962
 petal_qc/metrology/data2csv.py,sha256=2ttMSmfGLPIaOqZGima2dH6sdnSRAFTHlEbSOfW5ebA,1809
 petal_qc/metrology/do_Metrology.py,sha256=wA3fKJrdDLGYd0lEi8uSP9uRwQeS59nX6F4VtNnm9LM,4356
 petal_qc/metrology/flatness4nigel.py,sha256=SUHwn6pCEUWQV_62-_9-VKrmUdL4gVQcSA3aTtYq958,4071
@@ -25,9 +27,9 @@ petal_qc/metrology/petal_flatness.py,sha256=f8UqAmwbSkOngFbwekeGq6cX5flSkd7JNhCY
 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
-petal_qc/metrology/test_paralelism.py,sha256=_j__OdUwdXWM494_9HpGPuPHixMwwVphCcvHEfzWi_k,1981
-petal_qc/metrology/uploadPetalInformation.py,sha256=K2hHXmoQ-qi5HLTmFNn5jVsZDDXX88psGV-XIRgx1kA,26728
-petal_qc/test/analyzeMetrologyTable.py,sha256=_ipKV8-rXgLca5Bu3ATLZjGR5koFN4-qwpj88rgf-x0,3098
+petal_qc/metrology/test_paralelism.py,sha256=Ij9WlHxyG8It3JqdCVVIWPeuv1OjBGeOsLkD44V2h5A,2024
+petal_qc/metrology/uploadPetalInformation.py,sha256=EM2ThfXxVbZYXMxUuzTcKeGnh3SjOHQUzk09AwK80hI,27560
+petal_qc/test/analyzeMetrologyTable.py,sha256=hYyDGm7yns5i5SS6--DZfDX4bXbCEvilYPKk1Nm54e0,6759
 petal_qc/test/checkAVStests.py,sha256=0xAJLazfkgfQ0ouc17fivaj69OXTiS9sali0DhH-jTs,4814
 petal_qc/test/checkCoreShipments.py,sha256=d9W_uE0tMdfJGRuiiTOGyIW60SIj08QKWjd3Y8aVBi8,1554
 petal_qc/test/compare_golden.py,sha256=lG1rtYLw_PwKWrLk0VVdbnRhi7Ytu78q7PGWcYptM_8,1171
@@ -39,7 +41,8 @@ petal_qc/test/getAVSjson.py,sha256=o8AYtyr7Vnp-enznmQ-NNiivZipmxtoVrmsfnRCl0X4,9
 petal_qc/test/getAVStests.py,sha256=MsphZFxiPLCo6gf1ZTQ5Sy415rF35NgvF13OGagunV0,10308
 petal_qc/test/listPetalCoreComponents.py,sha256=7U9wokRkgeZdYZKeZdAadA32BlhVK6okInuh94hmj24,2502
 petal_qc/test/prepareDESYfiles.py,sha256=uRir2fv0oGqB6hKnIqRltDW-oLz1tR2SDvVkMVxCfKI,4106
-petal_qc/test/reportFromJSon.py,sha256=WKb6M_TDvQV7XzaJgElQNORXBiu31zJNp45ulNSl7kk,2367
+petal_qc/test/reportFromJSon.py,sha256=raF83IArZusR5kh7Lg-Q_3SoHJuM5hPpnnLYgrKBHlQ,2366
+petal_qc/test/testMitutoyo.py,sha256=xN0H13rmcpGbXDLBjccNL8ybdevu-j_gMnracY29ONg,228
 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
@@ -48,16 +51,17 @@ petal_qc/thermal/DebugPlot.py,sha256=OmREFwNDAKgoObDmcgHrB4d8m3bf2znfsKVGsb5rBGQ
 petal_qc/thermal/IRBFile.py,sha256=_no8iUyuSQ41j34o3LVzUCjMYoviwjz02tsWvFsTUzA,23462
 petal_qc/thermal/IRCore.py,sha256=sidf7HtrzEUcllv0E_o1Hks-2_2dl4Og_LWcwgPNRcE,3062
 petal_qc/thermal/IRDataGetter.py,sha256=px9nFTuDPuwaSkhfA3wT52_3UhwVdD1BtB494poqIp4,11639
-petal_qc/thermal/IRPetal.py,sha256=hVOD0VAKTA2xvNXbZ-TXAYHNlihNWsUkI2i9IEwQhZk,40887
+petal_qc/thermal/IRPetal.py,sha256=Im3Xa1ADAzuCKLEzl9i40qOMvfLCGJ8dopA2jGVT7zU,41638
 petal_qc/thermal/IRPetalParam.py,sha256=u-1tUxjWnLYr7mbdKEtnMssJep-AS7e7HCaUGwu99C8,4682
 petal_qc/thermal/PetalColorMaps.py,sha256=6CvJHzRdojLHu3BROYSekHw8g_BJ1lJ_edyhovTIydU,3831
 petal_qc/thermal/Petal_IR_Analysis.py,sha256=BrTii0GZ6KsNM65JUpfRNgOjsR1b2vFJUf0AyskTe3g,3998
-petal_qc/thermal/PipeFit.py,sha256=8nEjpZC1mWh4-bhXzwXfjO8WkC_6hFYX0XXPjTHwNUw,18345
+petal_qc/thermal/PipeFit.py,sha256=7jeGPlIBCzeXIKKprGmucxWRrWLxhS4A4HZdt-tQpF4,18502
+petal_qc/thermal/PipeIterFit.py,sha256=5ZOUKlZIsYVB3NSKsT-o3kNojHCXzX9ctMrqvWlJYfM,2053
 petal_qc/thermal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 petal_qc/thermal/analyze_IRCore.py,sha256=-MsKGJR-5pJV93ipLau0FHQeconLhMPDuLQIT9LMWsU,21115
 petal_qc/thermal/contours.py,sha256=l8eZOvOhJ50cpJZ2ZPOZ-yjsg3ByQAZ0BPUajag0MwU,9862
 petal_qc/thermal/coreThermal.py,sha256=lBPyBm3Fo5uXBw6AIpzTY4Ku238Gr9lwm36Iihfbqp0,16203
-petal_qc/thermal/create_IRCore.py,sha256=s3X-NBc6KdkqOG7kAcG5ldyTRSuommxIruzMFMu8CjQ,9183
+petal_qc/thermal/create_IRCore.py,sha256=pRHanrKdN9rCL2BurpnCI_958CySu0Ku9yjwssBeCpg,9354
 petal_qc/thermal/create_core_report.py,sha256=32F7u7ffnLmGX5J_YP2oa8O_pI0euh9z3p0CTpA3-WM,6135
 petal_qc/thermal/pipe_back.npz,sha256=yooZuVYtHU541HcV6Gh_5B0BqdYAVEvYAuVvMMSY7Jc,3632
 petal_qc/thermal/pipe_front.npz,sha256=DuwruG9C2Z1rLigqWMApY4Orsf1SGUQGKy0Yan8Bk8A,3697
@@ -72,8 +76,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.21.dist-info/METADATA,sha256=DcO69dmOdXq0CtsnCIJSVpdkLy5lwtZKRKktWBxCv2k,953
-petal_qc-0.0.21.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-petal_qc-0.0.21.dist-info/entry_points.txt,sha256=YPrZOsRBRsiKNDvsnbug0-Khj7DcN_Sdpq-tB_XjykI,505
-petal_qc-0.0.21.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
-petal_qc-0.0.21.dist-info/RECORD,,
+petal_qc-0.0.22.dist-info/METADATA,sha256=wOc_109Gke7y9aMvGCDFvSW_ciFb2aVuHO39MeB1W6Q,953
+petal_qc-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+petal_qc-0.0.22.dist-info/entry_points.txt,sha256=8cW3MiDBs3BdBPIzf4YtkOjr-MhPKu9aWfc0BTYBhxQ,554
+petal_qc-0.0.22.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
+petal_qc-0.0.22.dist-info/RECORD,,

{petal_qc-0.0.21.dist-info → petal_qc-0.0.22.dist-info}/WHEEL

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

{petal_qc-0.0.21.dist-info → petal_qc-0.0.22.dist-info}/entry_points.txt

@@ -9,4 +9,5 @@ doMetrology = petal_qc:doMetrology
 petalCoreTestSummary = petal_qc:petalCoreTestSummary
 petalReceptionTests = petal_qc:petalReceptionTests
 petalqc_dashBoard = petal_qc:dashBoard
+readReceptionTests = petal_qc:readReceptionTests
 uploadPetalInformation = petal_qc:uploadPetalInformation