petal-qc 0.0.11__py3-none-any.whl → 0.0.14.dev1__py3-none-any.whl

petal_qc/PetalReceptionTests.py

@@ -0,0 +1,330 @@
+#!/usr/bin/env python3
+"""Test dashboard."""
+import sys
+import copy
+from pathlib import Path
+
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+    import itkdb_gtk
+
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import UploadTest, UploadMultipleTests
+
+HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
+
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gio
+
+
+def find_children(W):
+    """Find DictDialog among the children."""
+    try:
+        for c in W.get_children():
+            if "DictDialog" in c.get_name():
+                return c
+
+            else:
+                return find_children(c)
+
+    except Exception:
+        return None
+
+    return None
+
+
+class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
+    """Petl Reception Test GUI."""
+
+    def __init__(self, session, help_link=None):
+        """Initialization."""
+        super().__init__(title="Petal Reception Tests",
+                         session=session,
+                         show_search="Find object with given SN.",
+                         help_link=help_link)
+
+        # Members
+        self.dbObject = None
+
+        # action button in header
+        button = Gtk.Button()
+        icon = Gio.ThemedIcon(name="document-send-symbolic")
+        image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.BUTTON)
+        button.add(image)
+        button.set_tooltip_text("Click to upload ALL tests.")
+        button.connect("clicked", self.upload_tests)
+        self.hb.pack_end(button)
+
+        grid = Gtk.Grid(column_spacing=5, row_spacing=1)
+        self.mainBox.pack_start(grid, False, False, 5)
+
+        lbl = Gtk.Label(label="Serial Number")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 0, 1, 1)
+
+
+        self.SN = itkdb_gtk.dbGtkUtils.TextEntry()
+        self.SN.connect("text-changed", self.on_SN_changed)
+
+        #self.SN = Gtk.Entry()
+        #self.SN.connect("focus-in-event", self.on_sn_enter)
+        #self.SN.connect("focus-out-event", self.on_sn_leave)
+        grid.attach(self.SN.entry, 1, 0, 1, 1)
+
+        self.alias = Gtk.Label(label="")
+        grid.attach(self.alias, 2, 0, 1, 1)
+
+        self.stage = Gtk.Label(label="")
+        grid.attach(self.stage, 3, 0, 1, 1)
+
+        lbl = Gtk.Label(label="Institute")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 1, 1, 1)
+
+        self.institute = self.pdb_user["institutions"][0]["code"]
+        inst = self.create_institute_combo(only_user=True)
+        inst.connect("changed", self.new_institute)
+        inst.set_tooltip_text("Select the Institute.")
+        grid.attach(inst, 1, 1, 1, 1)
+        self.inst_cmb = inst
+
+        # The "Add/Remove/Send Item" buttons.
+        box = Gtk.ButtonBox(orientation=Gtk.Orientation.HORIZONTAL)
+        box.set_layout(Gtk.ButtonBoxStyle.END)
+        self.mainBox.pack_start(box, False, False, 0)
+        dbGtkUtils.add_button_to_container(box, "Upload test", "Upload this test", self.upload_single_test)
+        dbGtkUtils.add_button_to_container(box, "Add Defect", "Click to add a defect", self.add_defect)
+        dbGtkUtils.add_button_to_container(box, "Add Comment", "Click to add a comment", self.add_comment)
+
+        # The notebook
+        self.notebook = Gtk.Notebook()
+        self.notebook.set_tab_pos(Gtk.PositionType.LEFT)
+        self.notebook.set_size_request(-1, 250)
+        self.mainBox.pack_start(self.notebook, True, True, 0)
+
+        # Create the Notebook pages
+        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("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("X-rays", "XRAYIMAGING")
+
+
+        # The text view
+        self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
+
+        # Set the default institute
+        dbGtkUtils.set_combo_iter(inst, self.institute)
+
+
+        self.show_all()
+
+    def on_SN_changed(self, entry, value):
+        """New SN given. Ask in PDB,"""
+        if len(value) <= 0:
+            return None
+
+        self.query_db()
+        current_location = self.dbObject["currentLocation"]["code"]
+        dbGtkUtils.set_combo_iter(self.inst_cmb, current_location, 0)
+
+        stg = self.dbObject["currentStage"]["name"]
+        self.stage.set_text(stg)
+
+        entry.set_text(self.dbObject["serialNumber"])
+
+        alias = self.dbObject["alternativeIdentifier"]
+        self.alias.set_text(alias)
+
+        npages = self.notebook.get_n_pages()
+        for i in range(npages):
+            page = self.notebook.get_nth_page(i)
+            page.dict_dialog.factory_reset()
+
+
+    def create_test_box(self, label, test_name, institute=None):
+        """Create and add to notebook a test dialog.
+
+        Args:
+            label: The label for the Notebook
+            test_name: The DB name of the test
+            institute: The institute.
+
+        """
+        if institute is None:
+            institute = self.institute
+
+        defaults = {
+            "institution": institute,
+            "runNumber": "1",
+        }
+        dto = ITkDButils.get_test_skeleton(self.session, "CORE_PETAL", test_name, defaults)
+        if test_name == "VISUAL_INSPECTION":
+            scrolled, gM = dbGtkUtils.create_scrolled_dictdialog(dto, ("component", "testType", "results"))
+        else:
+            scrolled, gM = dbGtkUtils.create_scrolled_dictdialog(dto)
+
+        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        box.set_border_width(5)
+        box.pack_end(scrolled, True, True, 0)
+        box.dict_dialog = gM
+        gM.box = box
+
+        self.notebook.append_page(box, Gtk.Label(label=label))
+
+        return gM
+
+    def query_db(self, *args):
+        """Search button clicked."""
+        SN = self.SN.get_text()
+        if len(SN) == 0:
+            dbGtkUtils.complain("Empty Serial number",
+                                "You should enter a valid Serial number for the petal core.",
+                                parent=self)
+
+        try:
+            self.dbObject = ITkDButils.get_DB_component(self.session, SN)
+
+        except Exception as E:
+            self.write_message(str(E)+'\n')
+            dbGtkUtils.complain("Could not find object in DB", str(E))
+            self.dbObject = None
+            return
+
+        #print(json.dumps(self.dbObject, indent=3))
+
+    def add_defect(self, btn):
+        """Add a new defect."""
+        page = self.notebook.get_nth_page(self.notebook.get_current_page())
+        values = dbGtkUtils.get_a_list_of_values("Insert new defect", ("Type", "Description/v"))
+        if len(values)>0:
+            defect = {"name": values[0], "description": values[1]}
+            page.dict_dialog.values["defects"].append(defect)
+            page.dict_dialog.refresh()
+
+    def add_comment(self, btn):
+        """Add a new comment."""
+        page = self.notebook.get_nth_page(self.notebook.get_current_page())
+        comment = dbGtkUtils.get_a_value("Insert new comment", is_tv=True)
+        if comment:
+            page.dict_dialog.values["comments"].append(comment)
+            page.dict_dialog.refresh()
+
+    def new_institute(self, combo):
+        """A new institute has been selected."""
+        inst = self.get_institute_from_combo(combo)
+        if inst:
+            self.institute = inst
+
+            npages = self.notebook.get_n_pages()
+            for i in range(npages):
+                page = self.notebook.get_nth_page(i)
+                page.dict_dialog.values["institution"] = self.institute
+                page.dict_dialog.refresh()
+
+    def upload_this_test(self, values):
+        """Upload a single test."""
+        # print(json.dumps(values, indent=2))
+
+        attachments = []
+        if values["testType"] == "XRAYIMAGING":
+            fnam = values["results"]["IMAGELINK"]
+            if fnam is not None and len(fnam)>0:
+                P = Path(fnam).expanduser().resolve()
+                if P.exists():
+                    A = ITkDButils.Attachment(path=P.as_posix(), title=P.name, desc="X-ray image")
+                    values["results"]["IMAGELINK"] = P.name
+                    attachments.append(A)
+
+        # rc = ITkDButils.upload_test(self.session, values, attachments=attachments, check_runNumber=True)
+        # if rc is not None:
+        #     dbGtkUtils.complain("Could not upload test", rc)
+        # 
+        # else:
+        #     self.write_message("Test uploaded. {} - {}\n".format(values["component"], values["testType"]))
+        uploadW = UploadTest.UploadTest(self.session, values, attachments)
+
+
+    def upload_single_test(self, *args):
+        """Upload the current test."""
+        SN = self.SN.get_text()
+        if len(SN) == 0:
+            dbGtkUtils.complain("Petal SN is empty")
+            return
+
+        page = self.notebook.get_nth_page(self.notebook.get_current_page())
+        dctD = find_children(page)
+        if dctD is None:
+            return
+
+        values = copy.deepcopy(dctD.values)
+        values["component"] = SN
+        self.upload_this_test(values)
+
+    def upload_tests(self, *args):
+        """Upload the current test."""
+        SN = self.SN.get_text()
+        if len(SN) == 0:
+            dbGtkUtils.complain("Petal SN is empty")
+            return
+
+        W = UploadMultipleTests.UploadMultipleTests(
+            self.session,
+            help_link="{}/uploadMultipleTests.html".format(HELP_LINK)
+        )
+
+        for ipage in range(self.notebook.get_n_pages()):
+            page = self.notebook.get_nth_page(ipage)
+            dctD = find_children(page)
+            if dctD is None:
+                continue
+
+            values = dctD.values
+            if values["testType"] == "XRAYIMAGING":
+                if values["institution"] != "IFIC":
+                    continue
+                
+                fnam = values["results"]["IMAGELINK"]
+                if fnam is None or len(fnam)==0:
+                    continue
+
+            values["component"] = SN
+            W.add_test_data_to_view(values)
+
+def main():
+    """Main entry."""
+    # DB login
+    HELP_LINK="https://petal-qc.docs.cern.ch/petalReceptionTests.html"
+
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+    if client is None:
+        print("Could not connect to DB with provided credentials.")
+        dlg.die()
+        sys.exit()
+
+    client.user_gui = dlg
+
+    gTest = PetalReceptionTests(client, help_link=HELP_LINK)
+
+    gTest.present()
+    gTest.connect("destroy", Gtk.main_quit)
+    try:
+        Gtk.main()
+
+    except KeyboardInterrupt:
+        print("Arrrgggg!!!")
+
+    dlg.die()
+
+
+if __name__ == "__main__":
+    main()

petal_qc/__init__.py

@@ -1,5 +1,5 @@
 """petal_qc python module."""
-__version__ = "0.0.11"
+__version__ = "0.0.14.dev1"
 
 
 def coreMetrology():
@@ -38,6 +38,10 @@ def analyzeIRCore():
     from .thermal.analyze_IRCore import main
     main()
 
+def petalReceptionTests():
+    """GND/VI tests."""
+    from .PetalReceptionTests import main
+    main()
 
 def dashBoard():
     """Launches the Core thermal analysis ahd PDB script."""

petal_qc/dashBoard.py

@@ -3,7 +3,7 @@ import sys
 
 try:
     import petal_qc
-    
+
 except ImportError:
     from pathlib import Path
     cwd = Path(__file__).parent
@@ -12,6 +12,7 @@ except ImportError:
 from petal_qc.metrology.coreMetrology import CoreMetrology, CoreMetrologyOptions
 from petal_qc.thermal.coreThermal import CoreThermal
 from petal_qc.thermal.IRPetalParam import IRPetalParam
+from petal_qc.PetalReceptionTests import PetalReceptionTests
 
 from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import ITkDBlogin
@@ -27,7 +28,8 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     """Dashboard class."""
     PETAL_CORE_METRO = 1
     PETAL_CORE_THERMAL = 2
-    
+    PETAL_RECEPTION_TEST = 3
+
 
     def __init__(self, session):
         """Initialization."""
@@ -40,7 +42,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         # Prepare dashboard
         grid = Gtk.Grid(column_spacing=5, row_spacing=5)
         self.mainBox.pack_start(grid, False, True, 5)
-        
+
         irow = 0
         lbl = Gtk.Label()
         lbl.set_markup("<b>Tests</b>")
@@ -51,19 +53,34 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnPetalMetrology = Gtk.Button(label="Petal Core Metrology")
         btnPetalMetrology.connect("clicked", self.petal_metrology)
         grid.attach(btnPetalMetrology, 0, irow, 1, 1)
-        
+
         btnPetalThermal = Gtk.Button(label="Petal Core Thermal")
         btnPetalThermal.connect("clicked", self.petal_thermal)
         grid.attach(btnPetalThermal, 1, irow, 1, 1)
-            
+
 
         irow += 1
-        grid.attach(Gtk.Label(), 0, irow, 1, 1)
-        
+        btnReception = Gtk.Button(label="Reception Tests")
+        btnReception.connect("clicked", self.petal_reception_test)
+        grid.attach(btnReception, 0, irow, 1, 1)
+
         self.mainBox.pack_start(Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL), False, True, 5)
 
         self.show_all()
