petal-qc 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

petal_qc/BTreport/CheckBTtests.py

@@ -14,9 +14,12 @@ The main routine is BTreport and can be called from anywhere else.
 import sys
 import traceback
 import json
-import getpass
 import datetime
 import dateutil.parser
+import argparse
+
+from petal_qc.utils.ArgParserUtils import RangeListAction
+
 import itkdb
 from itkdb_gtk import ITkDBlogin
 from itkdb_gtk import ITkDButils
@@ -88,7 +91,7 @@ def find_bus_tapes(session, petal, complain_func=complain):
             if cstage != "COMPLETED":
                 complain_func("Bus tape not in final stages", cstage)
                 bt_valid[comp_type] = False
-                
+
             else:
                 bt_valid[comp_type] = True
 
@@ -108,8 +111,8 @@ def find_but_tape_tests(session, petal_date, bt_sn, complain_func=complain):
         dict: dict with all tests. key is the test type code.
 
     """
-    test_list = session.get("listTestRunsByComponent", 
-                            json={"filterMap":{"serialNumber": bt_sn, 
+    test_list = session.get("listTestRunsByComponent",
+                            json={"filterMap":{"serialNumber": bt_sn,
                                                "stage": "COMPLETED"}
                                   })
     bt_tests = {}
@@ -147,7 +150,7 @@ def date2string(the_date=None):
     return out
 
 
-def BTreport(session, SerialN, complain_func=complain):
+def BTreport(session, SerialN, petal=None, complain_func=complain):
     """Makes the BTreport for a petal core.
 
     Args:
