Skip to content
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions analysator/calculations/spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ def get_spectrum_energy(vlsvReader,

EkinBinEdges = np.logspace(np.log10(EMin),np.log10(EMax),nBins+1, endpoint=True)
dE = EkinBinEdges[1:] - EkinBinEdges[:-1]
vlsvReader = analysator.vlsvfile.VlsvReader(vlsvReader)

# initialize a new vlsvReader if passed a str filename of a .vlsv
if isinstance(vlsvReader,str):
vlsvReader = analysator.vlsvfile.VlsvReader(vlsvReader)
# else keep the already initialized vlsvReader if obj supplied
Comment thread
alhom marked this conversation as resolved.
Outdated

# check if velocity space exists in this cell
if not vlsvReader.check_variable("moments"): # restart files have VDFs everywhere
if vlsvReader.check_variable("fSaved"):
Expand Down Expand Up @@ -124,7 +129,7 @@ def get_spectrum_energy(vlsvReader,
#Ekin[Ekin > max(EkinBinEdges)] = max(EkinBinEdges)

# compute histogram
(nhist,edges) = np.histogram(Ekin,bins=EkinBinEdges,weights=fw,normed=0)
(nhist,edges) = np.histogram(Ekin,bins=EkinBinEdges,weights=fw,density=False)

if (bindifferential): # finish differential flux per d(eV)
nhist = np.divide(nhist,dE)
Expand Down
Loading