From 94c0205cf16fdf0f4debc3c97ff026585095c6d0 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Wed, 9 Sep 2020 08:19:09 +0200
Subject: [PATCH] update sqlite_view + concurrent range for jf
---
.../playground/AGIPD_SingleM_test_Dark.ipynb | 55 ++-----------------
webservice/sqlite_view.py | 20 +++++--
xfel_calibrate/notebooks.py | 2 +-
3 files changed, 21 insertions(+), 56 deletions(-)
diff --git a/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb b/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
index ec7f92ae5..b0d22ac4e 100644
--- a/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
+++ b/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
@@ -740,8 +740,10 @@
]
},
{
- "cell_type": "markdown",
+ "cell_type": "code",
+ "execution_count": null,
"metadata": {},
+ "outputs": [],
"source": [
"table = []\n",
"gain_names = ['High', 'Medium', 'Low']\n",
@@ -856,56 +858,7 @@
"execution_count": null,
"metadata": {},
"outputs": [],
- "source": [
- "import tabulate\n",
- "\n",
- "header = ['Parameter', \n",
- " \"New constant\", \"Old constant \", \n",
- " \"New constant\", \"Old constant \", \n",
- " \"New constant\", \"Old constant \",\n",
- " \"New constant\", \"Old constant \"]\n",
- "\n",
- "for const in ['Offset', 'Noise', 'ThresholdsDark']:\n",
- " if const != 'ThresholdsDark':\n",
- " table = [['','High gain', 'High gain', 'Medium gain', 'Medium gain', 'Low gain', 'Low gain']]\n",
- " else:\n",
- " table = [['','HG-MG threshold', 'HG-MG threshold', 'MG-LG threshold', 'MG-LG threshold']]\n",
- "\n",
- " data = np.copy(res[const])\n",
- " if const == 'ThresholdsDark':\n",
- " data[...,0][res['BadPixelsDark'][...,0]>0] = np.nan\n",
- " data[...,1][res['BadPixelsDark'][...,1]>0] = np.nan\n",
- " else:\n",
- " data[res['BadPixelsDark']>0] = np.nan\n",
- "\n",
- " if old_const[const] is not None and old_const['BadPixelsDark'] is not None:\n",
- " dataold = np.copy(old_const[const])\n",
- " if const == 'ThresholdsDark':\n",
- " dataold[...,0][old_const['BadPixelsDark'][...,0]>0] = np.nan\n",
- " dataold[...,1][old_const['BadPixelsDark'][...,1]>0] = np.nan\n",
- " else:\n",
- " dataold[old_const['BadPixelsDark']>0] = np.nan\n",
- "\n",
- " f_list = [np.nanmedian, np.nanmean, np.nanstd, np.nanmin, np.nanmax]\n",
- " n_list = ['Median', 'Mean', 'Std', 'Min', 'Max']\n",
- "\n",
- " for i, f in enumerate(f_list):\n",
- " line = [n_list[i]]\n",
- " for gain in range(3):\n",
- " # Compare only 3 threshold gain-maps\n",
- " if gain == 2 and const == 'ThresholdsDark':\n",
- " continue\n",
- " line.append('{:6.1f}'.format(f(data[...,gain])))\n",
- " if old_const[const] is not None and old_const['BadPixelsDark'] is not None:\n",
- " line.append('{:6.1f}'.format(f(dataold[...,gain])))\n",
- " else:\n",
- " line.append('-')\n",
- "\n",
- " table.append(line)\n",
- "\n",
- " display(Markdown('### {} [ADU], good pixels only ###'.format(const)))\n",
- " md = display(Latex(tabulate.tabulate(table, tablefmt='latex', headers=header))) "
- ]
+ "source": []
}
],
"metadata": {
diff --git a/webservice/sqlite_view.py b/webservice/sqlite_view.py
index 2979f2223..854cc3149 100644
--- a/webservice/sqlite_view.py
+++ b/webservice/sqlite_view.py
@@ -1,12 +1,23 @@
+import argparse
+
import sqlite3
-file_path = "/home/xcal/calibration_webservice/webservice/webservice_jobs.sqlite"
-run = '247'
-proposal = '900138'
+parser = argparse.ArgumentParser(
+ description='Update run status at MDC for a given run id.')
+parser.add_argument('--sqlite-fpath', type=str, help='Path to sqlite file path',
+ default='/home/xcal/calibration_webservice/webservice/webservice_jobs.sqlite') # noqa
+parser.add_argument('--run', type=str, help='The run number required '
+ ' for checking its job status.')
+parser.add_argument('--proposal', type=str, help='Proposal numer')
+
+args = vars(parser.parse_args())
+sqlite_fpath = args['sqlite_fpath']
+proposal = args['proposal'].zfill(6)
+run = args['run']
-conn = sqlite3.connect(file_path)
+conn = sqlite3.connect(sqlite_fpath)
c = conn.cursor()
c.execute("SELECT * FROM jobs")
@@ -15,3 +26,4 @@ for r in c.fetchall():
rid, jobid, db_proposal, db_run, status, time, _, _ = r
if db_proposal == proposal and db_run == run:
print(r)
+
diff --git a/xfel_calibrate/notebooks.py b/xfel_calibrate/notebooks.py
index 5fb7ff7b3..7c73714ea 100644
--- a/xfel_calibrate/notebooks.py
+++ b/xfel_calibrate/notebooks.py
@@ -170,7 +170,7 @@ notebooks = {
"notebook":
"notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb", # noqa
"concurrency": {"parameter": "karabo_da",
- "default concurrency": list(range(6)),
+ "default concurrency": list(range(8)),
"cluster cores": 4},
},
"CORRECT": {
--
GitLab