@@ -155,20 +158,21 @@ def BTreport(session, SerialN, complain_func=complain):
         SerialN (str): The Petal core SB
     """
     # get petal frm DB.
-    petal = ITkDButils.get_DB_component(session, SerialN)
     if petal is None:
-        complain_func(SerialN, "Could not find petal core.")
-        return None
+        petal = ITkDButils.get_DB_component(session, SerialN)
+        if petal is None:
+            complain_func(SerialN, "Could not find petal core.")
+            return None
 
     SerialN = petal["serialNumber"]
 
-    print("+++ Petal core {} [{}]".format(SerialN, petal["alternativeIdentifier"]))
+    print("\n+++ Petal core {} [{}]".format(SerialN, petal["alternativeIdentifier"]))
     petal_date = dateutil.parser.parse(petal["stateTs"])
     comp_type = get_type(petal)
     if comp_type != "CORE_AVS":
         complain_func("This is not a petal cores", comp_type)
         return None
-    
+
     # Check that the petal core is in the proper stage.
     stage = petal["currentStage"]['code']
     if stage != "AT_QC_SITE":
@@ -182,12 +186,12 @@ def BTreport(session, SerialN, complain_func=complain):
 
     # Loop on children an find bustapes
     bt_list, bt_valid = find_bus_tapes(session, petal, complain_func=complain_func)
-    
+
     nvalid = 0
     for valid in bt_valid.values():
         if valid:
             nvalid += 1
-            
+
     if nvalid != 2:
         complain_func("no valid bustape found", "Either not assembled or in incorrect stage.")
         return None
@@ -210,6 +214,7 @@ def BTreport(session, SerialN, complain_func=complain):
     # Check the tests in the bustapes
     ngood = 0
     ntrouble = 0
+    nprocess = 0
     for bt, cp_id in bt_list.values():
         bt_sn = bt["serialNumber"]
         print("bus tape {}".format(bt_sn))
@@ -218,7 +223,11 @@ def BTreport(session, SerialN, complain_func=complain):
         bt_nprob = 0
         # get list of tests and select the latest.
         bt_tests = find_but_tape_tests(session, petal_date, bt_sn, complain_func=complain_func)
-
+        if len(bt_tests) == 0:
+            print("-> No bus tape tests available")
+            continue
+        
+        nprocess += 1
         results = {}
         childId = {}
         for key, the_test in bt_tests.items():
@@ -248,19 +257,62 @@ def BTreport(session, SerialN, complain_func=complain):
         #     {"value": childId["BTSTRETCHP"],
         #      "childParentRelation": cp_id})
 
+    if nprocess == 0:
+        return None
+
     out["passed"] = (ngood == 4)
     out["problems"] = (ntrouble > 0)
     print("BusTape Report\n\tN. good {}\n\tN. prob {}".format(ngood, ntrouble))
 
     return out
 
+
+def check_petal_core(session, SerialN):
+    """Check petal core for bt report."""
+    core = ITkDButils.get_DB_component(session, SerialN)
+    if core is None:
+        return None
+    
+    test_list = session.get(
+            "listTestRunsByComponent",
+            json={
+                "filterMap": {
+                    "serialNumber": core["serialNumber"],
+                    "state": "ready",
+                    "testType": ["BTTESTING",],
+                }
+            },
+        )
+
+    ntest = 0
+    for tst in test_list:
+        ntest += 1
+        
+    if ntest>0:
+        return None
+    
+    return core
+
 def main():
     """Main entry."""
-    try:
-        SN = sys.argv[1]
-    except IndexError:
-        print("I need a petal  core SN or AlternativeID")
-        sys.exit()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("args", nargs='*', help="Input cores")
+    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) ")
+
+
+    args = parser.parse_args()
+    if len(args.cores)==0:
+        try:
+            args.cores.extend(args.args)
+
+        except IndexError:
+            print("I need a petal  core SN or AlternativeID")
+            sys.exit()
+            
+    else:
+        cores = [ "PPC.{:03d}".format(int(x)) for x in args.cores]
+        args.cores = cores
 
     # ITk PDB authentication
     dlg = None
@@ -272,27 +324,34 @@ def main():
     except Exception:
         # Login with "standard" if the above fails.
         client = ITkDButils.create_client()
-        
-    # Check the Bustape tests
-    try:
-        out = BTreport(client, SN)
-        # Upload test
-        if out:
-            try:
-                db_response = client.post("uploadTestRunResults", json=out)
-            except Exception as ex:
-                print("Could not upload test.")
-                print(ex)
-
 
-    except Exception:
-        print(traceback.format_exc())
+    # Check the Bustape tests
+    for SN in args.cores:
+        core = check_petal_core(client, SN)
+        if core is None:
+            continue
+        
+        try:
+            out = BTreport(client, SN, petal=core)
+            # Upload test
+            if out:
+                try:
+                    db_response = client.post("uploadTestRunResults", json=out)
+                except Exception as ex:
+                    print("Could not upload test for {}.".format(SN))
+                    print(ex)
+
+        except KeyError as ex:
+            print("Key error: {}".format(ex))
+
+        except Exception:
+            print(traceback.format_exc())
 
     try:
         dlg.die()
 
     except Exception:
         print("Bye !")
-        
+
 if __name__ == "__main__":
     main()

petal_qc/BTreport/bustapeReport.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """GUI for the BTtest."""
 import dateutil.parser
+import getpass
 from itkdb_gtk import ITkDButils
 from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import ITkDBlogin
@@ -156,7 +157,7 @@ class BusTapeReport(dbGtkUtils.ITkDBWindow):
                                                         bt_sn,
                                                         complain_func=dbGtkUtils.complain)
 
-            values = [btype, child_sn, cstage]
+            values = [btype, bt_sn, cstage]
 
         self.outDB = CheckBTtests.BTreport(self.session, SN, complain_func=dbGtkUtils.complain)
 

petal_qc/__init__.py

@@ -1,5 +1,5 @@
 """petal_qc python module."""
-__version__ = "0.0.16"
+__version__ = "0.0.18"
 
 
 def coreMetrology():
@@ -23,7 +23,7 @@ def coreThermal():
     main()
 
 def bustapeReport():
-    """Launches the Core metrology analysis ahd PDB script."""
+    """Creates the bustape report and uplades to PDB."""
     from .BTreport.CheckBTtests import main
     # from .BTreport.bustapeReport import main
     main()

petal_qc/getPetalCoreTestSummary.py

@@ -9,7 +9,7 @@ from argparse import ArgumentParser
 from pathlib import Path
 try:
     import itkdb_gtk
-    
+
 except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
@@ -40,31 +40,31 @@ def petalCoreTest(session, options):
     if options.institute:
         payload["filterMap"]["currentLocation"] = options.institute
         suff = options.institute
-        
+
     core_list = session.get("listComponents", json=payload)
     core_tests = ["PETAL_METROLOGY_FRONT", "PETAL_METROLOGY_BACK", "XRAYIMAGING", "THERMAL_EVALUATION", "BTTESTING"]
-    
+
     do_check_stage = "AT_QC_SITE"
     #do_check_stage = None
     petal_id_db = {}
-    
+
     has_list = len(options.cores) != 0
-    
+
     for core in core_list:
         SN = core["serialNumber"]
         altid = core['alternativeIdentifier']
         if "PPC" not in altid:
             continue
-        
+
         R = r_petal_id.search(altid)
         if R is None:
             continue
 
         pid = int(R.group(1))
-        
+
         if has_list and pid not in options.cores:
             continue
-        
+
         petal_id_db[altid] = SN
         location = core["currentLocation"]['code']
         coreStage = core["currentStage"]['code']
@@ -88,11 +88,11 @@ def petalCoreTest(session, options):
             T = session.get("getTestRun", json={"testRun": tst["id"]})
             if T["state"] != "ready":
                 print(T)
-            
+
             print("-- {} [{}]".format(T["testType"]["name"], T["runNumber"]))
             if not T["passed"]:
                 print("\t## test FAILED")
-                
+
             for D in T["defects"]:
                 print("\t{} - {}".format(D["name"], D["description"]))
 
@@ -106,7 +106,7 @@ def 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) ")
     options = parser.parse_args()
-    
+
     # ITk_PB authentication
     dlg = ITkDBlogin.ITkDBlogin()
     session = dlg.get_client()
@@ -118,7 +118,7 @@ def main():
         print(E)
 
     dlg.die()
-    
-    if __name__ == "__main__":
-        main()
 
+if __name__ == "__main__":
+    main()
+    

petal_qc/metrology/convert_mitutoyo.py

@@ -111,6 +111,11 @@ def mitutoyo2cvs(infiles, ofile, label='\\w+', data_type="Punto", keep=False, fi
                 while len(line_data) < fill:
                     line_data.append(0.0)
 
+            else:
+                if len(line_data)<3:
+                    print("Warning: less than three data points: {}".format(','.join([str(v) for v in line_data])))
+                    continue
+
             slin = ','.join([str(v) for v in line_data])
             fout.write(slin)
             if keep:

petal_qc/metrology/do_Metrology.py

@@ -56,7 +56,7 @@ def do_analysis(fnam, prefix, SN, options):
 def analyze_files(ifile, options):
     """Main entry."""
     failed_files = []
-    with open(ifile, 'r', encoding='UTF-8') as inp:
+    with open(ifile, 'r', encoding='ISO-8859-1') as inp:
 
         for line in inp:
             line = line.strip()

petal_qc/metrology/uploadPetalInformation.py

@@ -12,10 +12,10 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio
 
 try:
-    import itkdb_gtk
+    import petal_qc
 
 except ImportError:
-    cwd = Path(__file__).parent.parent
+    cwd = Path(__file__).parent.parent.parent
     sys.path.append(cwd.as_posix())
 
 from itkdb_gtk import ITkDBlogin, ITkDButils, dbGtkUtils
@@ -271,7 +271,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
         self.btnFAT.unselect_all()
         self.btn_state.set_label("Undef")
         dbGtkUtils.set_button_color(self.btn_state, "azure", "black")
-        
+
 
     def create_test_window(self, test_json, test_name, label):
         """Create the dialog for a DB test and add it to the notebook.

petal_qc/test/checkCoreShipments.py

@@ -0,0 +1,57 @@
+"""List shipments."""
+import sys
+from pathlib import Path
+import numpy as np
+
+from itkdb_gtk import ITkDBlogin, ITkDButils
+
+
+def main(session):
+    """List shipments from AVS to CERN and IFIC containing CORES."""
+    
+    payload = {
+            "filterMap": {
+                "sender": "AVS",
+                "recipient": ["CERN", "IFIC"],
+                "status": "delivered"
+            }
+        }
+    shpmts = session.get("listShipmentsByInstitution", json=payload)
+    for s in shpmts:
+        items = session.get("listShipmentItems", json={"shipment": s["id"]})
+        cores = []
+        for it in items:
+            if it["component"]["componentType"]['code'] == "CORE_PETAL":
+                if "PPC." in it["component"]["alternativeIdentifier"]:
+                    cores.append(it["component"]["alternativeIdentifier"])
+                
+        if len(cores) == 0:
+            continue
+        
+        print("Shipment {}".format(s["name"]))
+        print("AVS -> {}".format(s["recipient"]["code"]))
+        print(":> {}".format(s["sentTs"]))
+        for c in cores:
+            print("\t{}".format(c))
+
+        print("\n")
+
+if __name__ == "__main__":
+    # ITk_PB authentication
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+
+    try:
+        main(client)
+        # the_test = analyze_avs_metrology(client, "20USEBC1000124", "PPC.015")
+        #rc = ITkDButils.upload_test(client, the_test, check_runNumber=True)
+        #if rc:
+        #    print(rc)
+
+    except Exception as E:
+        print(E)
+
+    dlg.die()
+
+    
+    

