itkdb-gtk 0.0.16.dev1__tar.gz → 0.0.16.dev3__tar.gz

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.16.dev1
+Version: 0.0.16.dev3
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils
@@ -41,28 +41,28 @@ Reads the AVS Production Sheet and FAT reports. With this information it creates
 the petal core in the DB, if not yet there, make the assembly of the components,
 and uploadas the test runs made at AVS.
 
-## uploadTest.py
+## UploadTest.py
 A GUI to upload the JSON files corresponding to a test and, also, to add
 attachmetns.
 
-## uploadMultipleTests.py
+## UploadMultipleTests.py
 This will allow to select various test files, or even scan a whole directory to
 find them, and assign comments, defects or attachments to each of the tests found.
 
-## getShipments.py
+## GetShipments.py
 Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## sendShipments.py
+## SendShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 
-## groundVITests.py
+## GroundVITests.py
 Allows to upload and enter valueos, comments and defects for those items in the gounding
 and visual instpections tests of the petal core.
 
-## uploadIVfiles.py
+## UploadModuleIV.py
 The idea behind this is that we messure the IV on a Ring module and on only one of the to Half modules. The IV of the remaining half modules is derived from the other 2. Eventually the IV test can be uploaded to the DB.
 
 ## dashBoard.py

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/README.md

@@ -24,28 +24,28 @@ Reads the AVS Production Sheet and FAT reports. With this information it creates
 the petal core in the DB, if not yet there, make the assembly of the components,
 and uploadas the test runs made at AVS.
 
-## uploadTest.py
+## UploadTest.py
 A GUI to upload the JSON files corresponding to a test and, also, to add
 attachmetns.
 
-## uploadMultipleTests.py
+## UploadMultipleTests.py
 This will allow to select various test files, or even scan a whole directory to
 find them, and assign comments, defects or attachments to each of the tests found.
 
-## getShipments.py
+## GetShipments.py
 Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## sendShipments.py
+## SendShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 
-## groundVITests.py
+## GroundVITests.py
 Allows to upload and enter valueos, comments and defects for those items in the gounding
 and visual instpections tests of the petal core.
 
-## uploadIVfiles.py
+## UploadModuleIV.py
 The idea behind this is that we messure the IV on a Ring module and on only one of the to Half modules. The IV of the remaining half modules is derived from the other 2. Eventually the IV test can be uploaded to the DB.
 
 ## dashBoard.py

itkdb_gtk-0.0.16.dev1/itkdb_gtk/uploadIVfiles.py → itkdb_gtk-0.0.16.dev3/itkdb_gtk/UploadModuleIV.py

@@ -32,10 +32,10 @@ try:
     import dbGtkUtils
     import ITkDBlogin
     import ITkDButils
-    import uploadTest
+    import UploadTest
 
 except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, uploadTest
+    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, UploadTest
 
 # Check if Gtk can be open
 gtk_runs, gtk_args = Gtk.init_check()
@@ -335,8 +335,6 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         btn.connect("clicked", self.upload_test)
         grid.attach(btn, 2, 3, 1, 1)
 
-
-
         self.mainBox.pack_start(grid, False, True, 0)
 
         self.fig = mpl.figure.Figure()
@@ -369,7 +367,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         except KeyError:
             dbGtkUtils.complain("Cannot Upload to DB", "Data not yet ready.")
             return
-        
+
         # Check if we are dealing with sensors or modules
         is_module = "Module_SN" in mdata
 
@@ -389,7 +387,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         # The data arrays
         V = np.abs(mdata["curve"]["V"])
         I = np.abs(mdata["curve"]["I"])
-        failed = False
+        passed = True
 
         # Find Current @ 500V
         indx = np.where(V == 500)[0]
@@ -405,20 +403,26 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         self.write_message("I stability = {:.6f} nA\n".format(IVariation))
 
         # Search for Micro discharges
-        # Check for micro-discharge in non-normalized current, removing duplicate Voltage entries (e.g. for stability measurements)
+        # Check for micro-discharge in non-normalized current,
+        # removing duplicate Voltage entries (e.g. for stability measurements)
+        comments = []
+        defects = []
         UniqueVs, UniqueIndices = np.unique(V, return_index=True)
         MicroDischargeV = LocateMicroDischarge(I[UniqueIndices], UniqueVs)
         if MicroDischargeV < np.max(V):
