diff --git a/processor/DldFlashDataframeCreator.py b/processor/DldFlashDataframeCreator.py index 1494bc5..64f78b9 100644 --- a/processor/DldFlashDataframeCreator.py +++ b/processor/DldFlashDataframeCreator.py @@ -486,10 +486,13 @@ def createDataframePerElectronRange(self, mbIndexStart, mbIndexEnd): colNames.append('gmdBda') if 'monochromatorPhotonEnergy' in self.daqAddresses: - monochromatorPhotonEnergyArray = assignToMircobunch( - self.dldMicrobunchId[mbIndexStart:mbIndexEnd, :].astype(np.float64), - self.monochromatorPhotonEnergy[mbIndexStart:mbIndexEnd, :].astype(np.float64)) - daMonochromatorPhotonEnergy = monochromatorPhotonEnergyArray.flatten() + # monochromatorPhotonEnergyArray = assignToMircobunch( + # self.dldMicrobunchId[mbIndexStart:mbIndexEnd, :].astype(np.float64), + # self.monochromatorPhotonEnergy[mbIndexStart:mbIndexEnd, :].astype(np.float64)) + # daMonochromatorPhotonEnergy = monochromatorPhotonEnergyArray.flatten() + monochromatorPhotonEnergyArray = np.zeros_like(self.dldMicrobunchId[mbIndexStart:mbIndexEnd, :]) + monochromatorPhotonEnergyArray[:, :] = (self.monochromatorPhotonEnergyArray[mbIndexStart:mbIndexEnd])[:, None] + daMonochromatorPhotonEnergy = delayStageArray.flatten() arrayCols.append(daMonochromatorPhotonEnergy) colNames.append('monochromatorPhotonEnergy') diff --git a/processor/DldProcessor.py b/processor/DldProcessor.py index 96a23f3..1174918 100644 --- a/processor/DldProcessor.py +++ b/processor/DldProcessor.py @@ -12,7 +12,7 @@ import h5py import numpy as np import pandas as pd -from tqdm import tqdm, tqdm_notebook +from tqdm.auto import tqdm from configparser import ConfigParser from processor.utilities import misc, io, dfops # warnings.resetwarnings() @@ -1210,7 +1210,7 @@ def analyzePartNumpy(part): with warnings.catch_warnings(): warnings.simplefilter(warnString) - for i in tqdm_notebook(range(0, self.dd.npartitions, self.N_CORES),disable=not usePbar): + for i in tqdm(range(0, self.dd.npartitions, self.N_CORES),disable=not usePbar): resultsToCalculate = [] # process the data in blocks of n partitions (given by the number # of cores):