petal_qc/test/getAVStests.py

@@ -4,6 +4,7 @@ import sys
 from pathlib import Path
 import numpy as np
 import matplotlib.pyplot as plt
+from argparse import ArgumentParser
 
 try:
     import petal_qc
@@ -14,7 +15,7 @@ except ImportError:
 
 from itkdb_gtk import ITkDBlogin
 import petal_qc.utils.docx_utils as docx_utils
-
+from petal_qc.utils.ArgParserUtils import RangeListAction
 
 
 def get_value(results, code):
@@ -171,7 +172,7 @@ def plot_weighing(weights, tick_labels, document, show_total=False):
     ax.legend(loc="upper left", ncol=4)
 
 
-def main(session):
+def main(session, options):
     """Entry point"""
     # find all cores
     # Now all the objects
@@ -206,6 +207,10 @@ def main(session):
         altid = core['alternativeIdentifier']
         if "PPC" not in altid:
             continue
+        
+        pID = int(altid[4:])
+        if len(options.cores)>0 and pID not in options.cores:
+            continue
 
         petal_ids.append(altid)
         location = core["currentLocation"]['code']
@@ -314,9 +319,14 @@ def main(session):
 
 if __name__ == "__main__":
     # ITk_PB authentication
+    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) ")
+
+    
     dlg = ITkDBlogin.ITkDBlogin()
     session = dlg.get_client()
 
-    main(session)
+    main(session, options)
 
     dlg.die()

petal_qc/test/test_Graphana.py

@@ -19,7 +19,8 @@ from petal_qc.thermal import IRBFile
 
 
 options = IRPetalParam()
-options.files = [Path("~/tmp/thermal/PPC.008.irb").expanduser().resolve()]
+options.institute = "IFIC"
+options.files = [Path("~/tmp/thermal/IFIC-thermal/IRB_files/PPC.008.irb").expanduser().resolve()]
 getter = IRDataGetter.factory(options.institute, options)
 DB = ReadGraphana("localhost")
 irbf = IRBFile.open_file(options.files)

petal_qc/thermal/IRPetalParam.py

@@ -27,6 +27,7 @@ class IRPetalParam(object):
         self.rotate = True        # Rotate to have a vertical petal in mirror image
         self.debug = False        # To debug
         self.report = False       # 
+        self.graphana = None      # Graphana server
 
         if values is not None:
             self.set_values(values)
@@ -61,6 +62,7 @@ class IRPetalParam(object):
                             help="Either IFIC or DESY to treat the different files")
         parser.add_argument("--thrs", type=float, default=P.thrs, help="Temperature threshold")
         parser.add_argument("--tco2", type=float, default=P.tco2, help="CO2 Inlet temperature")
+        parser.add_argument("--graphana", type=str, default=None, help="Graphana server.")
         parser.add_argument("--gauss_size", type=int, default=P.gauss_size, help="Radius of gausian filtering")
         parser.add_argument("--distance", type=float, default=P.distance, help="Distance in contour beteween slices")
         parser.add_argument("--npoints", type=int, default=P.npoints, help="Number of points per segment")

petal_qc/thermal/PipeFit.py

@@ -8,7 +8,6 @@ from pathlib import Path
 import matplotlib.path as mplPath
 import matplotlib.pyplot as plt
 import numpy as np
-import numpy.linalg as linalg
 from scipy.optimize import least_squares
 
 from petal_qc.thermal import contours
@@ -43,6 +42,9 @@ class PipeFit(object):
         self.bounds = [[-math.pi, 0.8, 0.8, -np.inf, -np.inf],
                        [math.pi, 3.0, 3.0, np.inf, np.inf]]
 
+        self.core_center = None
+        self.core_band = None
+
     def set_front(self, is_front=True):
         """Sets for a front image.
 
@@ -119,6 +121,7 @@ class PipeFit(object):
         """
         DB = np.load(pipe_file)
         sensors = []
+        pipe = []
         for key, val in DB.items():
             if key == "pipe":
                 pipe = val
@@ -213,7 +216,7 @@ class PipeFit(object):
             print("Center {:5.3f}, {:5.3f}".format(M[5], M[6]))
 
     @staticmethod
-    def get_data_center(data, fraction=0.5, y0=None):
+    def get_data_center(data, fraction=0.5, y0=None, min_pts=5):
         """Compute the data center.
 
         Assumes it is in the half height, and the X is the average of the points
@@ -221,19 +224,19 @@ class PipeFit(object):
         """
         if y0 is None:
             bounding_box = contours.contour_bounds(data)
-            y0 = fraction*(bounding_box[1]+bounding_box[3])
+            y0 = bounding_box[1] + fraction*(bounding_box[3]-bounding_box[1])
 
         window = 10
         while True:
             stripe = data[np.abs(data[:, 1] - y0) < window]
-            if len(stripe) > 5:
+            if len(stripe) > min_pts:
                 break
 
             window += 1
 
         m0 = np.mean(stripe, axis=0)
         center = np.array([m0[0], y0])
-        return center
+        return center, (np.min(stripe[:, 0]), np.max(stripe[:, 0]))
 
     @staticmethod
     def guess_pipe_type(data, fraction=0.25) -> int:
@@ -256,7 +259,7 @@ class PipeFit(object):
 
         D = data[:, 0:2] - P0
         m0 = np.mean(D, axis=0)
-        center = PipeFit.get_data_center(D, y0=m0[1])
+        center, _ = PipeFit.get_data_center(D, y0=m0[1])
         # fig, ax = plt.subplots(1,1)
         # ax.plot(D[:,0], D[:, 1], 'o', label="Data")
         # ax.plot(center[0], center[1], '*', label="Center")
@@ -273,9 +276,16 @@ class PipeFit(object):
     @staticmethod
     def guess_pipe_angle(data, center):
         """Get an estimation of th epipe angle."""
-        c1 = PipeFit.get_data_center(data, 0.6)
-        delta = c1 - center
-        angle = math.atan(delta[0]/delta[1])
+        c1, _ = PipeFit.get_data_center(data, 0.)
+        delta = np.abs(c1 - center)
+        angle = math.atan(delta[1]/delta[0])
+        while angle<0:
+            angle += 2.0*math.pi
+
+        if angle > 1.5*math.pi:
+            angle -= math.pi/2.0
+
+        angle = 0.5*math.pi - angle
         return angle
 
     @staticmethod
