diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index 1f3d6ac8bffbb567af01976fd2c1759abc95f773..ab8941188366bff3a87ea8f887892252d75df5bf 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -575,28 +575,23 @@
     "qm_dict = OrderedDict()\n",
     "for i, k_da in zip(modules, karabo_da):\n",
     "    qm = module_index_to_qm(i)\n",
-    "    qm_dict[qm] = {\n",
-    "        \"karabo_da\": k_da,\n",
-    "        \"db_module\": \"\"\n",
-    "    }\n",
+    "    qm_dict[qm] = {\"karabo_da\": k_da}\n",
     "\n",
-    "# going through tools.get_pdu_from_db seems wasteful\n",
+    "# gets pdu, karabo_da, and qm for all modules at snapshot\n",
     "all_pdus = iCalibrationDB.ConstantMetaData().retrieve_pdus_for_detector(\n",
     "    karabo_id=karabo_id,\n",
     "    receiver=cal_db_interface,\n",
     "    snapshot_at=creation_time.isoformat(),\n",
     "    timeout=cal_db_timeout\n",
     ")\n",
-    "karabo_da_to_pdu = {d[\"karabo_da\"]: d[\"pdu_physical_name\"] for d in all_pdus}\n",
-    "for qm_attr in qm_dict.values():\n",
-    "    qm_attr[\"db_module\"] = karabo_da_to_pdu[qm_attr[\"karabo_da\"]]    \n",
-    "\n",
-    "with open(f\"{out_folder}/module_mapping.yml\",\"w\") as fd:\n",
-    "    yaml.safe_dump({\n",
-    "        \"module_mapping\": {\n",
-    "            qm: qm_dict[qm][\"db_module\"] for qm in qm_dict\n",
-    "        }\n",
-    "    }, fd)"
+    "# used to add db_module in qm_dict\n",
+    "qm_to_pdu = {d[\"virtual_device_name\"]: d[\"pdu_physical_name\"] for d in all_pdus}\n",
+    "for qm, qm_attr in qm_dict.items():\n",
+    "    db_module = qm_to_pdu[qm]\n",
+    "    qm_attr[\"db_module\"] = db_module\n",
+    "    # saving mapping information for summary notebook\n",
+    "    with open(f\"{out_folder}/module_mapping_{qm}.yml\", \"w\") as fd:\n",
+    "        yaml.safe_dump({\"module_mapping\": {qm: db_module}}, fd)"
    ]
   },
   {