Skip to content

0.5.0 dev2 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GernotMaier merged 4 commits into from
May 7, 2025
Merged

0.5.0 dev2 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c8af71
npoints
GernotMaier Apr 29, 2025
37943a0
plot counting histograms
GernotMaier Apr 29, 2025
0395f68
cleanup
GernotMaier May 6, 2025
85c9b2e
cleanup
GernotMaier May 6, 2025
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
16 changes: 11 additions & 5 deletions eventdisplay_anasum/spectral_analysis.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ void spectral_analysis(
fFitFunction->Draw("same");
}
a.plotFitValues();
if (c)
{
c->Print((output_file + ".pdf").c_str());
}

TCanvas *cCounting = a.plotCountingHistograms();
if (cCounting)
{
cCounting->Print((output_file + "_counting.pdf").c_str());
}


// write fit results as yaml file
string yaml_file = output_file + ".yaml";
Expand All @@ -145,11 +156,6 @@ void spectral_analysis(
}
yaml_out.close();

if (c)
{
c->Print((output_file + ".pdf").c_str());
}

// write spectral points
a.writeSpectralPointsToCSVFile((output_file + ".ecsv").c_str());
}
4 changes: 2 additions & 2 deletions eventdisplay_anasum/spectral_analysis_config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENERGY_MIN: 0.09
ENERGY_MAX: 100.
SIGNIFICANCE_FIT_MIN: 0.0
EXCESS_EVENTS_FIT_MIN: 0.0
SIGNIFICANCE_PLOT_MIN: 1.0
EXCESS_EVENTS_PLOT_MIN: 1.0
SIGNIFICANCE_PLOT_MIN: 0.5
EXCESS_EVENTS_PLOT_MIN: 0.5
PLOT_UPPER_LIMITS: 1
PLOT_EVENT_NUMBERS: 1
336 changes: 0 additions & 336 deletions v2dl5/light_curves/binary_plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,339 +555,3 @@ def plot_distribution(
file_type=file_type,
figure_dir=figure_dir,
)