@@ -289,8 +299,11 @@ class PipeFit(object):
 
     def initial_guess(self, data):
         """Make a first guess of the transform."""
-        Mdata = self.get_data_center(data)
+        Mdata, _ = self.get_data_center(data)
         theta = self.guess_pipe_angle(data, Mdata)
+        if self.front:
+            theta = -theta
+
         T = -Mdata
         dxd = np.amax(data, axis=0) - np.amin(data, axis=0)
         dxp = np.amax(self.cpipe, axis=0) - np.amin(self.cpipe, axis=0)
@@ -313,7 +326,11 @@ class PipeFit(object):
     def get_residuals(self, M):
         """Compute intersecting area."""
         out = self.transform_data(self.data, M)
-        use_area = True
+        y_max = np.max(out[:,1])
+        y_min = np.min(out[:,1])
+
+        height = y_max - y_min
+        use_area = False
         if use_area:
             path = mplPath.Path(out)
             ngood = 0.0
@@ -327,20 +344,29 @@ class PipeFit(object):
             real_area = 100*ngood/ntot
 
         else:
-            area = 0.0
-            real_area = 0
+            area = 1.0
+            real_area = 1
 
         npts = len(self.data)
         D = np.zeros([npts, 2])
         ddd = np.zeros(npts)
+        sum_weights = 0.0
+        weights = np.zeros(npts)
         for i in range(npts):
             X = out[i, :]
             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
+            weights[i] = W
+            sum_weights += W
 
         # return value
-        res = D.flatten()*area
+        if use_area:
+            res = D.flatten()*area
+
+        else:
+            res = np.dot(ddd, weights)/sum_weights
 
         if self.debug:
             dbg_ax. clear()
@@ -420,14 +446,17 @@ class PipeFit(object):
                 elif val > self.bounds[1][i]:
                     val = 0.99 *  self.bounds[0][i]
                     M[i] = val
-                    
+
             if self.debug:
                 print("\n** Initial guess")
                 self.print_transform(M)
         else:
             M = M0
 
-        self.data = contours.contour_simplify(data, 1.5*factor)
+        self.core_center, self.core_band = self.get_data_center(data)
+
+
+        self.data = contours.contour_simplify(data, 1.25*factor)
         # self.data = data
         verbose = 0
         if self.debug:
@@ -436,7 +465,7 @@ class PipeFit(object):
         res = least_squares(self.get_residuals, M,
                             method='trf',
                             # ftol=5e-16,
-                            # xtol=None,
+                            #xtol=1.0e-10,
                             # max_nfev=10000,
                             # diff_step=[0.05, 0.02, 0.02, 50, 50],
                             bounds=self.bounds,
@@ -551,7 +580,7 @@ def main(data_file, opts):
     ax[0].plot(PF.center[0], PF.center[1], 'o')
     ax[0].set_title("Pipe")
 
-    center = PF.get_data_center(data)
+    center, _ = PF.get_data_center(data)
     ax[1].plot(data[:, 0], data[:, 1])
     ax[1].plot(center[0], center[1], 'o')
     ax[1].set_title("Data on IR")
@@ -560,7 +589,7 @@ def main(data_file, opts):
     plt.figure(fign)
     out = PF.transform_data(PF.data, R)
     aout = PF.transform_data(data, R)
-    center = PF.get_data_center(aout)
+    center, _ = PF.get_data_center(aout)
     ax[2].plot(PF.pipe[:, 0], PF.pipe[:, 1])
     ax[2].plot(out[:, 0], out[:, 1], 'o')
     ax[2].plot(center[0], center[1], 'o')

petal_qc/thermal/analyze_IRCore.py

@@ -175,7 +175,8 @@ def create_golden_average(files, options):
             for i in range(2):
                 ax[i].plot(R.results[i].path_length, R.results[i].path_temp, label="original")
                 ax[i].plot(R.golden[i].path_length, R.golden[i].path_temp, label="golden")
-                ax[i].legend()
+                if options.legend:
+                    ax[i].legend()
 
     # Create the golden object
     golden = [Petal_IR_Analysis.AnalysisResult() for i in range(2)]
@@ -216,7 +217,7 @@ def get_golden_axis(R, golden):
         R.golden.append(G)
 
 
-def plot_profile_and_golden(golden, core, value):
+def plot_profile_and_golden(golden, core, value, show_legend=True):
     """Plot petal core and golden average.
 
     Args:
@@ -270,7 +271,9 @@ def plot_profile_and_golden(golden, core, value):
         Tmean = np.mean(Y)
         Tband = factor*abs(Tmean)/3
 
-        ax[0].legend(ncol=4, fontsize="x-small")
+        if show_legend:
+            ax[0].legend(ncol=4, fontsize="x-small")
+            
         ax[0].set_title("T$_{prof}$ values")
         if value.find("temp") >= 0 or value.find("_avg") >= 0:
             ax[0].set_ylim(Tmean-Tband, Tmean+Tband)
@@ -282,14 +285,16 @@ def plot_profile_and_golden(golden, core, value):
                                facecolor="yellow", alpha=0.25,
                                label="Acceptance band")
 
-        ax[1].legend(ncol=4, fontsize="x-small")
+        if show_legend:
+            ax[1].legend(ncol=4, fontsize="x-small")
+        
         ax[1].set_title("T$_{prof}$ - Golden avg.")
         if value.find("temp") >= 0 or value.find("_avg") >= 0:
             ax[1].set_ylim(-Tband, Tband)
 
     return figures
 
-def show_golden_average(golden, results, value):
+def show_golden_average(golden, results, value, show_legend=True):
     """Create golden average.
 
     Args:
@@ -343,7 +348,9 @@ def show_golden_average(golden, results, value):
         Tband = factor*abs(Tmean)/3
         ax[0].plot(gX, gY, '-', label="Golden", linewidth=4, alpha=0.4, color="black")
 
-        ax[0].legend(ncol=4, fontsize="x-small")
+        if show_legend:
+            ax[0].legend(ncol=4, fontsize="x-small")
+        
         ax[0].set_title("T$_{prof}$ values")
         if value.find("temp") >= 0 or value.find("_avg") >= 0:
             ax[0].set_ylim(Tmean-Tband, Tmean+Tband)
@@ -357,7 +364,9 @@ def show_golden_average(golden, results, value):
                                facecolor="yellow", alpha=0.25,
                                label="Acceptance band")
 
-        ax[1].legend(ncol=4, fontsize="x-small")
+        if show_legend:
+            ax[1].legend(ncol=4, fontsize="x-small")
+        
         ax[1].set_title("T$_{prof}$ - Golden avg.")
         if value.find("temp") >= 0 or value.find("_avg") >= 0:
             ax[1].set_ylim(-Tband, Tband)