-        
+
+    def petal_reception_test(self, *args):
+        """Do petal reception test."""
+        bitn = DashWindow.PETAL_RECEPTION_TEST
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        self.mask |= bt
+        W = PetalReceptionTests(
+            self.session,
+            help_link="{}/petalReceptionTests.html".format(HELP_LINK)
+        )
+        W.connect("destroy", self.app_closed, bitn)
 
     def petal_metrology(self, *args):
         """Do petal metrology"""
@@ -87,10 +104,13 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
         self.mask |= bt
         opt = IRPetalParam()
+        opt.files = []
+        opt.golden = None
         opt.folder = None
         opt.out = None
         opt.alias = None
         opt.SN = None
+        opt.desy = False
         W = CoreThermal(opt, self.session, title="Petal Thermal Test.")
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
@@ -100,7 +120,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         bt = 1 << args[1]
         self.mask &= ~bt
         # print(bt, self.mask)
-        
+
 def main():
     """Main entry"""
     # DB login

petal_qc/metrology/PetalMetrology.py

@@ -243,34 +243,34 @@ def petal_metrology(ifile, options):
         if key == "LOCATION_DELTA":
             for k, v in val.items():
                 delta = np.linalg.norm(v)
-                if not check_spec(delta, 0.050):
+                if not check_spec(delta, 0.075):
                     dbOut["defects"].append({
                         "name": key,
-                        "description": "Delta {} is {:.3f} mm > 0.050 mm.".format(k, delta)
+                        "description": "Delta {} is {:.3f} mm > 0.075 mm.".format(k, delta)
                     })
 
         elif key == "REL_POS_DELTA":
             for k, v in val.items():
                 delta = np.linalg.norm(v)
