diff --git a/notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb b/notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb index 6d74ac1ef738b01bdddc25762f9edf9d336aef28..22ace03e5b8f667ec09331e30aa41c5a1aa5836c 100644 --- a/notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb +++ b/notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb @@ -36,7 +36,7 @@ "mem_cells = [128, 176] # Number of used memory cells. Typically: 4,32,64,128,176.\n", "photon_energy = 9.2 # Photon energy of the beam\n", "out_folder = \"/gpfs/exfel/data/scratch/karnem/testAGIPD16_10/\" # Output folder, required\n", - "use_existing = \"\" # Input folder\n", + "use_existing = \"/gpfs/exfel/data/scratch/karnem/testAGIPD16_10/\" # Input folder\n", "cal_db_timeout = 1200000 # timeout on caldb requests\",\n", "detectorDB = \"AGIPD1M1\" # detector entry in the DB to investigate\n", "dclass = \"AGIPD\" # Detector class\n", @@ -599,7 +599,7 @@ " const, mod, gain_name[gain], keys[key][1])\n", " cb_label = '{}, {} {}'.format(const, keys[key][2], unit)\n", "\n", - " HMCombine(pdata[key][::-1],\n", + " hm_combine(pdata[key][::-1],\n", " x_label='Creation Time', y_label='ASIC ID',\n", " x_ticklabels=ctimes_ticks,\n", " x_ticks=np.arange(len(ctimes_ticks))+0.3,\n", @@ -611,7 +611,7 @@ " y_ticklabels=np.arange(nPixels)[::-1]+1,\n", " pad=[0.125, 0.125, 0.12, 0.185])\n", "\n", - " HMCombine(adata[key], type=0,\n", + " hm_combine(adata[key], type=0,\n", " x_label='Creation Time', y_label='Memory cell ID',\n", " x_ticklabels=ctimes_ticks,\n", " x_ticks=np.arange(len(ctimes_ticks))+0.3,\n", diff --git a/notebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb b/notebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb index 63fb41601cc3cff3d178bb378b3f370dedfa46ef..f70f9136513c6faf99ab67973d04e401caf66e8d 100644 --- a/notebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb +++ b/notebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb @@ -35,8 +35,8 @@ "bias_voltages = [250, 500] # Bias voltage\n", "mem_cells = [1, 128, 256, 512] # Number of used memory cells. Typically: 4,32,64,128,176.\n", "photon_energy = 9.2 # Photon energy of the beam\n", - "out_folder = \"/gpfs/exfel/data/scratch/karnem/testLPD_15/\" # Output folder, required\n", - "use_existing = \"/gpfs/exfel/data/scratch/karnem/testLPD_16/\" # Input folder\n", + "out_folder = \"/gpfs/exfel/data/scratch/karnem/testLPD_11/\" # Output folder, required\n", + "use_existing = \"/gpfs/exfel/data/scratch/karnem/testLPD_10/\" # Input folder\n", "cal_db_timeout = 180000 # timeout on caldb requests\",\n", "detectorDB = \"LPD1M1\" # detector entry in the DB to investigate\n", "dclass = \"LPD\" # Detector class\n", @@ -593,7 +593,7 @@ " const, mod, gain_name[gain], keys[key][1])\n", " cb_label = '{}, {} {}'.format(const, keys[key][2], unit)\n", "\n", - " HMCombine(pdata[key][::-1],\n", + " hm_combine(pdata[key][::-1],\n", " x_label='Creation Time', y_label='ASIC ID',\n", " x_ticklabels=ctimes_ticks,\n", " x_ticks=np.arange(len(ctimes_ticks))+0.3,\n", @@ -605,7 +605,7 @@ " y_ticklabels=np.arange(nPixels)[::-1]+1,\n", " pad=[0.125, 0.125, 0.12, 0.185])\n", "\n", - " HMCombine(adata[key], type=0,\n", + " hm_combine(adata[key], type=0,\n", " x_label='Creation Time', y_label='Memory cell ID',\n", " x_ticklabels=ctimes_ticks,\n", " x_ticks=np.arange(len(ctimes_ticks))+0.3,\n",