@@ -369,7 +378,7 @@ def compare_golden(core, golden, value):
 
     Args:
     ----
-        core (AnalusysResolt): The petal core
+        core (AnalisysResult): The petal core
         golden (AnalysisResult): The golden avrage
         value (str): The name of the variable to compare
 
@@ -396,11 +405,11 @@ def compare_golden(core, golden, value):
         indx = bisect.bisect_left(gX, x, lo=(indx-1 if indx>1 else 0))
         val = gY[indx]
         diff = abs(y-val)
-        if diff > mxval:
-            mxval = diff
 
-        if diff>band:
+        delta = abs(diff-band)/band
+        if diff>band and delta>0.01:
             outsiders.append(x)
+            mxval = max(diff, mxval)
 
     rc = mxval < band
     return rc, mxval, outsiders
@@ -439,7 +448,7 @@ def analyze_petal_cores(files, golden, options):
         cores.append(core)
         out = [{}, {}]
         for iside in range(2):
-            for val in ("path_temp", "sensor_avg", "sensor_std"):
+            for val in ("path_temp", "sensor_avg"):
                 out[iside][val] = compare_golden(core.results[iside], golden[iside], val)
 
         dbOut = {
@@ -488,8 +497,8 @@ def analyze_petal_cores(files, golden, options):
                          "properties": {"msg": "{} > {}".format(val[1], get_acceptance_band())}
                          }
                     )
-        dbOut["passed"] = (len(dbOut["defects"]) == 0)
-        dbOut["problems"] = (len(dbOut["comments"]) > 0)
+        dbOut["passed"] = len(dbOut["defects"]) == 0
+        dbOut["problems"] = len(dbOut["comments"]) > 0
 
         if options.out is None:
             ofile = "{}-Thermal.json".format(core.coreID)
@@ -518,10 +527,10 @@ def analyze_IRCore(options, show=True):
         with open(ofile, 'w') as fp:
             json.dump(golden, fp, indent=3, cls=IRCore.NumpyArrayEncoder)
 
-        show_golden_average(golden, results, "path_temp")
-        show_golden_average(golden, results, "path_spread")
-        show_golden_average(golden, results, "sensor_avg")
-        show_golden_average(golden, results, "sensor_std")
+        show_golden_average(golden, results, "path_temp", options.legend)
+        show_golden_average(golden, results, "path_spread", options.legend)
+        show_golden_average(golden, results, "sensor_avg", options.legend)
+        show_golden_average(golden, results, "sensor_std", options.legend)
 
     else:
         if options.golden is None:
@@ -556,17 +565,17 @@ def analyze_IRCore(options, show=True):
             else:
                 document = None
 
-            F = show_golden_average(golden, cores, "path_temp")
+            F = show_golden_average(golden, cores, "path_temp", options.legend)
             add_figures_to_doc(document, F, "Temperature along pipe")
-            F = show_golden_average(golden, cores, "path_spread")
+            F = show_golden_average(golden, cores, "path_spread", options.legend)
             add_figures_to_doc(document, F, "Spread along pipe")
-            F = show_golden_average(golden, cores, "sensor_avg")
+            F = show_golden_average(golden, cores, "sensor_avg", options.legend)
             add_figures_to_doc(document, F, "Sensor avg")
-            F = show_golden_average(golden, cores, "sensor_std")
+            F = show_golden_average(golden, cores, "sensor_std", options.legend)
             add_figures_to_doc(document, F, "Sensor std")
 
             if document and not hasattr(options, "no_golden_doc"):
-                ofile = utils.output_folder(options.folder, "Compare-to-Golden.docx")
+                ofile = utils.output_folder(options.folder, options.comparison)
                 document.save(ofile)
 
     if show:
@@ -588,9 +597,10 @@ def main():
     parser.add_argument("--prefix", default="golden", help="Prefix for figures")
     parser.add_argument("--debug", action="store_true", default=False, help="Set to debug")
     parser.add_argument("--report", action="store_true", default=False, help="Set to produce plots for report")
-
+    parser.add_argument("--no-legend", dest="legend", action="store_false", default=True, help="Do not show the legend in plots.")
     parser.add_argument("--out", default=None, help="File to store Golden.")
     parser.add_argument("--folder", default=None, help="Folder to store output files. Superseeds folder in --out")
+    parser.add_argument("--comparison", default="Compare-to-Golden.docx", help="Path to comparison to golden of all input files.")
 
     options = parser.parse_args()
     if len(options.files) == 0:

petal_qc/thermal/contours.py

@@ -10,7 +10,7 @@ import sys
 import matplotlib.path as mplPath
 import numpy as np
 
-from petal_qc.utils.Geometry import Point
+from petal_qc.utils.Geometry import Point, remove_outliers_indx
 
 
 def pldist(point, start, end):
@@ -48,9 +48,9 @@ def closest_segment_point(P, A, B):
 
     t0 = np.dot(P-A, M)/np.dot(M, M)
     C = A + t0*M
-    d = np.linalg.norm(P-C)
+    dist = np.linalg.norm(P-C)
 
-    return d, C
+    return dist, C
 
 
 def find_closest(x0, y0, cont, return_index=False):
@@ -170,10 +170,10 @@ def contour_simplify(C, epsilon, return_mask=False):
 
         for i in range(index + 1, last_index):
             if indices[i - global_start_index]:
-                d = pldist(C[i], C[start_index], C[last_index])
-                if d > dmax:
+                dist = pldist(C[i], C[start_index], C[last_index])
+                if dist > dmax:
                     index = i
-                    dmax = d
+                    dmax = dist
 
         if dmax > epsilon:
             stk.append([start_index, index])
@@ -259,7 +259,7 @@ def in_contour(x, y, C):
     return path.contains_point(x, y, C)
 
 
