diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb index a72c2e167a89e0d785336ef173354bd241064354..9f4a3351b56b1857bd6f79465aa94b5249a03bd5 100644 --- a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb +++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb @@ -55,7 +55,8 @@ "use_dir_creation_date = True\n", "creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC.ms e.g. 2019-07-04 11:02:41.00\n", "gain_setting = 0.1 # gain setting can have value 0 or 1, Default=0.1 for no (None) gain-setting\n", - "karabo_da_control = \"AGIPD1MCTRL00\" # karabo DA for control infromation" + "karabo_da_control = \"AGIPD1MCTRL00\" # karabo DA for control infromation\n", + "h5path_ctrl = '/CONTROL/{}/MDL/FPGA_COMP_TEST' # path to control information" ] }, { @@ -166,9 +167,11 @@ "if instrument == \"SPB\":\n", " loc = \"SPB_DET_AGIPD1M-1\"\n", " dinstance = \"AGIPD1M1\"\n", + " karabo_id_control = \"SPB_IRU_AGIPD1M1\"\n", "else:\n", " loc = \"MID_DET_AGIPD1M-1\"\n", " dinstance = \"AGIPD1M2\"\n", + " karabo_id_control = \"MID_EXP_AGIPD1M1\"\n", "\n", "cal_db_interface = get_random_db_interface(cal_db_interface)\n", "\n", @@ -180,8 +183,11 @@ "run, prop, seq = run_prop_seq_from_path(in_folder)\n", "logger = InfluxLogger(detector=\"AGIPD\", instrument=instrument, mem_cells=mem_cells,\n", " notebook=get_notebook_name(), proposal=prop)\n", + "\n", + "# extract the memory cells and acquisition rate from \n", + "# the file of the first module, first sequence and first run\n", "channel = 0\n", - "fname = fbase.format(runs[0], runs[0].upper(), channel, 0)\n", + "fname = fbase.format(runs[0], runs[0].upper(), channel, sequences[0])\n", "if acqrate == 0.:\n", " acqrate = get_acq_rate(fname, loc, channel)\n", " \n", @@ -209,6 +215,10 @@ "outputs": [], "source": [ "control_fname = f'{in_folder}/{runs[0]}/RAW-{runs[0].upper()}-{karabo_da_control}-S00000.h5'\n", + "\n", + "if \"{\" in h5path_ctrl:\n", + " h5path_ctrl = h5path_ctrl.format(karabo_id_control)\n", + "\n", "if gain_setting == 0.1:\n", " if creation_time.replace(tzinfo=None) < dateutil.parser.parse('2020-01-31'):\n", " print(\"Set gain-setting to None for runs taken before 2020-01-31\")\n",