-                if not check_spec(delta, 0.050):
+                if not check_spec(delta, 0.075):
                     dbOut["defects"].append({
                         "name": key,
-                        "description": "Delta {} is {:.3f} mm > 0.050 mm.".format(k, delta)
+                        "description": "Delta {} is {:.3f} mm > 0.075 mm.".format(k, delta)
                     })
 
-        elif "CHECK_" in key:
-            if "OVERSIZE" in key:
-                if not check_spec(abs(val), 0.050):
-                    dbOut["defects"].append({
-                        "name": key,
-                        "description": "LOC DIAM delta is {:.3f} mm > 0.050 mm.".format(abs(val))
-                    })
-            else:
-                if val < 0 or val > 0.012:
-                    dbOut["defects"].append({
-                        "name": key,
-                        "description": "LOC DIAM  is not H7  0 <= {:.3f} <= 0.012 mm.".format(val)
-                    })
+        # elif "CHECK_" in key:
+        #     if "OVERSIZE" in key:
+        #         if not check_spec(abs(val), 0.050):
+        #             dbOut["defects"].append({
+        #                 "name": key,
+        #                 "description": "LOC DIAM delta is {:.3f} mm > 0.050 mm.".format(abs(val))
+        #             })
+        #     else:
+        #         if val < 0 or val > 0.012:
+        #             dbOut["defects"].append({
+        #                 "name": key,
+        #                 "description": "LOC DIAM  is not H7  0 <= {:.3f} <= 0.012 mm.".format(val)
+        #             })
 
         ofile.close()
 

