petal-qc 0.0.15__py3-none-any.whl → 0.0.17__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.15"
+__version__ = "0.0.17"
 
 
 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()
@@ -48,6 +48,11 @@ def petalReceptionTests():
     from .PetalReceptionTests import main
     main()
 
+def petalCoreTestSummary():
+    """GND/VI tests."""
+    from .getPetalCoreTestSummary import main
+    main()
+
 def dashBoard():
     """Launches the Core thermal analysis ahd PDB script."""
     from .dashBoard import main

petal_qc/{test/getPetalCoreTestSummary.py → getPetalCoreTestSummary.py}

@@ -1,20 +1,26 @@
 #!/usr/bin/env python3
 """Get a summery of Petal core TEsts."""
 import json
+import sys
+import re
+from argparse import ArgumentParser
+
+
+from pathlib import Path
 try:
     import itkdb_gtk
-    
+
 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.dbGtkUtils import replace_in_container, DictDialog, ask_for_confirmation
+from petal_qc.utils.ArgParserUtils import RangeListAction
 
+r_petal_id = re.compile("PPC.([0-9]*)")
 
-def main(session, options):
+def petalCoreTest(session, options):
     """Main entry point."""
 
     # find all cores
@@ -34,20 +40,31 @@ def main(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']
@@ -71,32 +88,37 @@ def main(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"]))
 
     with open("petal_ID_db_{}.json".format(suff), "w", encoding="utf-8") as fOut:
         json.dump(petal_id_db, fOut, indent=3)
 
-if __name__ == "__main__":
-    from argparse import ArgumentParser
+def main():
+    """Main entry"""
     parser = ArgumentParser()
     parser.add_argument("--institute", default=None, help="The petal current location")
+    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:
-        main(session, options)
+        petalCoreTest(session, options)
 
     except Exception as E:
         print(E)
 
     dlg.die()
 
+if __name__ == "__main__":
+    main()
+    

petal_qc/metrology/PetalMetrology.py

@@ -45,19 +45,6 @@ def check_spec(val, nom, fraction=0.0):
         rc = val <= (1+fraction)*nom
         return rc
 
-
-class CommaSeparatedListAction(Action):
-    """Create a list from the comma sepparated numbers at imput."""
-
-    def __call__(self, args_parser, namespace, values, option_string=None):
-        """The actual action."""
-        value = np.array(list(map(float, values.split(','))), dtype='float64')
-        if value.shape[0] < 3:
-            raise ValueError("{} needs a 3D vector".format(self.dest))
-
-        setattr(namespace, self.dest, value)
-
-
 def petal_metrology(ifile, options):
     """Do the analysis of the petal metrology data.
 

petal_qc/metrology/compare_Cores.py

@@ -2,6 +2,8 @@
 """Compare quantities."""
 
 import sys
+import re
+
 import argparse
 import glob
 import json
@@ -10,6 +12,33 @@ from pathlib import Path
 import numpy as np
 import matplotlib.pyplot as plt
 
+r_petal_id = re.compile("PPC.([0-9]*)")
+
+class PetalCoreListAction(argparse.Action):
+    """Create a list from the comma sepparated numbers at imput."""
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        """The actual action."""
+        value = []
+        for V in values.split(','):
+            try:
+                value.append(int(V))
+            except ValueError:
+                if ':' not in V:
+                    continue
+
+                items = V.split(':')
+                if len(items)==1:
+                    continue
+
+                ival = list(map(int, items))
+                ival[1] += 1
+                for x in range(*ival):
+                    value.append(int(x))
+
+
+        setattr(namespace, self.dest, value)
+
 
 def get_value(data, value_path):
     """Get the value from the path given."""
@@ -59,12 +88,25 @@ def read_data_files(options):
     front = {}
     back = {}
 
+    has_list = len(options.cores) != 0
+
     for fnam in options.files:
         ifile = Path(fnam).expanduser().resolve()
         if not ifile.exists():
             print("File does not exist: ", fnam)
             continue
 
+        R = r_petal_id.search(fnam)
+        if R is None:
+            continue
+
+        petal_id = R.group(0)
+        pid = int(R.group(1))
+
+        if has_list and pid not in options.cores:
+            continue
+
+
         data = None
         with open(ifile, 'r', encoding="UTF-8") as fp:
             data = json.load(fp)
@@ -251,6 +293,8 @@ if __name__ == "__main__":
     parser.add_argument("--out", default=None, help="File to store the figure.")
     parser.add_argument("--no-legend", dest="no_legend", default=False, action="store_true", help="Do not draw the legend")
     parser.add_argument("--no-show", dest="no_show", default=False, action="store_true", help="Do not show the figure")
+    parser.add_argument("--cores", dest="cores", action=PetalCoreListAction, default=[],
+                        help="Create list of cores to analyze. The list is made with  numbers or ranges (ch1:ch2 or ch1:ch2:step) ")
 
     opts = parser.parse_args()
     if len(opts.files) == 0:

petal_qc/metrology/coreMetrology.py

@@ -18,18 +18,6 @@ from gi.repository import Gtk, GObject, Gio, GLib
 
 __HELP__ = "https://petal-qc.docs.cern.ch/metrology.html"
 
-class CommaSeparatedListAction(Action):
-    """Create a list from the comma sepparated numbers at imput."""
-
-    def __call__(self, parser, namespace, values, option_string=None):
-        """The actual action."""
-        value = np.array(list(map(float, values.split(','))), dtype='float64')
-        if value.shape[0] < 3:
-            raise ValueError("{} needs a 3D vector".format(self.dest))
-
-        setattr(namespace, self.dest, value)
-
-
 class CoreMetrology(itkdb_gtk.dbGtkUtils.ITkDBWindow):
     """Application window."""
 

petal_qc/metrology/do_Metrology.py

@@ -23,21 +23,8 @@ except ImportError:
     sys.path.append(cwd.as_posix())
 
 from petal_qc.utils.utils import output_folder
-
 from petal_qc.metrology.PetalMetrology import petal_metrology
 
-
-class CommaSeparatedListAction(Action):
-    """Create a list from the comma sepparated numbers at imput."""
-
-    def __call__(self, parser, namespace, values, option_string=None):
-        """The actual action."""
-        value = np.array(list(map(float, values.split(','))), dtype='float64')
-        if value.shape[0] < 3:
-            raise Exception("{} needs a 3D vector".format(self.dest))
-
-        setattr(namespace, self.dest, value)
-
 def do_analysis(fnam, prefix, SN, options):
     """Perform analysis of a file.
 

petal_qc/metrology/petal_flatness.py

@@ -31,19 +31,6 @@ from .show_data_file import show_data, TOP_VIEW
 
 figure_width = 14
 
-
-class CommaSeparatedListAction(Action):
-    """Create a list from the comma sepparated numbers at imput."""
-
-    def __call__(self, parser, namespace, values, option_string=None):
-        """The actual action."""
-        value = np.array(list(map(float, values.split(','))), dtype='float64')
-        if value.shape[0] < 3:
-            raise Exception("{} needs a 3D vector".format(self.dest))
-
-        setattr(namespace, self.dest, value)
-
-
 def plot_sensor(Spoints, ax, marker='o', cmap='magma'):
     """Plot the points given in a scatter plot."""
     ax.scatter(Spoints[:, 0], Spoints[:, 1], Spoints[:, 2],

petal_qc/metrology/readAVSdata.py

@@ -696,6 +696,8 @@ def readProductionSheet(session, file_path, SN):
     manufacturing["results"]["LOCATOR_B"] = sheet["{}{}".format(id_col, i_items+3)].value
     manufacturing["results"]["LOCATOR_C"] = sheet["{}{}".format(id_col, i_items+4)].value
     manufacturing["results"]["HONEYCOMBSET"] = split_comp_list( sheet["{}{}".format(id_col, i_items+5)].value)
+    manufacturing["results"]["HONEYCOMBSET"] = [ str(x) for x in manufacturing["results"]["HONEYCOMBSET"]]
+    
     manufacturing["results"]["EPOXY_ADHESIVE"] = split_comp_list(sheet["{}{}".format(id_col, i_items+8)].value)
     manufacturing["results"]["EPOXY_PUTTY"] = split_comp_list( sheet["{}{}".format(id_col, i_items+9)].value)
     manufacturing["results"]["EPOXY_CONDUCTIVE"] = split_comp_list( sheet["{}{}".format(id_col, i_items+10)].value)

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.
@@ -537,6 +537,23 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
             if self.petal_core is None:
                 return
 
+        this_petal = self.SN.get_text()
+        # Check for HonneyComb set
+        for P in self.petal_core["properties"]:
+            if P["code"] == "HC_ID" and P["value"] is None:
+                if dbGtkUtils.is_iterable(components["HoneyCombSet"]):
+                    val = ','.join([str(x) for x in components["HoneyCombSet"]])
+                else:
+                    val = str(components["HoneyCombSet"])
+                rc = ITkDButils.set_component_property(self.session,
+                                                        this_petal,
+                                                        "HC_ID",
+                                                        val)
+                if rc is None:
+                    error_txt.append("Problems setting HoneyCombSet ID.\n")
+
+                break
+
         comp_map = {
             "BT_PETAL_FRONT": "FacingFront",
             "BT_PETAL_BACK": "FacingBack",
@@ -565,7 +582,6 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
         error_txt = []
         txt = "Click OK to add\n\t{}".format("\n\t".join(missing))
         if dbGtkUtils.ask_for_confirmation("Missing components", txt, parent=self):
-            this_petal = self.SN.get_text()
             for cmp in missing:
                 SN = components[comp_map[cmp]]
                 if SN[0:5] == "20USE":
@@ -582,22 +598,6 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
                         if rc is None:
                             print("Could not set final stage of {} [{}]".format(ctype, SN))
 
-            # Check for HonneyComb set
-            for P in self.petal_core["properties"]:
-                if P["code"] == "HC_ID" and P["value"] is None:
-                    if dbGtkUtils.is_iterable(components["HoneyCombSet"]):
-                        val = ' '.join(components["HoneyCombSet"])
-                    else:
-                        val = str(components["HoneyCombSet"])
-                    rc = ITkDButils.set_component_property(self.session,
-                                                           this_petal,
-                                                           "HC_ID",
-                                                           val)
-                    if rc is None:
-                        error_txt.append("Problems setting HoneyCombSet ID.\n")
-
-                    break
-
             # Check the final stage of the assembled objects
             # for child in self.petal_core["children"]:
             #     if child["component"]: