petal-qc 0.0.9__tar.gz → 0.0.11__tar.gz

{petal_qc-0.0.9 → petal_qc-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: petal_qc
-Version: 0.0.9
+Version: 0.0.11
 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
@@ -10,7 +10,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: itkdb
-Requires-Dist: itkdb_gtk
+Requires-Dist: itkdb_gtk>=0.10.10
 Requires-Dist: numpy
 Requires-Dist: matplotlib
 Requires-Dist: lmfit

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/BTreport/CheckBTtests.py

@@ -271,12 +271,8 @@ def main():
 
     except Exception:
         # Login with "standard" if the above fails.
-        client = itkdb.Client()
-        client.user._access_code1 = getpass.getpass("Access 1: ")
-        client.user._access_code2 = getpass.getpass("Access 2: ")
-        client.user.authenticate()
-        print("Hello {} !".format(client.user.name))
-
+        client = ITkDButils.create_client()
+        
     # Check the Bustape tests
     try:
         out = BTreport(client, SN)

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/__init__.py

@@ -1,5 +1,5 @@
 """petal_qc python module."""
-__version__ = "0.0.9"
+__version__ = "0.0.11"
 
 
 def coreMetrology():
@@ -23,6 +23,22 @@ def bustapeReport():
     # from .BTreport.bustapeReport import main
     main()
 
+def uploadPetalInformation():
+    """Read files from AVS nd create Petal core in PDB."""
+    from .metrology.uploadPetalInformation import main
+    main()
+
+def createCoreThermalReport():
+    """Create a petal core thermal report."""
+    from .thermal.create_core_report import main
+    main()
+
+def analyzeIRCore():
+    """Create a petal core thermal report."""
+    from .thermal.analyze_IRCore import main
+    main()
+
+
 def dashBoard():
     """Launches the Core thermal analysis ahd PDB script."""
     from .dashBoard import main

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/metrology/PetalMetrology.py

@@ -320,11 +320,6 @@ def do_petal_metrology():
     parser.add_argument("--save", dest='save', action="store_true", default=False)
     parser.add_argument("--out", dest="out", default="petal_flatness.docx",
                         type=str, help="The output fiel name")
-    parser.add_argument("--bottom-lp", dest='bLP', action=CommaSeparatedListAction, default=None,
-                        help="Bottom locking point fiducial coordinates")
-    parser.add_argument("--upper-lp", dest='uLP', action=CommaSeparatedListAction, default=None,
-                        help="upper locking point fiducials coordinates")
-
     parser.add_argument("--title", dest="title", default=None,
                         type=str, help="Document title")
     parser.add_argument("--nbins", dest="nbins", default=25,

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/metrology/compare_Cores.py

@@ -77,17 +77,21 @@ def read_data_files(options):
         if not label in labels:
             labels.append(label)
 
-        val = get_value(data, options.value)
-        if "front" in tmp[1].lower():
-            front[label] = val
-        else:
-            back[label] = val
+        try:
+            val = get_value(data, options.value)
+            if "front" in tmp[1].lower():
+                front[label] = val
+            else:
+                back[label] = val
+        except KeyError as E:
+            print("Error in {}:\n{}".format(fnam, E))
+            continue
 
     labels.sort()
 
     return front, back, labels
 
-def draw_deltas(data, keys, fnam=None, title="Front"):
+def draw_deltas(data, keys, fnam=None, title="Front", draw_text=True):
     """Plot the  position deltas."""
     key_table = {"Bot.": "PL01", "Slot": "PL02", "Top": "PL03",
                  "Bot-FD01": "PL01-FD01", "Bot-FD02": "PL01-FD02", "FD01-FD02": "FD01-FD02" }
@@ -123,8 +127,9 @@ def draw_deltas(data, keys, fnam=None, title="Front"):
                 LBL[k].append(label.split('.')[1].lstrip('0'))
 
         ax[i].scatter(P[i][:,0], P[i][:,1])
-        for j in range(len(LBL[i])):
-            ax[i].text(P[i][j,0], P[i][j,1], LBL[i][j]) #, ha='center', va='top')
+        if draw_text:
+            for j in range(len(LBL[i])):
+                ax[i].text(P[i][j,0], P[i][j,1], LBL[i][j]) #, ha='center', va='top')
 
     save_figure(fig, fnam, prefix=title)
 
@@ -142,10 +147,12 @@ def show_positions(options):
 
     front, back, labels = read_data_files(options)
     val_name = options.value.split('/')[-1]
-    draw_deltas(front, keys, fnam=options.out, title="{} - Front".format(val_name))
-    draw_deltas(back, keys, fnam=options.out, title="{} - Back".format(val_name))
+    draw_text = not options.no_legend
+    draw_deltas(front, keys, fnam=options.out, title="{} - Front".format(val_name), draw_text=draw_text)
+    draw_deltas(back, keys, fnam=options.out, title="{} - Back".format(val_name), draw_text=draw_text)
 
-    plt.show()
+    if not options.no_show:
+        plt.show()
 
 def show_flatness(options):
     """Show flatness plots."""
@@ -177,9 +184,10 @@ def show_flatness(options):
         a.set_ylim(0, 1.2*max(y_lim[0][1], y_lim[1][1]))
         x_lim = a.get_xlim()
         a.fill_between(x_lim, 0, 0.050, facecolor="darkseagreen", alpha=0.1)
-        a.legend(ncol=3, fontsize="x-small")
+        if not options.no_legend:
+            a.legend(ncol=3, fontsize="x-small")
 
-    save_figure(fig, options.out, prefix=opts.prefix)
+    save_figure(fig, options.out, prefix=options.prefix)
 
 def main(options):
     """Main entry."""
@@ -204,11 +212,13 @@ def main(options):
         vback = [back[x] for x in labels]
         ax.plot(X, vfront, '*', label="Front")
         ax.plot(X, vback, 'o', label="Back")
-        ax.legend()
+        if not options.no_legend:
+            ax.legend()
 
         save_figure(fig, options.out, prefix=options.prefix)
 
-    plt.show()
+    if not options.no_show:
+        plt.show()
 
 
 if __name__ == "__main__":
@@ -218,6 +228,8 @@ if __name__ == "__main__":
     parser.add_argument("--value", default=None, help="Value to plot")
     parser.add_argument("--prefix", default=None, help="prefix for out file")
     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")
 
     opts = parser.parse_args()
     if len(opts.files) == 0:

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/metrology/coreMetrology.py

@@ -16,7 +16,7 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GObject, Gio, GLib
 
-__HELP__ = "https://petal-qc.docs.cern.ch"
+__HELP__ = "https://petal-qc.docs.cern.ch/metrology.html"
 
 class CommaSeparatedListAction(Action):
     """Create a list from the comma sepparated numbers at imput."""
@@ -89,14 +89,11 @@ class CoreMetrology(itkdb_gtk.dbGtkUtils.ITkDBWindow):
         # The Serial number
         self.SN = itkdb_gtk.dbGtkUtils.TextEntry()
         self.SN.connect("text-changed", self.on_SN_changed)
-        if options.SN:
-            self.on_SN_changed(self.SN.entry, options.SN)
 
         # The prefix
         self.prefix = Gtk.Entry()
-        if options.prefix:
-            self.SN.set_text(options.prefix)
 
+        # The switch
         self.desy = Gtk.Switch()
         self.desy.props.halign = Gtk.Align.START
 
@@ -147,6 +144,22 @@ class CoreMetrology(itkdb_gtk.dbGtkUtils.ITkDBWindow):
 
         self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
 
+        if self.options.SN:
+            self.on_SN_changed(self.SN.entry, self.options.SN)
+
+        if self.options.is_front:
+            self.back.set_active(True)
+
+        if self.options.folder:
+            the_folder = Gio.File.new_for_path(self.options.folder)
+            self.btnFolder.set_file(the_folder)
+            self.on_folder_set(None)
+
+        if len(self.options.files)>0:
+            the_file = Gio.File.new_for_path(self.options.files[0])
+            self.btnData.set_file(the_file)
+            self.on_file_set(None)
+
 
     def quit(self, *args):
         """Quits the application."""
@@ -354,15 +367,12 @@ def main():
     parser.add_argument('files', nargs='*', help="Input files")
     parser.add_argument("--prefix", dest='prefix', default=None)
     parser.add_argument("--SN", dest='SN', default=None)
+    parser.add_argument("--front", dest='is_front', action="store_true", default=False)
+
     parser.add_argument("--save", dest='save', action="store_true", default=False)
     parser.add_argument("--desy", dest='desy', action="store_true", default=False)
     parser.add_argument("--out", dest="out", default="petal_flatness.docx",
                         type=str, help="The output fiel name")
-    parser.add_argument("--bottom-lp", dest='bLP', action=CommaSeparatedListAction, default=None,
-                        help="Bottom locking point fiducial coordinates")
-    parser.add_argument("--upper-lp", dest='uLP', action=CommaSeparatedListAction, default=None,
-                        help="upper locking point fiducials coordinates")
-
     parser.add_argument("--title", dest="title", default=None,
                         type=str, help="Document title")
     parser.add_argument("--nbins", dest="nbins", default=25,

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/metrology/do_Metrology.py

@@ -96,11 +96,6 @@ def main():
     parser.add_argument("--desy", dest='desy', action="store_true", default=False, help="True if data is from DESY's SmartScope")
     parser.add_argument("--out", dest="out", default="petal_flatness.docx",
                         type=str, help="The output file name")
-    parser.add_argument("--bottom-lp", dest='bLP', action=CommaSeparatedListAction, default=None,
-                        help="Bottom locking point fiducial coordinates")
-    parser.add_argument("--upper-lp", dest='uLP', action=CommaSeparatedListAction, default=None,
-                        help="upper locking point fiducials coordinates")
-
     parser.add_argument("--title", dest="title", default=None,
                         type=str, help="Report Document title")
     parser.add_argument("--nbins", dest="nbins", default=25,

{petal_qc-0.0.9 → petal_qc-0.0.11}/petal_qc/metrology/petal_flatness.py

@@ -328,10 +328,6 @@ if __name__ == "__main__":
     parser.add_argument("--save", dest='save', action="store_true", default=False)
     parser.add_argument("--front", dest='is_front', action="store_true", default=True)
     parser.add_argument("--back", dest='is_front', action="store_false", default=True)
-    parser.add_argument("--bottom-lp", dest='bLP', action=CommaSeparatedListAction, default=None,
-                        help="Bottom locking point fiducial coordinates")
-    parser.add_argument("--upper-lp", dest='uLP', action=CommaSeparatedListAction, default=None,
-                        help="upper locking point fiducials coordinates")
     parser.add_argument("--out", dest="out", default="petal_flatness.docx",
                         type=str, help="The output fiel name")
     parser.add_argument("--title", dest="title", default=None,