petal-qc 0.0.16__tar.gz → 0.0.18__tar.gz

{petal_qc-0.0.16 → petal_qc-0.0.18}/PKG-INFO

@@ -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 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.18/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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-0.0.16 → petal_qc-0.0.18}/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")