petal_qc/metrology/coreMetrology.py

@@ -353,6 +353,7 @@ class CoreMetrologyOptions(object):
         self.files = []
         self.SN = None
         self.desy = False
+        self.is_front = False
         self.folder = None
         self.prefix = None
         self.locking_points = None

petal_qc/test/getAVStests.py

@@ -1,18 +1,20 @@
 #!/usr/bin/env python3
 """Analize AVS metrology tests."""
+import sys
+from pathlib import Path
 import numpy as np
 import matplotlib.pyplot as plt
 
 try:
-    import itkdb_gtk
+    import petal_qc
 
 except ImportError:
-    import sys
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import ITkDBlogin, ITkDButils
+from itkdb_gtk import ITkDBlogin
+import petal_qc.utils.docx_utils as docx_utils
+
 
 
 def get_value(results, code):
@@ -108,24 +110,40 @@ def do_weighing(results, weights):
         weights.setdefault(value["code"][ipos+1:], []).append(value["value"])
 
 
-def plot_metrology(M_values, Mould_values, petal_ids):
+def plot_metrology(M_values, Mould_values, petal_ids, document):
     """Plot metrology values."""
+    fsize = np.zeros(2)
+
+    document.add_heading('Deviation from nominal positions', level=1)
     for key, values in M_values.items():
         fig, ax = plt.subplots(ncols=1, nrows=1, tight_layout=True)
         ax.hist(values, bins=15, range=(0, 0.150))
         ax.set_title(key)