-def get_average_in_contour(img, C):
+def get_average_in_contour(img, C, remove_outliers=None):
     """Gets average and std of points within contour.
 
     We are assuming here that coordinates are integers, ie,
@@ -269,6 +269,7 @@ def get_average_in_contour(img, C):
     ----
         img: The image
         C: The contour
+        remove_outliers: If an int, 
 
     Returns
     -------
@@ -290,6 +291,11 @@ def get_average_in_contour(img, C):
             if path.contains_point([ix, iy]):
                 values.append(img[iy, ix])
 
+    values = np.array(values)
+    if remove_outliers is not None and isinstance(remove_outliers, (int, float)):
+        indx = remove_outliers_indx(values, remove_outliers)[0]
+        return np.mean(values[indx]), np.std(values[indx])
+
     return np.mean(values), np.std(values)
 
 
@@ -360,16 +366,16 @@ def contour_eval(C, x):
 
 
 if __name__ == "__main__":
-    C = np.loadtxt("long_contour.csv")
+    cntr = np.loadtxt("long_contour.csv")
 
-    CM0 = contour_CM(C)
-    d0, pt0 = find_closest_point(CM0[0], CM0[1], C)
+    CM0 = contour_CM(cntr)
+    d0, pt0 = find_closest_point(CM0[0], CM0[1], cntr)
 
-    Cs = contour_simplify(C, 1.)
+    Cs = contour_simplify(cntr, 1.)
     CMs = contour_CM(Cs)
     ds, pts = find_closest_point(CM0[0], CM0[1], Cs)
     d = np.linalg.norm(pt0-pts)
-    print("no. of points {}".format(len(C)))
+    print("no. of points {}".format(len(cntr)))
     print("no. of points {}".format(len(Cs)))
     print(d0)
     print(ds)

petal_qc/thermal/create_IRCore.py

@@ -22,12 +22,14 @@ 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.PetalColorMaps import HighContrast
 from petal_qc.thermal.IRDataGetter import IRDataGetter
 from petal_qc.thermal.IRPetalParam import IRPetalParam
 from petal_qc.utils.readGraphana import ReadGraphana
 from petal_qc.utils.utils import output_folder
 
 
+
 def get_db_date(timestamp=None):
     """Convert a date string into the expected DB format.
 
@@ -82,11 +84,16 @@ def get_inlet_temp(irbf, param):
     getter = IRDataGetter.factory(param.institute, param)
 
     # TODO: get the server from thhe options
-    server = os.getenv("GRAFANA_SERVER")
+    server = None
+    if param.graphana is not None:
+        server = param.graphana
+    else:
+        server = os.getenv("GRAFANA_SERVER")
+
     if server is None:
         DB = ReadGraphana()
     else:
-        print("Connecting to Graphana serfer {}".format(server))
+        print("Connecting to Graphana server {}".format(server))
         DB = ReadGraphana(server)
 
     frames = getter.get_analysis_frame(irbf)
@@ -166,30 +173,52 @@ def create_IR_core(options):
     ordered_pipes = [None, None]
     pipe_order = [0, 0]
     all_3d_points = IRPetal.get_all_3d_points()
+    core_images = IRPetal.get_last_images()
     for i in range(2):
         pipe_type = PipeFit.PipeFit.guess_pipe_type(pipes[i])
         pipe_order[i] = pipe_type
+        if options.save_pipes:
+            prfx = options.alias if len(options.alias)>0 else "pipe"
+            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)
         if options.debug or options.report:
+            _X = all_3d_points[i][:, 0]
+            _Y = all_3d_points[i][:, 1]
+            _Z = all_3d_points[i][:, 2]
+
             fig, _ = PF.plot(show_fig=False)
             __figures__["fit_{}".format(i)] = fig
 
+
+            shape = core_images[i].shape
+            fig_size = [6.4, 0]
+            factor = fig_size[0]/shape[1]
+            fig_size[1] = shape[0] * factor
+            fig, ax = plt.subplots(1, 1, tight_layout=True, figsize=fig_size)
+            ax.imshow(core_images[i], origin='lower', cmap=HighContrast.reversed())
+            ax.plot(_X, _Y, 'o-', linewidth=1, markersize=10)
+            for s in PF.sensors:
+                o = PF.transform_inv(s, R)
+                ax.plot(o[:,0], o[:, 1], linewidth=2, color="black")
+
+            __figures__["sensors_{}".format(pipe_type)] = fig
+
             fig = plt.figure(tight_layout=True, figsize=(7, 6))
             fig.subplots_adjust(left=0.0, right=1.)
 
-            ax = fig.add_subplot(1, 1, 1, projection='3d')
-            ax.view_init(elev=90, azim=-90)
-            _X = all_3d_points[i][:, 0]
-            _Y = all_3d_points[i][:, 1]
-            _Z = all_3d_points[i][:, 2]
-            sct = ax.scatter(_X, _Y, _Z, c=_Z, marker='o', cmap=plt.cm.jet)
-            fig.colorbar(sct, shrink=0.75, aspect=5)
+            ax = fig.add_subplot(1, 1, 1)
+            sct = ax.scatter(_X, _Y, c=_Z, marker='o', cmap=plt.cm.jet)
+            fig.colorbar(sct, pad=0.01, aspect=10)
             __figures__["pipe_path_{}".format(i)] = fig
 
         transforms[pipe_type] = R
         fitter[pipe_type] = PF
 
+
+
         # Reorder points in pipe contour so that first point corresponds to
         # the U-shape pipe minimum.
         pipes[i] = IRPetal.reorder_pipe_points(pipes[i], pipe_type, R)
@@ -261,6 +290,8 @@ def main():
     parser.add_argument("--alias", default="", help="Alias")
     parser.add_argument("--SN", default="", help="serial number")
     parser.add_argument("--folder", default=None, help="Folder to store output files. Superseeds folder in --out")
+    parser.add_argument("--no-legend", dest="legend", action="store_false", default=True, help="Do not show the legend in plots.")
+    parser.add_argument("--save_pipes", default=False, action="store_true", help="SAve pipe path. Output is alias_pipe-i.txt")
 
     IRPetalParam.add_parameters(parser)
 

petal_qc/thermal/create_core_report.py

@@ -44,7 +44,7 @@ def create_report(options):
 
     if options.golden is None:
         return core
-    
+
     goldenFile = Path(options.golden).expanduser().resolve()
     if not goldenFile.exists():
         goldenFile = utils.output_folder(options.folder, options.golden)
@@ -76,13 +76,14 @@ def create_report(options):
     document.add_heading('Original image', level=1)
     document.add_picture(figures["original"], True, 14, caption="Original Thermal image.")
 
+    document.add_heading('Sensor Position', level=1)
+    document.add_picture([figures["sensors_0"], figures["sensors_1"]], True, 7.5, caption="Side 0 (left) and Side 1 (right) sensors.")
+
     document.add_heading('Result of Pipe Fit', level=1)
-    document.add_picture(figures["fit_0"], True, 10, caption="Side 0 fit.")
-    document.add_picture(figures["fit_1"], True, 10, caption="Side 1 fit.")
+    document.add_picture([figures["fit_0"],figures["fit_1"]], True, 7.5, caption="Side 0 fit (left) and Side 1 fit (right)")
 
     document.add_heading('Pipe Path', level=1)
