PyPI - wums - Versions diffs - 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl - Mend

wums 0.1.2py3-none-any.whl → 0.1.4py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

wums/Templates/index.php +131 -0
wums/boostHistHelpers.py +6 -52
wums/output_tools.py +11 -62
wums/plot_tools.py +2 -2
{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/METADATA +6 -1
wums-0.1.4.dist-info/RECORD +11 -0
wums-0.1.2.dist-info/RECORD +0 -10
{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/WHEEL +0 -0
{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/top_level.txt +0 -0

wums/Templates/index.php ADDED Viewed

@@ -0,0 +1,131 @@
+<html>
+<head>
+<title><?php echo getcwd(); ?></title>
+<style type='text/css'>
+body {
+    font-family: "Candara", sans-serif;
+    font-size: 9pt;
+    line-height: 10.5pt;
+}
+div.pic h3 {
+    font-size: 11pt;
+    margin: 0.5em 1em 0.2em 1em;
+}
+div.pic p {
+    font-size: 11pt;
+    margin: 0.2em 1em 0.1em 1em;
+}
+div.pic {
+    display: block;
+    float: left;
+    background-color: white;
+    border: 1px solid #ccc;
+    padding: 2px;
+    text-align: center;
+    margin: 2px 10px 10px 2px;
+    -moz-box-shadow: 7px 5px 5px rgb(80,80,80);    /* Firefox 3.5 */
+    -webkit-box-shadow: 7px 5px 5px rgb(80,80,80); /* Chrome, Safari */
+    box-shadow: 7px 5px 5px rgb(80,80,80);         /* New browsers */
+    width: 320px;
+}
+a { text-decoration: none; color: rgb(80,0,0); }
+a:hover { text-decoration: underline; color: rgb(255,80,80); }
+div.dirlinks h2 {  margin-bottom: 4pt; margin-left: -24pt; color: rgb(80,0,0);  }
+div.dirlinks {  margin: 0 24pt; }
+div.dirlinks a {
+    font-size: 11pt; font-weight: bold;
+    padding: 0 0.5em;
+}
+</style>
+</head>
+<body>
+<h1><?php echo getcwd(); ?></h1>
+<?php
+$has_subs = true;
+foreach (glob("*") as $filename) {
+    if (is_dir($filename) && !preg_match("/^\..*|.*private.*/", $filename)) {
+        $has_subs = true;
+        break;
+    }
+}
+if ($has_subs) {
+    print "<div class=\"dirlinks\">\n";
+    print "<h2>Directories</h2>\n";
+    print "<a href=\"../\">[parent]</a> ";
+    foreach (glob("*") as $filename) {
+        if (is_dir($filename) && ($_SERVER['PHP_AUTH_USER'] == 'gpetrucc' || !preg_match("/^\..*|.*private.*/", $filename))) {
+            print " <a href=\"$filename\">[$filename]</a>";
+        }
+    }
+    print "</div>";
+}
+foreach (array("00_README.txt", "README.txt", "readme.txt") as $readme) {
+    if (file_exists($readme)) {
+        print "<pre class='readme'>\n"; readfile($readme); print "</pre>";
+    }
+}
+?>
+<h2><a name="plots">Plots</a></h2>
+<p><form>Filter: <input type="text" name="match" size="30" value="<?php if (isset($_GET['match'])) print htmlspecialchars($_GET['match']);  ?>" /><input type="Submit" value="Go" /><input type="checkbox"  name="regexp" <?php if ($_GET['regexp']) print "checked=\"checked\""?> >RegExp</input></form></p>
+<div>
+<?php
+$displayed = array();
+if ($_GET['noplots']) {
+    print "Plots will not be displayed.\n";
+} else {
+  $other_exts = array('.pdf', '.cxx', '.eps', '.root', '.txt', '.log', '.dir', '.info', '.latex', '.html');
+    $filenames = glob("*.png"); sort($filenames);
+    foreach ($filenames as $filename) {
+        if (isset($_GET['match'])) {
+             if (isset($_GET['regexp']) && $_GET['regexp']) {
+                if (!preg_match('/.*'.$_GET['match'].'.*/', $filename)) continue;
+             } else {
+                if (!fnmatch('*'.$_GET['match'].'*', $filename)) continue;
+             }
+        }
+        array_push($displayed, $filename);
+        $brfname = str_replace("_","_&shy;",$filename);
+        print "<div class='pic'>\n";
+        print "<h3><a href=\"$filename\">$brfname</a></h3>";
+        print "<a href=\"$filename\"><img src=\"$filename\" style=\"border: none; width: 300px; \"></a>";
+        $others = array();
+        foreach ($other_exts as $ex) {
+            $other_filename = str_replace('.png', $ex, $filename);
+            if (file_exists($other_filename)) {
+                array_push($others, "<a class=\"file\" href=\"$other_filename\">[" . $ex . "]</a>");
+                if ($ex != '.txt') array_push($displayed, $other_filename);
+            }
+        }
+        if ($others) print "<p>Also as ".implode(', ',$others)."</p>";
+        print "</div>";
+    }
+}
+?>
+</div>
+<div style="display: block; clear:both;">
+<h2><a name="files">Other files</a></h2>
+<ul>
+<?php
+foreach (glob("*") as $filename) {
+    if ($_GET['noplots'] || !in_array($filename, $displayed)) {
+        if (isset($_GET['match'])) {
+             if (isset($_GET['regexp']) && $_GET['regexp']) {
+                if (!preg_match('/.*'.$_GET['match'].'.*/', $filename)) continue;
+             } else {
+                if (!fnmatch('*'.$_GET['match'].'*', $filename)) continue;
+             }
+        }
+        if (is_dir($filename)) {
+            print "<li>[DIR] <a href=\"$filename\">$filename</a></li>";
+        } else {
+            print "<li><a href=\"$filename\">$filename</a></li>";
+        }
+    }
+}
+?>
+</ul>
+</div>
+</body>
+</html>

wums/boostHistHelpers.py CHANGED Viewed

@@ -19,8 +19,8 @@ def valsAndVariances(h1, h2, flow=True):
     )
-# Broadcast h1 to match the shape of h2
 def broadcastSystHist(h1, h2, flow=True, by_ax_name=True):
+    # Broadcast h1 to match the shape of h2
     if h1.ndim > h2.ndim or h1.shape == h2.shape:
         return h1
@@ -160,10 +160,6 @@ def relVariances(h1vals, h2vals, h1vars, h2vars, cutoff=1e-5):
     return (rel1, rel2)
-# TODO: Implement this rather than relying on pdf unc function
-# def rssHist(h):
 def sqrtHist(h):
     rootval = np.sqrt(h.values(flow=True))
     rooth = h.copy()
@@ -358,50 +354,6 @@ def mirrorHist(hvar, hnom, cutoff=1):
     return hnew
-def extendHistByMirror(hvar, hnom, downAsUp=False, downAsNomi=False):
-    hmirror = mirrorHist(hvar, hnom)
-    if downAsNomi:
-        hvar, hmirror = hmirror, hvar
-    mirrorAx = hist.axis.Integer(0, 2, name="mirror", overflow=False, underflow=False)
-    if (
-        hvar.storage_type == hist.storage.Weight
-        and hnom.storage_type == hist.storage.Weight
-    ):
-        hnew = hist.Hist(
-            *hvar.axes,
-            mirrorAx,
-            storage=hist.storage.Weight(),
-            data=np.stack((hvar.view(flow=True), hmirror.view(flow=True)), axis=-1),
-        )
-    else:
-        hnew = hist.Hist(
-            *hvar.axes,
-            mirrorAx,
-            data=np.stack((hvar.values(flow=True), hmirror.values(flow=True)), axis=-1),
-        )
-    return hnew
-# add new axis and set values of old histogram to idx
-def addGenChargeAxis(h, idx):
-    return addGenericAxis(
-        h,
-        hist.axis.Regular(2, -2.0, 2.0, underflow=False, overflow=False, name="qGen"),
-        idx,
-        add_trailing=False,
-        flow=True,
-    )
-def addSystAxis(h, size=1, offset=0, axname="systIdx"):
-    return addGenericAxis(
-        h, hist.axis.Regular(size, offset, size + offset, name=axname)
-    )
 def addGenericAxis(h, axis, idx=None, add_trailing=True, flow=True):
     axes = [*h.axes, axis] if add_trailing else [axis, *h.axes]
     hnew = hist.Hist(*axes, storage=h.storage_type())
@@ -491,8 +443,8 @@ def makeAbsHist(h, axis_name, rename=True):
     return hnew
-# Checks if edges1 could be rebinned to edges2. Order is important!
 def compatibleBins(edges1, edges2):
+    # Checks if edges1 could be rebinned to edges2. Order is important!
     comparef = np.vectorize(lambda x: np.isclose(x, edges1).any())
     return np.all(comparef(edges2))
@@ -998,11 +950,13 @@ def set_flow(h, val="nearest"):
     return h
-# For converting the helicity scale hist to variations, keeping the gen axis to be fit
-# If swap_axes = True, the new axis takes the place of the old gen axis in the ordering
 def expand_hist_by_duplicate_axis(
     href, ref_ax_name, new_ax_name, swap_axes=False, put_trailing=False, flow=True
 ):
+    # For converting the helicity scale hist to variations, keeping the gen axis to be fit
+    # If swap_axes = True, the new axis takes the place of the old gen axis in the ordering
     if ref_ax_name not in href.axes.name:
         raise ValueError(f"Did not find axis {ref_ax_name} in hist!")

wums/output_tools.py CHANGED Viewed

@@ -5,6 +5,7 @@ import pathlib
 import pickle
 import re
 import shutil
+import importlib.resources as pkg_resources
 import subprocess
 import sys
 import tempfile
@@ -185,71 +186,19 @@ def write_logfile(
                 logf.write(f"{k}: {v}\n")
+def write_indexfile(outpath, template_dir="Templates", indexname="index.php"):
+    with pkg_resources.files("wums").joinpath(f"{template_dir}/{indexname}").open("rb") as src:
+        with open(f"{outpath}/index.php", "wb") as dst:
+            shutil.copyfileobj(src, dst)
 def write_index_and_log(
     outpath,
     logname,
-    template_dir=f"{pathlib.Path(__file__).parent}/Templates",
-    yield_tables=None,
-    analysis_meta_info=None,
+    template_dir="Templates",
+    analysis_meta_info={},
     args={},
-    nround=2,
     wd=f"{pathlib.Path(__file__).parent}/../",
 ):
-    indexname = "index.php"
-    if "mit.edu" in socket.gethostname() and not (
-        hasattr(args, "eoscp") and args.eoscp
-    ):
-        indexname = "index_mit.php"
-    shutil.copyfile(f"{template_dir}/{indexname}", f"{outpath}/index.php")
-    logname = f"{outpath}/{logname}.log"
-    with open(logname, "w") as logf:
-        meta_info = (
-            "-" * 80
-            + "\n"
-            + f"Script called at {datetime.datetime.now()}\n"
-            + f"The command was: {script_command_to_str(sys.argv, args)}\n"
-            + "-" * 80
-            + "\n"
-        )
-        logf.write(meta_info)
-        meta_info = make_meta_info_dict(
-            "notebooks",
-            args=args,
-            wd=wd,
-        )
-        logf.write(f"git hash: {meta_info['git_hash']}\n")
-        logf.write(f"git diff: {meta_info['git_diff']}\n")
-        if yield_tables:
-            for k, v in yield_tables.items():
-                logf.write(f"Yield information for {k}\n")
-                logf.write("-" * 80 + "\n")
-                logf.write(str(v.round(nround)) + "\n\n")
-            if (
-                "Unstacked processes" in yield_tables
-                and "Stacked processes" in yield_tables
-            ):
-                if "Data" in yield_tables["Unstacked processes"]["Process"].values:
-                    unstacked = yield_tables["Unstacked processes"]
-                    data_yield = unstacked[unstacked["Process"] == "Data"][
-                        "Yield"
-                    ].iloc[0]
-                    ratio = (
-                        float(
-                            yield_tables["Stacked processes"]["Yield"].sum()
-                            / data_yield
-                        )
-                        * 100
-                    )
-                    logf.write(f"===> Sum unstacked to data is {ratio:.2f}%")
-        if analysis_meta_info:
-            for k, analysis_info in analysis_meta_info.items():
-                logf.write("\n" + "-" * 80 + "\n")
-                logf.write(f"Meta info from input file {k}\n")
-                logf.write("\n" + "-" * 80 + "\n")
-                logf.write(json.dumps(analysis_info, indent=5).replace("\\n", "\n"))
-        logger.info(f"Writing file {logname}")
+    write_indexfile(outpath, template_dir)
+    write_logfile(outpath, logname, args, analysis_meta_info)

wums/plot_tools.py CHANGED Viewed

@@ -421,16 +421,16 @@ def get_custom_handler_map(keys):
     return handler_map
-# https://stackoverflow.com/questions/53122592/legend-with-vertical-line
 def update_prop(handle, orig):
+    # https://stackoverflow.com/questions/53122592/legend-with-vertical-line
     handle.update_from(orig)
     x, y = handle.get_data()
     handle.set_data([np.mean(x)] * 2, [0, 2 * y[0]])
 def padding(ncols, labels, handles, loc="auto"):
+    # if not all legend places are filled, add empty legend entries towards the center of the figure
     if len(labels) % ncols:
-        # if not all legend places are filled, add empty legend entries towards the center of the figure
         rest = ncols - len(labels) % ncols
         nrows = int(np.ceil(len(labels) / ncols))
         for i in range(rest):

{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wums
-Version: 0.1.2
+Version: 0.1.4
 Summary: .
 Author-email: David Walter <david.walter@cern.ch>, Josh Bendavid <josh.bendavid@cern.ch>, Kenneth Long <kenneth.long@cern.ch>
 License: MIT
@@ -22,3 +22,8 @@ Requires-Dist: numpy
 Requires-Dist: uproot
 # WUMS: Wremnants Utilities, Modules, and other Stuff
+The `wums` package can be pip installed:
+```bash
+pip install wums
+```

wums-0.1.4.dist-info/RECORD ADDED Viewed

@@ -0,0 +1,11 @@
+wums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wums/boostHistHelpers.py,sha256=F4SwQEVjNObFscfs0qrJEyOHYNKqUCmusW8HIF1o-0c,38993
+wums/ioutils.py,sha256=1o4cNXeoOzk8Hy0RePjOdCqpvJi0gOp_aa7NYhjmIVM,12209
+wums/logging.py,sha256=zNnLVJUwG3HMvr9NeXmiheX07VmsnSt8cQ6R4q4XBk4,4534
+wums/output_tools.py,sha256=SHcZqXAdqL9AkA57UF0b-R-U4u7rzDgL8Def4E-ulW0,6713
+wums/plot_tools.py,sha256=67ZwcjQRsIbMYvktpG9suj-1hkya-QSuFqiuXm_Zq58,52766
+wums/Templates/index.php,sha256=9EYmfc0ltMqr5oOdA4_BVIHdSbef5aA0ORoRZBEADVw,4348
+wums-0.1.4.dist-info/METADATA,sha256=sK9B_JHD9dqzwjJakYGWdoTEPlExmJ1P2lWOaAwDgWY,843
+wums-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wums-0.1.4.dist-info/top_level.txt,sha256=DCE1TVg7ySraosR3kYZkLIZ2w1Pwk2pVTdkqx6E-yRY,5
+wums-0.1.4.dist-info/RECORD,,

wums-0.1.2.dist-info/RECORD DELETED Viewed

@@ -1,10 +0,0 @@
-wums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wums/boostHistHelpers.py,sha256=T_Yw4hvAjoNkw7ooEmr1piUy3hsZ_fsWnOfe-mck-Mk,40278
-wums/ioutils.py,sha256=1o4cNXeoOzk8Hy0RePjOdCqpvJi0gOp_aa7NYhjmIVM,12209
-wums/logging.py,sha256=zNnLVJUwG3HMvr9NeXmiheX07VmsnSt8cQ6R4q4XBk4,4534
-wums/output_tools.py,sha256=bgaSAxfMl_YVWg5R-sx-0etnggtV6Lp3T6ZVk2mhki8,8596
-wums/plot_tools.py,sha256=unFu91Lf6tMXlZRevCvmY-5E40rnlKWu5C1T3VH2vy8,52766
-wums-0.1.2.dist-info/METADATA,sha256=KY4bz0Rn0NYn7YE5Mooq99mJ2iPSm4OZgcv8hlbYumM,772
-wums-0.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wums-0.1.2.dist-info/top_level.txt,sha256=DCE1TVg7ySraosR3kYZkLIZ2w1Pwk2pVTdkqx6E-yRY,5
-wums-0.1.2.dist-info/RECORD,,

{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/WHEEL RENAMED Viewed

File without changes

{wums-0.1.2.dist-info → wums-0.1.4.dist-info}/top_level.txt RENAMED Viewed

File without changes

wums 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

wums 0.1.2py3-none-any.whl → 0.1.4py3-none-any.whl