-
+        ax.grid(True)
+        ax.set_xlabel("Distance (mm)")
+        fsize = fig.get_size_inches()
+        if key != "FIDUCIAL1":
+            document.add_picture(fig, True, 14, caption=key)
+
+    fsize[1] = fsize[0]/0.82
+    document.add_heading('Dependency with moulds', level=1)
     for obj in M_values.keys():
-        fig, ax = plt.subplots(ncols=1, nrows=4, tight_layout=True)
+        fig, ax = plt.subplots(ncols=1, nrows=4, tight_layout=True, figsize=fsize)
         fig.suptitle("{} - Mould".format(obj))
         for mould, m_values in Mould_values.items():
             im = int(mould) - 1
             ax[im].hist(m_values[obj], bins=15, range=(0, 0.150), label="Mould {}".format(mould))
 
         for i in range(4):
+            ax[i].grid(True)
+            ax[i].set_xlabel("Distance (mm)")
             ax[i].set_title("Mould {}".format(i+1))
 
-def plot_weighing(weights, tick_labels, show_total=False):
+        if obj != "FIDUCIAL1":
+            document.add_picture(fig, True, 14, caption=obj)
+
+
+def plot_weighing(weights, tick_labels, document, show_total=False):
     """Make the plot of weights."""
     labels = ["COOLINGLOOPASSEMBLY", "LOCATOR_A", "LOCATOR_B", "LOCATOR_C",
               "HONEYCOMBSET", "FACING_FRONT", "FACING_BACK",
@@ -169,13 +187,19 @@ def main(session):
     }
 
     core_list = session.get("listComponents", json=payload)
-    core_tests = ["METROLOGY_AVS", "WEIGHING", "MANUFACTURING"]
+    core_tests = ["METROLOGY_AVS", "WEIGHING", "MANUFACTURING", "DELAMINATION", "GROUNDING_CHECK", "VISUAL_INSPECTION"]
 
     weights = {}
     petal_ids = []
     M_values = {}
     Mould_values = {}
     mould_id = None
+    i = 0
+    bad_cores = {}
+    counter = {"TOTAL":0}
+    for T in core_tests:
+        counter[T]=0
+
     for core in core_list:
         SN = core["serialNumber"]
         altid = core['alternativeIdentifier']
@@ -222,6 +246,7 @@ def main(session):
         if mould_id not in Mould_values:
             Mould_values[mould_id] = {}
 
+        counter["TOTAL"] += 1
         for ttype, T in good_tests.items():
 
             if ttype == "WEIGHING":
@@ -233,20 +258,50 @@ def main(session):
             elif ttype == "MANUFACTURING":
                 continue
 
-            else:
-                for value in T["results"]:
-                    print("\t{} - {}".format(value["code"], value["value"]))
+            # else:
+            #     if T["results"]:
+            #         for value in T["results"]:
+            #             print("\t{} - {}".format(value["code"], value["value"]))
 
             if not T["passed"]:
                 print("## test {} FAILED".format(T["testType"]["code"]))
+                bad_cores.setdefault(altid, []).append({ttype: T["defects"]})
+
+            else:
+                try:
+                    counter[ttype] += 1
+                except KeyError:
+                    pass
 
             if len(T["defects"]):
                 print("+ Defects:")
                 for D in T["defects"]:
                     print("\t{} - {}".format(D["name"], D["description"]))
 
