diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb index e4050bcba36a963a2cc1bdbb788f4955c68a04af..4881f0738adb952d7905e679d0d6b8ff69ee70fc 100644 --- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb +++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb @@ -105,6 +105,7 @@ " get_random_db_interface,\n", " get_report,\n", " map_gain_stages,\n", + " module_index_to_qm,\n", " parse_runs,\n", " run_prop_seq_from_path,\n", " save_const_to_h5,\n", @@ -303,7 +304,7 @@ " ntest_g[cap] = OrderedDict()\n", "\n", " for i in modules:\n", - " qm = \"Q{}M{}\".format(i//4 + 1, i % 4 + 1)\n", + " qm = module_index_to_qm(i)\n", " if qm in mapped_files and not mapped_files[qm].empty():\n", " fname_in = mapped_files[qm].get()\n", " print(\"Process file: \", fname_in)\n", @@ -323,7 +324,7 @@ "\n", "for ir, r in enumerate(results):\n", " offset, noise, i, gg, cap, bp, data, normal = r\n", - " qm = \"Q{}M{}\".format(i//4 + 1, i % 4 + 1)\n", + " qm = module_index_to_qm(i)\n", " if qm not in offset_g[cap]:\n", " offset_g[cap][qm] = np.zeros(\n", " (offset.shape[0], offset.shape[1], offset.shape[2], 3))\n", @@ -366,7 +367,7 @@ "# Create the modules dict of karabo_das and PDUs\n", "qm_dict = OrderedDict()\n", "for i, k_da in zip(modules, karabo_da):\n", - " qm = f\"Q{i//4+1}M{i%4+1}\"\n", + " qm = module_index_to_qm(i)\n", " qm_dict[qm] = {\"karabo_da\": k_da,\n", " \"db_module\": \"\"}" ] @@ -454,7 +455,7 @@ "for cap in capacitor_settings:\n", " res[cap] = OrderedDict()\n", " for i in modules:\n", - " qm = \"Q{}M{}\".format(i//4+1, i % 4+1)\n", + " qm = module_index_to_qm(i)\n", "\n", " res[cap][qm] = {'Offset': offset_g[cap][qm],\n", " 'Noise': noise_g[cap][qm],\n", @@ -514,11 +515,12 @@ "metadata": {}, "outputs": [], "source": [ - "mnames = []\n", - "for i in modules:\n", - " qm = f\"Q{modules[0]//4+1}M{modules[0]%4+1}\"\n", - " mnames.append(qm)\n", - " show_processed_modules(dinstance=dinstance, constants=None, mnames=mnames, mode=\"position\")" + "show_processed_modules(\n", + " dinstance=dinstance,\n", + " constants=None,\n", + " mnames=[module_index_to_qm(i) for i in modules],\n", + " mode=\"position\"\n", + ")" ] }, { @@ -541,7 +543,7 @@ "\n", "for cap in capacitor_settings:\n", " for i in modules:\n", - " qm = \"Q{}M{}\".format(i//4+1, i % 4+1)\n", + " qm = module_index_to_qm(i)\n", " if np.count_nonzero(~np.isnan(data_g[cap][qm])) == 0:\n", " break\n", " for gain in range(3):\n", @@ -631,7 +633,7 @@ " print('Normality test was not requested. Flag `test_for_normality` False')\n", " break\n", " for i in modules:\n", - " qm = \"Q{}M{}\".format(i//4+1, i%4+1)\n", + " qm = module_index_to_qm(i)\n", "\n", " data = np.copy(ntest_g[cap][qm][:,:,:,:])\n", " data[badpix_g[cap][qm][:,:,:,:]>0] = 1.01\n",