# Temporary stuff - probably not needed
#
# def plotLightCurve_fluxvsPhase_inOrbits(
# fDataDict,
# PlotInstruments,
# F,
# lc_spline_bin_centers,
# lc_spline_sv,
# lc_spline_sv_err,
# orbital_period_BL=315.,
# orbital_periodBins=20,
# plot_variable=None):
# """plot flux vs orbital phase (separated in orbits, all in one plot)
# """
#
# MJD_firstOrbit, N_orbits = getNumberOfOrbits(
# fDataDict, PlotInstruments,
# orbital_period_BL, False)
#
# lightCurvePlottingUtilities.paper_figures(4, 4)
# colors = lightCurvePlottingUtilities.getColorList(N_orbits)
# if N_orbits < 6:
# markers = lightCurvePlottingUtilities.getMarkerList()
# else:
# markers = ['o']*N_orbits
#
# if len(PlotInstruments) < 1:
# return
#
# # plot average and interpolated light curves
# glabel = PlotInstruments[0] + " (average)"
# if lc_spline_bin_centers and len(lc_spline_bin_centers) > 0:
# plt.plot(
# lc_spline_bin_centers,
# lc_spline_sv,
# color='tab:gray',
# linestyle='--',
# linewidth=lightCurvePlottingUtilities.getLineWidth())
# plt.fill_between(lc_spline_bin_centers,
# lc_spline_sv - lc_spline_sv_err,
# lc_spline_sv + lc_spline_sv_err,
# color='tab:gray', linestyle='--',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# alpha=0.3)
#
# # plot one light curve per orbital period
# for i in range(0, N_orbits):
# x = []
# y = []
# ex = []
# mj = []
# orbit_min = MJD_firstOrbit + i * orbital_period_BL
# orbit_max = MJD_firstOrbit + (i + 1) * orbital_period_BL - 1.
# for j in range(len(PlotInstruments)):
# i_plotValue, i_plotError = lightCurvePlottingUtilities.get_plotting_variable(
# plot_variable, j)
#
# for p in range(len(fDataDict[PlotInstruments[j]]['phaseN'])):
# if fDataDict[PlotInstruments[j]]['MJD'][p] >= orbit_min \
# and fDataDict[PlotInstruments[j]]['MJD'][p] < orbit_max + 1.:
#
# x.append(fDataDict[PlotInstruments[j]]['phase'][p])
# y.append(fDataDict[PlotInstruments[j]][i_plotValue][p])
# ex.append(fDataDict[PlotInstruments[j]][i_plotError][p])
# mj.append(fDataDict[PlotInstruments[j]]['MJD'][p])
#
# if len(mj):
# OrbitPhStr = "MJD %d - %d" % (
# orbit_min, orbit_max)
# plt.errorbar(
# x,
# y,
# ex,
# None,
# color=colors[i],
# marker=markers[i],
# linestyle='none',
# label=OrbitPhStr,
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize())
#
# plt.xlabel(
# lightCurvePlottingUtilities.get_orbital_phase_axis_string(orbital_period_BL) )
# plt.ylabel(
# lightCurvePlottingUtilities.getFluxAxisString(
# PlotInstruments[0],plot_variable) )
# if PlotInstruments[0].find('Optical') < 0:
# plt.axhline(y=0, linestyle=':')
# if getPrintInstrumentName(PlotInstruments).find( "fwhm" ) < 0 and \
# getPrintInstrumentName(PlotInstruments).find( "ew" ) < 0:
# plt.legend(prop={'size': 10}, framealpha=0.1)
#
# lightCurvePlottingUtilities.printFigure(
# getPrintInstrumentName(PlotInstruments) +
# "-HESSJ0632p057-LC-phaseFolded-%dd-Orbits" %
# orbital_period_BL)
#
#
#
# def plotAverageLightCurve_fluxvsPhase(
# fDataDict,
# PlotInstruments,
# orbital_period_BL=315.,
# orbital_periodBins=20):
# """
# plot average flux vs orbital phase
#
# calculates also average light curves
# """
#
# print("Plot phase binned averaged light curve:")
# print("\t orbital phase (%.1f d)" % orbital_period_BL)
# print("\t number of phase bins (%d)" % orbital_periodBins)
# print("\t calculating average light curve for ", PlotInstruments)
# if len(PlotInstruments) < 1:
# return
#
# # copy all data into one set of arrays
# # averaged light curve is calculated from
# # light curve bins of all data
# i_MJD = []
# i_flux = []
# i_flux_err = []
# for I in PlotInstruments:
# i_MJD.extend(fDataDict[I]['MJD'])
# i_flux.extend(fDataDict[I]['flux'])
# i_flux_err.extend(fDataDict[I]['flux_err'])
#
# lightCurvePlottingUtilities.paper_figures(4, 4)
#
# # calculate phase binned average light curve
# lc_bincenters, lc_mean, lc_std = lightCurveAverageing.calculateAverageLightCurve(
# i_MJD, i_flux, i_flux_err, orbital_period_BL, orbital_periodBins)
#
# # bin width
# lc_binw = np.repeat(0.5 / orbital_periodBins, len(lc_bincenters))
# plt.errorbar(lc_bincenters, lc_mean, lc_std, lc_binw,
# color='b', linestyle='none',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize(),
# marker='o', label='average')
#
# # calculate cubic spline smoothed average light curve
# F, lc_spline_bin_centers, lc_spline_sv = \
# lightCurveAverageing.smoothCubeSplineLightCurve(
# i_MJD, i_flux, i_flux_err,
# orbital_period_BL, orbital_periodBins,
# True, 0.)
# # get errors on the same
# F_temp, lc_spline_bin_centers, lc_spline_sv_err = \
# lightCurveAverageing.smoothCubeSplineLightCurve(
# i_MJD, i_flux, i_flux_err,
# orbital_period_BL, orbital_periodBins,
# True, 1.)
# lc_spline_sv_err = list(
# np.array(lc_spline_sv_err) -
# np.array(lc_spline_sv))
#
# plt.plot(lc_spline_bin_centers, lc_spline_sv, color='r', linestyle='--',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# label='spline average')
#
# # data set used for averaging
# wP = []
# wP = [lightCurveAnalysisorbital_period.getOrbitalPhase(
# x, orbital_period_BL) for x in i_MJD]
# plt.errorbar(wP, i_flux, i_flux_err, None,
# color='g', linestyle='none',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize(),
# marker='o', label='average')
#
# plt.fill_between(lc_spline_bin_centers,
# lc_spline_sv - lc_spline_sv_err,
# lc_spline_sv + lc_spline_sv_err,
# color='r', linestyle='--',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# alpha=0.3)
#
# plt.xlabel(
# lightCurvePlottingUtilities.get_orbital_phase_axis_string(orbital_period_BL))
# plt.ylabel(lightCurvePlottingUtilities.getFluxAxisString(PlotInstruments[0]))
# plt.legend()
# plt.axhline(y=lc_spline_sv[0], linestyle=':')
#
# lightCurvePlottingUtilities.printFigure(
# getPrintInstrumentName(PlotInstruments) +
# "-HESSJ0632p057-LC-phaseFolded-%dd-Average" %
# orbital_period_BL)
#
# return F, lc_spline_bin_centers, lc_spline_sv, lc_spline_sv_err
#
#
# def plotLightCurve_fluxvsMJD_XandGray(
# fDataDict, mjd_min, mjd_max,
# icrc2019Plots=False,
# yaxis_min = -0.9, yaxis_max=7.5,
# fColorDict=None,
# plot_title=None,
# convert_erg=False):
# """plot flux vs MJD with two different y-axis
#
# note: fixed limits for the y-axis
# """
#
# lightCurvePlottingUtilities.paper_figures(4, 4, 1, False)
# # quick and dirty fix to get consistent colors and markers
# if len(fColorDict) == 5:
# colors = lightCurvePlottingUtilities.getColorList(3)
# colors[-1] = 'black'
# colors.append( 'gray' )
# else:
# colors = lightCurvePlottingUtilities.getColorList(len(fColorDict))
# markers = lightCurvePlottingUtilities.getMarkerList(icrc2019Plots)
# markers[3]='+'
# markers[4]='x'
#
# fig, ax1 = plt.subplots()
# ax1_y = ax1.twinx()
# ax1_x = ax1.twiny()
# if convert_erg:
# ax1.set_ylim(ymin=yaxis_min,ymax=yaxis_max*1.8)
# else:
# ax1.set_ylim(ymin=yaxis_min,ymax=yaxis_max)
# ax1_y.set_ylim(ymin=yaxis_min,ymax=yaxis_max)
#
# c = 0
# for key, fData in fDataDict.items():
# print('Plotting %s (%d data points)' % (key, len(fData)))
#
# # scale all data by 1.e-12
# # (scale is added to the legend text)
# y = np.asarray(fData['flux']) / 1.e-12
# y_err = np.asarray(fData['flux_err']) / 1.e-12
#
# if key in fColorDict:
# c = fColorDict[key]
#
# if len(y) == 0:
# c += 1
# continue
#
# # left labelled data
# if "VERITAS" in key or \
# "HESS" in key or \
# "MAGIC" in key:
# ln1 = ax1.errorbar(
# fData['MJD'],
# y,
# y_err,
# fData['MJD_err'],
# color=colors[c],
# marker=markers[c],
# label=key,
# linestyle='none',
# fillstyle='full',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize())
# ax1_y.plot(np.nan, '-r',
# color=colors[c], marker=markers[c], label=key,
# linestyle='none', fillstyle='full',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize())
# # right labelled data
# else:
# pLabel=key
# if key.find('XRT')>=0:
# pLabel="$\it{Swift}$-XRT"
# ln2 = ax1_y.errorbar(
# fData['MJD'],
# y,
# y_err,
# fData['MJD_err'],
# color=colors[c],
# marker=markers[c],
# label=pLabel,
# linestyle='none',
# fillstyle='full',
# linewidth=lightCurvePlottingUtilities.getLineWidth(),
# markersize=lightCurvePlottingUtilities.getMarkerSize())
# c += 1
#
# ax1.axis(xmin=mjd_min,xmax=mjd_max)
# ax1.locator_params(axis='x', tight=True, nbins=4)
# ax1.set_xlabel('Modified Julian Day (MJD)')
# # left label: assume always gamma rays
# ax1.set_ylabel(lightCurvePlottingUtilities.getFluxAxisString("VERITAS",
# None,
# "10$^{-12} \\times$",
# convert_erg))
#
# if plot_title:
# ty=0.9*yaxis_max
# if convert_erg:
# ty*=1.8
# ax1.text(
# mjd_min+0.75*(mjd_max-mjd_min),
# ty,
# plot_title,
# fontsize=10,
# weight='bold',
# )
#
# # right label: assume always X-rays
# if 'Swift XRT' in fDataDict or 'NuSTAR' in fDataDict:
# ax1_y.set_ylabel(lightCurvePlottingUtilities.getFluxAxisString(
# "Swift XRT", None, "10$^{-12} \\times$"))
#
# ax1_y.legend(loc=2)
# if yaxis_min < 0.:
# plt.axhline(y=0, linestyle=':')
# lightCurvePlottingUtilities.align_yaxis(ax1, 0, ax1_y, 0)
#
# # orbital phase axis
# # (note: use default orbital period here
# # as defined in lightCurveAnalysisorbital_period
# phase_ticks = []
# label_format = '%.2f'
# for t in ax1_x.get_xticks():
# mjd=mjd_min+t*(mjd_max-mjd_min)
# phase_ticks.append(label_format % (
# lightCurveAnalysisorbital_period.getOrbitalPhase(mjd),))
# # remove first and last label from plotting
# if len(phase_ticks)>0:
# phase_ticks[0]=None
# phase_ticks[-1]=None
# ax1_x.set_xticklabels(phase_ticks)
# ax1_x.set_xlabel('orbital phase')
#
# lightCurvePlottingUtilities.printFigure('XG-HESSJ0632p057-LC')
#
Loading