-    plot_weighing(weights, petal_ids)
-    plot_metrology(M_values, Mould_values, petal_ids)
+    document = docx_utils.Document()
+    document.add_page_numbers()
+    document.styles['Normal'].font.name = "Calibri"
+    document.add_heading("AVS QC tests.", 0)
+
+    document.add_heading('Results', level=1)
+    document.add_paragraph("Number of bad cores: {}.".format(len(bad_cores)))
+    document.add_heading("Bad cores", level=2)
+    for key, lst in bad_cores.items():
+        p = document.add_paragraph()
+        bf = p.add_run("{}:".format(key))
+        bf.bold = True
+        bf.italic = True
+        for item in lst:
+            for ttype, defects in item.items():
+                msg = "{}:".format(ttype)
+                for  D in defects:
+                    msg += "\r{} - {}".format(D["name"], D["description"])
+                document.add_paragraph(msg, style="List Bullet")
+
+
+    plot_weighing(weights, petal_ids, document)
+    plot_metrology(M_values, Mould_values, petal_ids, document)
+    document.save("AVStests.docx")
     plt.show()
 
 if __name__ == "__main__":
@@ -254,10 +309,6 @@ if __name__ == "__main__":
     dlg = ITkDBlogin.ITkDBlogin()
     session = dlg.get_client()
 
-    try:
-        main(session)
-
-    except Exception as E:
-        print(E)
+    main(session)
 
     dlg.die()

petal_qc/test/prepareDESYfiles.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Prepare raw data input files from DESY so that we can use them with this code."""
 import os
+import sys
 import fnmatch
 import re
 from pathlib import Path
@@ -61,7 +62,7 @@ def main(folder, out_folder):
         P = Path(fnam).expanduser().resolve()
         with open(fnam, "r", encoding="UTF-8") as ff:
             R = rgx.search(ff.read())
-            if R: 
+            if R:
                 petal_id = "PPC.{}".format(R.group(2))
                 side = R.group(1).lower()
                 if "_2D_" in P.name:
@@ -86,7 +87,7 @@ def main(folder, out_folder):
             for data_type, fnam in values.items():
                 if fnam is None:
                     print("This should not happen.")
-                    
+
                 with open(fnam, "r", encoding="UTF-8") as ifile:
                     data += ifile.read()
 
@@ -94,10 +95,14 @@ def main(folder, out_folder):
                 ofile.write(data)
 
     list_file.close()
-    
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument("--input-folder", default=None, help="Input folder")
-    parser.add_argument("--output-folder", help="Outout fodler", default=None)
-    
-    main("/Users/lacasta/Downloads/Report_QC-desy_Sep2024", "/tmp/desy")
+    parser.add_argument("--input-folder", dest="input", default=None, help="Input folder")
+    parser.add_argument("--output-folder", dest="output", help="Outout fodler", default=None)
+    opts = parser.parse_args()
+    if opts.input is None or opts.output is None:
+        print("I need both an input and an output folder.")
+        sys.exit(-1)
+
+    main(opts.input, opts.output)

petal_qc/thermal/coreThermal.py

@@ -50,7 +50,6 @@ class CoreThermal(itkdb_gtk.dbGtkUtils.ITkDBWindow):
             panel_size: size of message pannel.
         """
         super().__init__(session=session, title=title, help_link=__HELP__ )
-
         self.petal_SN = None
         self.param = params if params else IRPetalParam()
         self.param.add_attachments = True
@@ -119,7 +118,7 @@ class CoreThermal(itkdb_gtk.dbGtkUtils.ITkDBWindow):
 
         # The Serial number
         self.SN = itkdb_gtk.dbGtkUtils.TextEntry()
-        if len(self.param.SN)>0:
+        if self.param.SN is not None and len(self.param.SN)>0:
             self.SN.set_text(self.param.SN)
         elif self.param.alias and len(self.param.alias)>0:
             self.SN.set_text(self.param.alias)

petal_qc/thermal/create_core_report.py

@@ -39,12 +39,19 @@ def create_report(options):
 
     print("\n## {} - {}".format(options.SN, options.alias))
 
+    # Do the core analysis.
+    core = create_IR_core(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)
         goldenFile = Path(goldenFile).expanduser().resolve()
         if not goldenFile.exists():
             print("I need a golden file.")
+            return core
 
     with open(goldenFile, "r", encoding='utf-8') as fp:
         golden = golden_from_json(json.load(fp))
@@ -65,9 +72,6 @@ def create_report(options):
     P = document.add_paragraph("Golden: {}".format(goldenFile.name), "Subtitle")
     P.alignment = docx_utils.paragraph_align_center()
 
-
-    core = create_IR_core(options)
-
     figures = get_IRcore_plots()
     document.add_heading('Original image', level=1)
     document.add_picture(figures["original"], True, 14, caption="Original Thermal image.")