-    document.add_picture(figures["pipe_path_0"], True, 10, caption="Side 0 pipe temp.")
-    document.add_picture(figures["pipe_path_1"], True, 10, caption="Side 1 pipe temp.")
+    document.add_picture([figures["pipe_path_0"], figures["pipe_path_1"]], True, 7.5, caption="Side 0 and 1 pipe temp (left, right).")
 
     options.add_attachments = True
     options.create_golden = False
@@ -151,6 +152,8 @@ def main():
     parser.add_argument("--folder", default=None, help="Folder to store output files. Superseeds folder in --out")
     parser.add_argument("--add_attachments", action="store_true", default=False, help="If true add the attachments section os DB file.")
     parser.add_argument("--golden", default=None, help="The golden to compare width")
+    parser.add_argument("--no-legend", dest="legend", action="store_false", default=True, help="Do not show the legend in plots.")
+    parser.add_argument("--save_pipes", default=False, action="store_true", help="SAve pipe path. Output is alias_pipe-i.txt")
 
 
     IRPetalParam.add_parameters(parser)

petal_qc/utils/docx_utils.py

@@ -96,13 +96,13 @@ class Document(object):
         """Add page numbers."""
         add_page_number(self.doc.sections[0].footer.paragraphs[0])
 
-    def add_picture(self, fig, center=True, size=10, caption=None):
+    def add_picture(self, fig_list, center=True, size=10, caption=None):
         """Add a picture in the document.
 
         Args:
         ----
             doc: the document
-            fig : The matplotlib figure
+            fig : The matplotlib figure or list of figures.
             center (bool, optional): If picture will be centerd. Defaults to True.
             size (int, optional): Size of picture in cm. Defaults to 10.
             caption (str, optional): The text of the caption. Defaults to None.
@@ -112,14 +112,26 @@ class Document(object):
             Index of Figure if caption is True, otherwise -1.
 
         """
-        png_file = tempfile.NamedTemporaryFile(suffix=".png", delete=False)
-        fig.savefig(png_file, dpi=300)
-        png_file.close()
+    
+        if not isinstance(fig_list, (list, tuple)):
+            fig_list = [fig_list]
+
         P = self.add_paragraph()
         if center:
             P.alignment = WD_ALIGN_PARAGRAPH.CENTER
 
-        P.add_run().add_picture(png_file.name, width=Cm(size))
+        R = P.add_run()
+        for fig in fig_list:
+            png_file = tempfile.NamedTemporaryFile(suffix=".png", delete=False)
+            fig.savefig(png_file, dpi=300)
+            png_file.close()
+
+            R.add_text("")
+            R.add_picture(png_file.name, width=Cm(size))
+
+        if len(fig_list)>0:
+            R.add_text(" ")
+
         rc = -1
         if caption:
             P = self.add_paragraph()

{petal_qc-0.0.16.dist-info → petal_qc-0.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: petal_qc
-Version: 0.0.16
+Version: 0.0.18
 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.16.dist-info → petal_qc-0.0.18.dist-info}/RECORD

@@ -1,10 +1,10 @@
 petal_qc/PetalReceptionTests.py,sha256=cSrq4PUjdV7T16ARonhsnXWPBBRuvliTKlZwEPfgRVY,10832
-petal_qc/__init__.py,sha256=mRiA0sBPquFBSliofiW_tsLCf0ammzvN0iTnHSiqu30,1601
+petal_qc/__init__.py,sha256=0fKeh6SADCpa5P2vbdpgv7ffPIr5pha5kqm9VmCIcaQ,1595
 petal_qc/dashBoard.py,sha256=U_UHNMca3H2ogD4a0Vpe4ZVUKEv2-xmGZQEZ9_aH0E4,4034
-petal_qc/getPetalCoreTestSummary.py,sha256=IekVCEBtNCRlKUu9spsh5ufq8wYzi4Cfh00xgxfT9eg,3794
-petal_qc/BTreport/CheckBTtests.py,sha256=CxR8lcawwhdzkBs8jZCXI6TSGPOsOEigpAND0D1O0cs,8178
+petal_qc/getPetalCoreTestSummary.py,sha256=hTv4A8gcEkvCZLcy9ZkpwOevksz6LfK1Rb1-4ENlC7I,3706
+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=c5VERxPm6BOgW_yN9O_bEPmCYpuwZ_Yt_I2sMVAp0-I,6895
+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
@@ -14,11 +14,11 @@ petal_qc/metrology/analyze_locking_points.py,sha256=83f8nNgmXWClQnIG1plu3YYuxNme
 petal_qc/metrology/cold_noise.py,sha256=PuTaQ73WrQCJdE9ezS4UFmA3atwCuvM0ZsUOYu1ZIBw,3106
 petal_qc/metrology/compare_Cores.py,sha256=dP0i_C_VrM4s3i0RrI2g4ZcjRmgIHlAgodhGS87YYgw,9458
 petal_qc/metrology/comparisonTable.py,sha256=6Zmh-x0ahs28ZJQuHMrIiRcblUmTN1_-1otFSRNMPds,1743
-petal_qc/metrology/convert_mitutoyo.py,sha256=HdXQzFL5y7r8qXDzti91VItDQ-y6D9rEAYknn4yHwBs,5449
+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/data2csv.py,sha256=2ttMSmfGLPIaOqZGima2dH6sdnSRAFTHlEbSOfW5ebA,1809
-petal_qc/metrology/do_Metrology.py,sha256=czsEqw7FaCtE_1FezKYy4uaChezJ89urlO4rT4BUzkQ,4351
+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
@@ -26,20 +26,21 @@ petal_qc/metrology/readAVSdata.py,sha256=6GRUac9b3iOoVoGfWr6rsNj1smsw9aT0tu5wuNu
 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=hfrXFPKLqv3RwFx5zQxLL3SI79SvgLEWV3mgxjGJLz8,26730
+petal_qc/metrology/uploadPetalInformation.py,sha256=K2hHXmoQ-qi5HLTmFNn5jVsZDDXX88psGV-XIRgx1kA,26728
 petal_qc/test/analyzeMetrologyTable.py,sha256=_ipKV8-rXgLca5Bu3ATLZjGR5koFN4-qwpj88rgf-x0,3098
 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
 petal_qc/test/createMetrologyFile.py,sha256=3fmHj8AlT_739sGRrKgpe_ZbGW2NUDAc6w0t7dEXWMo,2387
 petal_qc/test/createMetrologyTable.py,sha256=Dh9Mwab5geyojigVCS5mKba1EJU-4K1-ELDMZTDw4Dg,2687
 petal_qc/test/desyModuleBow.py,sha256=4RgDIVEMqzlGUVqKCjji95_JzfXtcgjK4kefKrVH9eY,3602
 petal_qc/test/findRawData.py,sha256=8wqvPILjfZZ0CKkDhOa_tcsYMwNwcKOLyaEoWfISBQY,2872
 petal_qc/test/getAVSjson.py,sha256=o8AYtyr7Vnp-enznmQ-NNiivZipmxtoVrmsfnRCl0X4,977