-            self.write_message(
-                "Found micro discharge: {:.1f} V\n".format(MicroDischargeV)
-            )
+            comments.append("Found micro discharge: {:.1f} V\n".format(MicroDischargeV))
+            self.write_message(comments[-1])
+
             if MicroDischargeV < UpperV:
-                self.write_message(
-                    "... microdischarge happening before {:.1f}V. FAILED\n".format(
-                        UpperV
-                    )
+                txt = "microdischarge happening before {:.1f}V.".format(UpperV)
+                defects.append({
+                            "name": "MicroDischarge",
+                            "description": txt,
+                            "properties": {}
+                        }
                 )
-                failed = True
+                self.write_message("...{}. FAILED\n".format(txt))
+                passed = False
 
         test["component"] = self.mod_SN["double"]
         test["institution"] = mdata["Institute"]
@@ -426,7 +430,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         test["date"] = ITkDButils.get_db_date(
             "{} {}".format(mdata["Date"], mdata["Time"])
         )
-        test["passed"] = failed
+        test["passed"] = passed
         test["problems"] = False
         test["properties"]["VBIAS_SMU"] = mdata["Vbias_SMU"]
         test["properties"]["RSERIES"] = mdata["Rseries"]
@@ -447,6 +451,8 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         test["results"]["CURRENT"] = -np.abs(I)
         test["results"]["RMS_STABILITY"] = IVariation
         test["results"]["SHUNT_VOLTAGE"] = np.zeros(V.shape)
+        test["defects"] = defects
+        test["comments"] = comments
 
         # write attachment.
         if is_module:
@@ -517,14 +523,10 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         for i in range(ndata):
             v = -abs(V[i])
             iv = -abs(self.difference[i])
-            if ncol>2:
-                data_out.write(
-                    "{:.2f}\t{:.2f}\t{:.2f}\n".format(v, iv, 0.0)
-                )
+            if ncol > 2:
+                data_out.write("{:.2f}\t{:.2f}\t{:.2f}\n".format(v, iv, 0.0))
             else:
-                data_out.write(
-                    "{:.2f}\t{:.2f}\n".format(v, iv)
-                )
+                data_out.write("{:.2f}\t{:.2f}\n".format(v, iv))
 
         print(data_out.name)
         data_out.close()
@@ -536,7 +538,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         js_out.close()
 
         attachment = ITkDButils.Attachment(data_out.name, "resultsFile", fnam)
-        uploadW = uploadTest.UploadTest(self.session, js_out.name, attachment)
+        uploadW = UploadTest.UploadTest(self.session, js_out.name, attachment)
         uploadW.connect("destroy", remove_files, [data_out.name, js_out.name])
 
     def on_refresh(self, *args):
@@ -625,6 +627,12 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
                 return
 
         # Check that it exists in the DB
+        if len(SN) != 14 or SN["0:4"] != "20US":
+            self.write_message("Invalid SN: {}\n".format(SN))
+            SN = dbGtkUtils.get_a_value(
+                "Invalid SN", "Give Ring or corresponding Half Module SN"
+            )
+
         self.write_message("Reading data for module {}\n".format(SN))
         md = self.find_module(SN)
         if md is None:
@@ -681,7 +689,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         self.mod_type["double"] = md["type"]["code"]
         self.mdata["double"] = mdata
 
-        self.double_SN.set_text("{} - {}".format(SN, md["type"]["name"]))
+        self.double_SN.set_text("{} - {}".format(halfM_SN, md["type"]["name"]))
         self.show_curve(
             133,
             mdata["curve"]["V"],
@@ -790,7 +798,9 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
             return metadata
 
 
-if __name__ == "__main__":
+
+def main():
+    """Main entryy."""
     import sys
 
     # DB login
@@ -818,3 +828,6 @@ if __name__ == "__main__":
     dlg.die()
     print("Bye !!")
     sys.exit()
+
+if __name__ == "__main__":
+    main()

itkdb_gtk-0.0.16.dev1/itkdb_gtk/uploadMultipleTests.py → itkdb_gtk-0.0.16.dev3/itkdb_gtk/UploadMultipleTests.py

@@ -14,13 +14,13 @@ try:
     from ShowComments import ShowComments
     from ShowAttachments import ShowAttachments
     from ShowDefects import ShowDefects
-    from uploadTest import create_json_data_editor
+    from UploadTest import create_json_data_editor
 except ModuleNotFoundError:
     from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
     from itkdb_gtk.ShowComments import ShowComments
     from itkdb_gtk.ShowAttachments import ShowAttachments
     from itkdb_gtk.ShowDefects import ShowDefects
-    from itkdb_gtk.uploadTest import create_json_data_editor
+    from itkdb_gtk.UploadTest import create_json_data_editor
 
 import gi
 gi.require_version("Gtk", "3.0")

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/itkdb_gtk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.16.dev1"
+__version__ = "0.0.16.dev3"
 
 
 def dash_board():
@@ -9,7 +9,7 @@ def dash_board():
 
 def getShipments():
     """getShipments."""
-    from .getShipments import main
+    from .GetShipments import main
     main()
 
 
@@ -21,28 +21,27 @@ def glueWeight():
 
 def groundVITests():
     """GND/VI tests."""
-    from .groundVITests import main
+    from .GroundVITests import main
     main()
 
 
 def sendShipments():
     """Send items."""
-    from .sendShipments import main
+    from .SendShipments import main
     main()
 
-
 def uploadTest():
-    """Upload tests."""
-    from .uploadTest import main
+    """Upload a single tests."""
+    from .UploadTest import main
     main()
 
 
 def uploadMultipleTests():
     """Upload multiple tests."""
-    from .uploadMultipleTests import main
+    from .UploadMultipleTests import main
     main()
 
-def uploadIVfiles():
+def uploadModuleIV():
     """Upload IV files of single and double modules"""
-    from .uploadIVfiles import main
+    from .UploadModuleIV import main
     main()

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/itkdb_gtk/dashBoard.py

@@ -4,17 +4,23 @@ import sys
 
 try:
     import dbGtkUtils
-    import getShipments
-    import groundVITests
+    import GetShipments
+    import GroundVITests
     import ITkDBlogin
-    import sendShipments
-    import uploadMultipleTests
+    import SendShipments
+    import UploadMultipleTests
     import GlueWeight
-    import uploadIVfiles
+    import UploadModuleIV
 
 except Exception:
-    from itkdb_gtk import dbGtkUtils, getShipments, groundVITests, uploadIVfiles
-    from itkdb_gtk import ITkDBlogin, sendShipments, uploadMultipleTests, GlueWeight
+    from itkdb_gtk import dbGtkUtils
+    from itkdb_gtk import GetShipments
+    from itkdb_gtk import GroundVITests
+    from itkdb_gtk import ITkDBlogin
+    from itkdb_gtk import SendShipments
+    from itkdb_gtk import UploadMultipleTests
+    from itkdb_gtk import GlueWeight
+    from itkdb_gtk import UploadModuleIV
 
 import gi
 
@@ -102,7 +108,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = uploadMultipleTests.UploadMultipleTests(self.session)
+        W = UploadMultipleTests.UploadMultipleTests(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def create_shipment(self, *args):
@@ -113,7 +119,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = sendShipments.SendShipments(self.session)
+        W = SendShipments.SendShipments(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def receive_shipment(self, *args):
@@ -124,7 +130,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = getShipments.ReceiveShipments(self.session)
+        W = GetShipments.ReceiveShipments(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def petal_gnd(self, *args):
@@ -135,7 +141,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = groundVITests.GroundingTest(self.session)
+        W = GroundVITests.GroundingTest(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def glue_weight(self, *args):
@@ -157,14 +163,14 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = uploadIVfiles.IVwindow(self.session)
+        W = UploadModuleIV.IVwindow(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def app_closed(self, *args):
         """Application window closed. Clear mask."""
         bt = 1 << args[1]
         self.mask &= ~bt
-        print(bt, self.mask)
+        # print(bt, self.mask)
 
 
 def main():

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.16.dev1
+Version: 0.0.16.dev3
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils
@@ -41,28 +41,28 @@ Reads the AVS Production Sheet and FAT reports. With this information it creates
 the petal core in the DB, if not yet there, make the assembly of the components,
 and uploadas the test runs made at AVS.
 
-## uploadTest.py
+## UploadTest.py
 A GUI to upload the JSON files corresponding to a test and, also, to add
 attachmetns.
 
-## uploadMultipleTests.py
+## UploadMultipleTests.py
 This will allow to select various test files, or even scan a whole directory to
 find them, and assign comments, defects or attachments to each of the tests found.
 
-## getShipments.py
+## GetShipments.py
 Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## sendShipments.py
+## SendShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 
-## groundVITests.py
+## GroundVITests.py
 Allows to upload and enter valueos, comments and defects for those items in the gounding
 and visual instpections tests of the petal core.
 
-## uploadIVfiles.py
+## UploadModuleIV.py
 The idea behind this is that we messure the IV on a Ring module and on only one of the to Half modules. The IV of the remaining half modules is derived from the other 2. Eventually the IV test can be uploaded to the DB.
 
 ## dashBoard.py

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/itkdb_gtk.egg-info/SOURCES.txt

@@ -1,26 +1,26 @@
 README.md
 pyproject.toml
+itkdb_gtk/GetShipments.py
 itkdb_gtk/GlueWeight.py
+itkdb_gtk/GroundVITests.py
 itkdb_gtk/ITkDB.desktop
 itkdb_gtk/ITkDB.svg
 itkdb_gtk/ITkDBlogin.py
 itkdb_gtk/ITkDButils.py
+itkdb_gtk/SendShipments.py
 itkdb_gtk/ShowAttachments.py
 itkdb_gtk/ShowComments.py
 itkdb_gtk/ShowDefects.py
+itkdb_gtk/UploadModuleIV.py
+itkdb_gtk/UploadMultipleTests.py
+itkdb_gtk/UploadPetalInformation.py
+itkdb_gtk/UploadTest.py
 itkdb_gtk/__init__.py
 itkdb_gtk/dashBoard.py
 itkdb_gtk/dbGtkUtils.py
-itkdb_gtk/getShipments.py
-itkdb_gtk/groundVITests.py
 itkdb_gtk/readAVSdata.py
 itkdb_gtk/readGoogleSheet.py
-itkdb_gtk/sendShipments.py
 itkdb_gtk/untrash_component.py
-itkdb_gtk/uploadIVfiles.py
-itkdb_gtk/uploadMultipleTests.py
-itkdb_gtk/uploadPetalInformation.py
-itkdb_gtk/uploadTest.py
 itkdb_gtk.egg-info/PKG-INFO
 itkdb_gtk.egg-info/SOURCES.txt
 itkdb_gtk.egg-info/dependency_links.txt

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/itkdb_gtk.egg-info/entry_points.txt

@@ -4,6 +4,6 @@ glueWeight = itkdb_gtk:glueWeight
 groundVITests = itkdb_gtk:groundVITests
 itkdb_dashBoard = itkdb_gtk:dash_board
 sendShipments = itkdb_gtk:sendShipments
-uploadIVfiles = itkdb_gtk:uploadIVfiles
+uploadModuleIV = itkdb_gtk:uploadModuleIV
 uploadMultipleTests = itkdb_gtk:uploadMultipleTests
 uploadTest = itkdb_gtk:uploadTest

{itkdb_gtk-0.0.16.dev1 → itkdb_gtk-0.0.16.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.0.16.dev1"
+version = "0.0.16.dev3"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -31,7 +31,7 @@ groundVITests = "itkdb_gtk:groundVITests"
 sendShipments = "itkdb_gtk:sendShipments"
 uploadTest = "itkdb_gtk:uploadTest"
 uploadMultipleTests = "itkdb_gtk:uploadMultipleTests"
-uploadIVfiles = "itkdb_gtk:uploadIVfiles"
+uploadModuleIV = "itkdb_gtk:uploadModuleIV"
 
 [tool.setuptools]
 include-package-data = true