{petal_qc-0.0.11.dist-info → petal_qc-0.0.14.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: petal_qc
-Version: 0.0.11
+Version: 0.0.14.dev1
 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.11.dist-info → petal_qc-0.0.14.dev1.dist-info}/RECORD

@@ -1,11 +1,12 @@
-petal_qc/__init__.py,sha256=toTs5ifp9kAtN2X0JHsd6eRdbF1JwwXMRGpN_chgCI4,1202
-petal_qc/dashBoard.py,sha256=D2f1rB_saQYiv9mqJT9Sit44jsXviYBvc-b04CjWCa8,3389
+petal_qc/PetalReceptionTests.py,sha256=cSrq4PUjdV7T16ARonhsnXWPBBRuvliTKlZwEPfgRVY,10832
+petal_qc/__init__.py,sha256=YDzaXlGm2rI4RBobKXtR84NpZJWMw8nl_C8Y5O2Vg2s,1311
+petal_qc/dashBoard.py,sha256=U_UHNMca3H2ogD4a0Vpe4ZVUKEv2-xmGZQEZ9_aH0E4,4034
 petal_qc/BTreport/CheckBTtests.py,sha256=CxR8lcawwhdzkBs8jZCXI6TSGPOsOEigpAND0D1O0cs,8178
 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/metrology/Cluster.py,sha256=UtZ5q1EFb8f3qC0hEYBbhRg2pPbW_28aJX2EEMu00Ho,2105
 petal_qc/metrology/DataFile.py,sha256=PbFqy3-WSj69epV5EjhHc1GKhA8I74FmJYOXUjN0V20,1367
-petal_qc/metrology/PetalMetrology.py,sha256=ckegNsijvGq0HhM0ssBr789FHp1dVcGQnc0ASZ4jMLk,12755
+petal_qc/metrology/PetalMetrology.py,sha256=YxzS-awU4PWdCYdJH754BrSOEilHf9gsyS7fcGzWV04,12781
 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=isIWUsZrBpXgQbmXN4Gl5Zbv5R91UC8jQAU113_gRD8,20531
@@ -14,7 +15,7 @@ petal_qc/metrology/compare_Cores.py,sha256=ysfDs0QIqIH0BBgy5RUXZNSzCgjqLfjN2XH7M
 petal_qc/metrology/comparisonTable.py,sha256=6Zmh-x0ahs28ZJQuHMrIiRcblUmTN1_-1otFSRNMPds,1743
 petal_qc/metrology/convert_mitutoyo.py,sha256=HdXQzFL5y7r8qXDzti91VItDQ-y6D9rEAYknn4yHwBs,5449
 petal_qc/metrology/convert_smartscope.py,sha256=0vAEYn7ec4qTnLfjphj1QA6tK3vZsXyF6nYYj3jE5Yc,6174
-petal_qc/metrology/coreMetrology.py,sha256=mkqrD03vVziV1go8qtIlXi3A0j7cWaWL9ANNE0JawdU,13839
+petal_qc/metrology/coreMetrology.py,sha256=2BHc-h2xaFB3IK6VW_t96_swLiCf04EW7CeHq7hEKe4,13869
 petal_qc/metrology/data2csv.py,sha256=2ttMSmfGLPIaOqZGima2dH6sdnSRAFTHlEbSOfW5ebA,1809
 petal_qc/metrology/do_Metrology.py,sha256=eS8SeEn7oRiEceO3ybhSr2dv_Ki1NoKj9QAySSHmEB8,3949
 petal_qc/metrology/flatness4nigel.py,sha256=SUHwn6pCEUWQV_62-_9-VKrmUdL4gVQcSA3aTtYq958,4071
@@ -28,10 +29,10 @@ petal_qc/metrology/uploadPetalInformation.py,sha256=7JXTNRaThXlWLKwPAC6v9N2jFK1n
 petal_qc/test/checkAVStests.py,sha256=TQ6EscfqL65sNC6QX5FElakYShnuMvqvKYhroXjZD0Q,4815
 petal_qc/test/compare_golden.py,sha256=lG1rtYLw_PwKWrLk0VVdbnRhi7Ytu78q7PGWcYptM_8,1171
 petal_qc/test/getAVSjson.py,sha256=o8AYtyr7Vnp-enznmQ-NNiivZipmxtoVrmsfnRCl0X4,977