-petal_qc/test/getAVStests.py,sha256=G8-dKUujeG55v7unaQn-Pu2P1Qb7qVMOic9k5ZHLoJg,9799
+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/test_Graphana.py,sha256=fXcqHzgrfZGjSF-WoMLl96G97XjXVnynHYC-5rKw_-c,1032
+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
 petal_qc/thermal/DESYdata.py,sha256=YAwxhnmA89uH1vZ_BjDo0VLATTGRngoBSFzYfLSJbZU,1904
@@ -48,16 +49,16 @@ petal_qc/thermal/IRBFile.py,sha256=_no8iUyuSQ41j34o3LVzUCjMYoviwjz02tsWvFsTUzA,2
 petal_qc/thermal/IRCore.py,sha256=sidf7HtrzEUcllv0E_o1Hks-2_2dl4Og_LWcwgPNRcE,3062
 petal_qc/thermal/IRDataGetter.py,sha256=S-Xaizrop_xQ2pgkvuw_HdKbrsDD84KThwgTfjRg0bQ,11579
 petal_qc/thermal/IRPetal.py,sha256=hVOD0VAKTA2xvNXbZ-TXAYHNlihNWsUkI2i9IEwQhZk,40887
-petal_qc/thermal/IRPetalParam.py,sha256=E4uZvk7Ne5TqoY8UHIbMmgB87vIxmYhTgISvs9ZgCt8,3674
+petal_qc/thermal/IRPetalParam.py,sha256=_d0mIxM1laVK5cnM5v7X1L0SQ5dUeXB8kpBySHjfiLI,3817
 petal_qc/thermal/PetalColorMaps.py,sha256=6CvJHzRdojLHu3BROYSekHw8g_BJ1lJ_edyhovTIydU,3831
 petal_qc/thermal/Petal_IR_Analysis.py,sha256=ALIER9fLn2R26IMhPVzEDL6tlK7XNbCtRtH0y6kTaEU,3950
-petal_qc/thermal/PipeFit.py,sha256=MNQYk9NivBsDze6CVwE1cFdJjrqqbn8FK19436nFMVY,17575
+petal_qc/thermal/PipeFit.py,sha256=8nEjpZC1mWh4-bhXzwXfjO8WkC_6hFYX0XXPjTHwNUw,18345
 petal_qc/thermal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-petal_qc/thermal/analyze_IRCore.py,sha256=HahnXkBRdeLlPt1BKSrj3UP6aDSHqDNbao_wxU-DlTg,20485
-petal_qc/thermal/contours.py,sha256=ampCKm4byZYKb_4eJFjIkdFIl2bqVXD2mV13d2XUWlw,8244
+petal_qc/thermal/analyze_IRCore.py,sha256=-MsKGJR-5pJV93ipLau0FHQeconLhMPDuLQIT9LMWsU,21115
+petal_qc/thermal/contours.py,sha256=Bx4ghZhgZ4ya1rr4CZvjpqZd9M924Vms1oEGrgllWG4,8591
 petal_qc/thermal/coreThermal.py,sha256=cLH7lOd6EF6y03LVaQUovlNs_Dcx9DCD1Erdw8aNrA0,16227
-petal_qc/thermal/create_IRCore.py,sha256=b1ja1VBELqadyWnugYlMp7eNfaLC_zhL8Q6slwOK0Y8,8219
-petal_qc/thermal/create_core_report.py,sha256=MsB-Knr2iiHReyInLEd825KSzwG7VuAHSM_2MmPlW3g,6019
+petal_qc/thermal/create_IRCore.py,sha256=KUiRu8CUFUP0cUgtUCFkGPDePoylFqkV_GxzIVRJjZs,9441
+petal_qc/thermal/create_core_report.py,sha256=v1GMt9U57pAYm3m91T3a7cFfN5xvpFY4vsfuBrtOYuU,6394
 petal_qc/thermal/pipe_back.npz,sha256=yooZuVYtHU541HcV6Gh_5B0BqdYAVEvYAuVvMMSY7Jc,3632
 petal_qc/thermal/pipe_front.npz,sha256=DuwruG9C2Z1rLigqWMApY4Orsf1SGUQGKy0Yan8Bk8A,3697
 petal_qc/thermal/pipe_read.py,sha256=HrAtEbf8pMhJDETzkevodiTbuprIOh4yHv6PzpRoz7Q,5040
@@ -67,12 +68,12 @@ petal_qc/utils/Geometry.py,sha256=NSz64lKNEh9ny5ZGRQ4abA1zPiJNJcGnTenTGZNNB8o,19
 petal_qc/utils/Progress.py,sha256=gCti4n2xfCcOTlAff5GchabGE5BCwavvDZYYKdbEsXU,4064
 petal_qc/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 petal_qc/utils/all_files.py,sha256=4ja_DkbTYPY3gUPBAZq0p7KB9lnXZx-OCnpTHg9tm4I,1044
-petal_qc/utils/docx_utils.py,sha256=Eye16PF8W0mPBVdQvgFKWxPYV7-hzBgANPDZtUEjzf8,5805
+petal_qc/utils/docx_utils.py,sha256=zVmSKHDVE8cUwbXxqyPtgS0z62VCFya1DWklOpO1rCQ,6067
 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.16.dist-info/METADATA,sha256=QUkF1QMT2oXGyq9eFvsbFLFAYcvHh1BpSBAUCxv5SME,953
-petal_qc-0.0.16.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-petal_qc-0.0.16.dist-info/entry_points.txt,sha256=YPrZOsRBRsiKNDvsnbug0-Khj7DcN_Sdpq-tB_XjykI,505
-petal_qc-0.0.16.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
-petal_qc-0.0.16.dist-info/RECORD,,
+petal_qc-0.0.18.dist-info/METADATA,sha256=Fk2M9jtKoCnfHGAkGiMoxgdgzzGKQOy3dsjJNDyhf4g,953
+petal_qc-0.0.18.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+petal_qc-0.0.18.dist-info/entry_points.txt,sha256=YPrZOsRBRsiKNDvsnbug0-Khj7DcN_Sdpq-tB_XjykI,505
+petal_qc-0.0.18.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
+petal_qc-0.0.18.dist-info/RECORD,,

{petal_qc-0.0.16.dist-info → petal_qc-0.0.18.dist-info}/WHEEL

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