-petal_qc/test/getAVStests.py,sha256=NbbuniNj2MjwaUoLHdHPFyEuKZbTulAaOsf3r2ZVeSE,7665
+petal_qc/test/getAVStests.py,sha256=BMP_u7wbgSSu1bYtjDiSBWVGNOmKPJtMhG_9t9GQxB4,9516
 petal_qc/test/getPetalCoreTestSummary.py,sha256=5MGr0G0Lvk6ruiUxK5EmJOWv9iz-mIhxRn3WfQzjhoM,2597
 petal_qc/test/listPetalCoreComponents.py,sha256=7U9wokRkgeZdYZKeZdAadA32BlhVK6okInuh94hmj24,2502
-petal_qc/test/prepareDESYfiles.py,sha256=mJyu1UXSe_VnCv0vHogjhSxl5PCvjmiySNPsDCWoCt0,3582
+petal_qc/test/prepareDESYfiles.py,sha256=mvC-iQlIASm6j8B5_SbMAmmTtBwVsCAzBOn7VLUVwUc,3717
 petal_qc/test/test_Graphana.py,sha256=fXcqHzgrfZGjSF-WoMLl96G97XjXVnynHYC-5rKw_-c,1032
 petal_qc/test/test_coreThermal.py,sha256=YRPK3DGG7Tz66K4Kka3euXgUDzW_JlIqSYicMBhb96E,1516
 petal_qc/thermal/CSVImage.py,sha256=Vt2kYmUsZWkQvxcF8fDda3HO1Rb29kPQHnEoHFCqWYo,2038
@@ -48,9 +49,9 @@ petal_qc/thermal/PipeFit.py,sha256=MNQYk9NivBsDze6CVwE1cFdJjrqqbn8FK19436nFMVY,1
 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/coreThermal.py,sha256=ZTnqDWm7OJWV85OUiSuOUsYDMZK542k1-iBbMDP8O7o,16198
+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=NABi_YmGJ5FUQU9YDpq2mHNr13GUTOfbzUpQ36JlH78,5912
+petal_qc/thermal/create_core_report.py,sha256=MsB-Knr2iiHReyInLEd825KSzwG7VuAHSM_2MmPlW3g,6019
 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
@@ -63,8 +64,8 @@ petal_qc/utils/docx_utils.py,sha256=Eye16PF8W0mPBVdQvgFKWxPYV7-hzBgANPDZtUEjzf8,
 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.11.dist-info/METADATA,sha256=Stv2JHzQshHZZnHv0Vz5lgmaZDAV-nUXPXSwi_HEcz0,954
-petal_qc-0.0.11.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-petal_qc-0.0.11.dist-info/entry_points.txt,sha256=LeeZ2NX3oJxd_Ovj8Y1LiK381y8tCeoY_-mdt7fswfs,356
-petal_qc-0.0.11.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
-petal_qc-0.0.11.dist-info/RECORD,,
+petal_qc-0.0.14.dev1.dist-info/METADATA,sha256=CPpAB40vJWj80fSWpLiG6ZhNP-oZ0V--lgqpCXz1oDM,959
+petal_qc-0.0.14.dev1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+petal_qc-0.0.14.dev1.dist-info/entry_points.txt,sha256=1HWHVknmjrv_zXikQ60y_-qvieHungPH-EEzSimO5bw,407
+petal_qc-0.0.14.dev1.dist-info/top_level.txt,sha256=CCo1Xe6kLS79PruhsB6bk2CuL9VFtNdNpgJjYUs4jk4,9
+petal_qc-0.0.14.dev1.dist-info/RECORD,,

{petal_qc-0.0.11.dist-info → petal_qc-0.0.14.dev1.dist-info}/WHEEL

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

{petal_qc-0.0.11.dist-info → petal_qc-0.0.14.dev1.dist-info}/entry_points.txt

@@ -5,5 +5,6 @@ coreMetrology = petal_qc:coreMetrology
 coreThermal = petal_qc:coreThermal
 createCoreThermalReport = petal_qc:createCoreThermalReport
 doMetrology = petal_qc:doMetrology
+petalReceptionTests = petal_qc:petalReceptionTests
 petalqc_dashBoard = petal_qc:dashBoard
 uploadPetalInformation = petal_qc:uploadPetalInformation