diff --git a/GalProf/detcnts.E01.ALL.resid.gal.fits b/GalProf/detcnts.E01.ALL.resid.gal.fits index 0d688d8..26e38be 100644 Binary files a/GalProf/detcnts.E01.ALL.resid.gal.fits and b/GalProf/detcnts.E01.ALL.resid.gal.fits differ diff --git a/GalProf/detcnts.E01.ALL.resid.galprof.fits b/GalProf/detcnts.E01.ALL.resid.galprof.fits index 102a3ed..2d01ab0 100644 Binary files a/GalProf/detcnts.E01.ALL.resid.galprof.fits and b/GalProf/detcnts.E01.ALL.resid.galprof.fits differ diff --git a/GalProf/detcnts.E13.ALL.resid.gal.fits b/GalProf/detcnts.E13.ALL.resid.gal.fits index d60b5c3..8702eb7 100644 Binary files a/GalProf/detcnts.E13.ALL.resid.gal.fits and b/GalProf/detcnts.E13.ALL.resid.gal.fits differ diff --git a/GalProf/detcnts.E13.ALL.resid.galprof.fits b/GalProf/detcnts.E13.ALL.resid.galprof.fits index ba7b2f0..6c649ce 100644 Binary files a/GalProf/detcnts.E13.ALL.resid.galprof.fits and b/GalProf/detcnts.E13.ALL.resid.galprof.fits differ diff --git a/GalProf/detcnts.E14.ALL.resid.gal.fits b/GalProf/detcnts.E14.ALL.resid.gal.fits index d8ac803..f61beda 100644 Binary files a/GalProf/detcnts.E14.ALL.resid.gal.fits and b/GalProf/detcnts.E14.ALL.resid.gal.fits differ diff --git a/GalProf/detcnts.E14.ALL.resid.galprof.fits b/GalProf/detcnts.E14.ALL.resid.galprof.fits index b91fbaa..6b33417 100644 Binary files a/GalProf/detcnts.E14.ALL.resid.galprof.fits and b/GalProf/detcnts.E14.ALL.resid.galprof.fits differ diff --git a/Spectra/figures/cutoffpl_lon+20.r b/Spectra/figures/cutoffpl_lon+20.r index 8baba47..e3e3da2 100644 --- a/Spectra/figures/cutoffpl_lon+20.r +++ b/Spectra/figures/cutoffpl_lon+20.r @@ -27,7 +27,7 @@ ylim <- c(0.1,1.5) cl="black" a <- read.table('../cutoffpl_lon+20_eeuf.dat', col.names=c("x","dx","y","dy","total","cutoffpl","pow")) -plot(a$x, a$y, pch=3, bg="white", col="white", ylim=ylim, xlim=xlim,main="GC (cutoffpl+powerlaw)",ylab=expression("keV"^"2"~"(Phot. keV"^"-1"~"cm"^"-2"~"s"^"-1"*")"),type="p",xaxt = 'n',xlab="",log="xy") +plot(a$x, a$y, pch=3, bg="white", col="white", ylim=ylim, xlim=xlim,main="LON+20 (cutoffpl+powerlaw)",ylab=expression("keV"^"2"~"(Phot. keV"^"-1"~"cm"^"-2"~"s"^"-1"*")"),type="p",xaxt = 'n',xlab="",log="xy") #axis(side=2, at=c(1e-6,1e-5, 1e-4, 1e-3, 1e-2), labels=expression('-6','-5','-4','-3','-2')) diff --git a/Spectra/figures/galplane.r b/Spectra/figures/galplane.r index 1f87bb9..6f57afd 100644 --- a/Spectra/figures/galplane.r +++ b/Spectra/figures/galplane.r @@ -61,7 +61,7 @@ segments(a$x-a$dx,a$y,a$x+a$dx,a$y,col=cl) mtext(side = 1, text = "Energy, keV", line = 4, cex=1.6) -legend( 90.0,0.08,c("GC","LON+20","LON-20","BGD"), lty=c(1,1,1,1), lwd=c(2.5,2.5,2.5,2.5),col=c("red","blue","green","black"),cex=1.7) +legend( 85.0,0.08,c("GC","LON+20","LON-20","3C 273/Coma"), lty=c(1,1,1,1), lwd=c(2.5,2.5,2.5,2.5),col=c("red","blue","green","black"),cex=1.7) axis(1, mgp=c(3, 1.5, 0)) diff --git a/Spectra/load_gc06_polar.xcm b/Spectra/load_gc06_polar.xcm new file mode 100644 index 0000000..f90a565 --- /dev/null +++ b/Spectra/load_gc06_polar.xcm @@ -0,0 +1,9 @@ +data GC06.sim.spec.pha +setpl en +cpd /xs +setpl reb 2 +systematic 0 +setpl reb 2 2 +@polar_gc06_cflux +pl eeuf delchi + diff --git a/Spectra/load_lon+20_polar.xcm b/Spectra/load_lon+20_polar.xcm new file mode 100644 index 0000000..a9b0870 --- /dev/null +++ b/Spectra/load_lon+20_polar.xcm @@ -0,0 +1,8 @@ +data LON+20.sim.spec.pha +setpl en +cpd /xs +@polar_lon+20_cflux +setpl reb 2 2 +pl eeuf delchi +#steppar 9 -10 -12 100 +#new 9 -10.34 diff --git a/Spectra/load_lon-20_polar.xcm b/Spectra/load_lon-20_polar.xcm new file mode 100644 index 0000000..74131d6 --- /dev/null +++ b/Spectra/load_lon-20_polar.xcm @@ -0,0 +1,8 @@ +data LON-20.sim.spec.pha +setpl en +cpd /xs +@polar_lon-20_cflux +setpl reb 2 2 +pl eeuf delchi +#steppar 9 -10 -12 100 +#new 9 -10.34 diff --git a/Spectra/polar_gc06.xcm b/Spectra/polar_gc06.xcm index 8c30e92..ff11967 100644 --- a/Spectra/polar_gc06.xcm +++ b/Spectra/polar_gc06.xcm @@ -5,11 +5,11 @@ cosmo 70 0 0.73 xset delta 0.01 systematic 0.05 model atable{polarmodel.fits} + cflux*powerlaw - 0.67731 0.01 0 0 3 3 - 3.02538e-09 0.01 0 0 1e+20 1e+24 + 0.656833 0.01 0 0 3 3 + 3.19989e-09 0.01 0 0 1e+20 1e+24 30 -0.1 0 0 1e+06 1e+06 80 -0.1 0 0 1e+06 1e+06 - -9.38934 0.01 -100 -100 100 100 + -9.19605 0.01 -100 -100 100 100 1.55 -1 -3 -2 9 10 1 -1 0 0 1e+20 1e+24 bayes off diff --git a/Spectra/polar_gc06_cflux.xcm b/Spectra/polar_gc06_cflux.xcm new file mode 100644 index 0000000..628e616 --- /dev/null +++ b/Spectra/polar_gc06_cflux.xcm @@ -0,0 +1,18 @@ +method leven 10 0.01 +abund angr +xsect vern +cosmo 70 0 0.73 +xset delta 0.01 +systematic 0.05 +model cflux*atable{polarmodel.fits} + cflux*powerlaw + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.01521 0.01 -100 -100 100 100 + 0.657219 0.01 0 0 3 3 + 1 -1 0 0 1e+20 1e+24 + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.1965 0.01 -100 -100 100 100 + 1.55 -1 -3 -2 9 10 + 1 -1 0 0 1e+20 1e+24 +bayes off diff --git a/Spectra/polar_lon+20.xcm b/Spectra/polar_lon+20.xcm new file mode 100644 index 0000000..d2d5b96 --- /dev/null +++ b/Spectra/polar_lon+20.xcm @@ -0,0 +1,15 @@ +method leven 10 0.01 +abund angr +xsect vern +cosmo 70 0 0.73 +xset delta 0.01 +systematic 0.05 +model atable{polarmodel.fits} + cflux*powerlaw + 0.6479 0.01 0 0 3 3 + 1.33563e-09 0.01 0 0 1e+20 1e+24 + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.52474 0.01 -100 -100 100 100 + 1.55 -1 -3 -2 9 10 + 1 -1 0 0 1e+20 1e+24 +bayes off diff --git a/Spectra/polar_lon+20_cflux.xcm b/Spectra/polar_lon+20_cflux.xcm new file mode 100644 index 0000000..2c48b7c --- /dev/null +++ b/Spectra/polar_lon+20_cflux.xcm @@ -0,0 +1,18 @@ +method leven 10 0.01 +abund angr +xsect vern +cosmo 70 0 0.73 +xset delta 0.01 +systematic 0.05 +model cflux*atable{polarmodel.fits} + cflux*powerlaw + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.42255 0.01 -100 -100 100 100 + 0.647891 0.01 0 0 3 3 + 1 -1 0 0 1e+20 1e+24 + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.52474 0.01 -100 -100 100 100 + 1.55 -1 -3 -2 9 10 + 1 -1 0 0 1e+20 1e+24 +bayes off diff --git a/Spectra/polar_lon-20_cflux.xcm b/Spectra/polar_lon-20_cflux.xcm new file mode 100644 index 0000000..bbbc546 --- /dev/null +++ b/Spectra/polar_lon-20_cflux.xcm @@ -0,0 +1,18 @@ +method leven 10 0.01 +abund angr +xsect vern +cosmo 70 0 0.73 +xset delta 0.01 +systematic 0.05 +model cflux*atable{polarmodel.fits} + cflux*powerlaw + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.31443 0.01 -100 -100 100 100 + 0.718932 0.01 0 0 3 3 + 1 -1 0 0 1e+20 1e+24 + 30 -0.1 0 0 1e+06 1e+06 + 80 -0.1 0 0 1e+06 1e+06 + -9.57592 0.01 -100 -100 100 100 + 1.55 -1 -3 -2 9 10 + 1 -1 0 0 1e+20 1e+24 +bayes off diff --git a/ridge/ridge/config.py b/ridge/ridge/config.py index a6dccd1..c4af696 100644 --- a/ridge/ridge/config.py +++ b/ridge/ridge/config.py @@ -153,6 +153,6 @@ sigma=3 modelrxte="allsky/modelrxte_ait_3to20keV_flux_2deg.fits" # Galactic longitude profile -lon_max=180.0 +lon_max=173.0 lon_nbin=100 lat_max=10.0 diff --git a/scripts/03_grxe_galprof.py b/scripts/03_grxe_galprof.py index ebabb76..396dfc0 100755 --- a/scripts/03_grxe_galprof.py +++ b/scripts/03_grxe_galprof.py @@ -65,8 +65,9 @@ ign=ignored_rev.tolist() glon, step = np.linspace(-lon_max, lon_max, num=lon_nbin, endpoint=False,retstep=True) -#print(glon,step) +print("STEP",step) +#sys.exit() # # initiate 2d arrays diff --git a/scripts/03_grxe_galprof.sh b/scripts/03_grxe_galprof.sh index 4afd58a..6321776 100644 --- a/scripts/03_grxe_galprof.sh +++ b/scripts/03_grxe_galprof.sh @@ -1,4 +1,4 @@ -./03_grxe_galprof.py E01 51 -./03_grxe_galprof.py E13 17 +./03_grxe_galprof.py E01 21 +./03_grxe_galprof.py E13 21 ./03_grxe_galprof.py E14 21 diff --git a/scripts/03_grxe_galprof_plot.py b/scripts/03_grxe_galprof_plot.py index 7574d4c..3c2a26e 100755 --- a/scripts/03_grxe_galprof_plot.py +++ b/scripts/03_grxe_galprof_plot.py @@ -26,7 +26,9 @@ fn="detcnts.E13.ALL.resid.galprof.fits" dat = Table.read(profdir+fn, unit_parse_strict='silent') df3 = dat.to_pandas().sort_values(by=['LON1']) -#df_cobe = pd.read_csv('../data/cobe_ibis_resp_lon.dat', header=None) +df_cobe = pd.read_csv('../data/cobe_ibis_resp_lon.dat', sep=' ', header=None) +print(df_cobe) + fig, (ax1, ax2, ax3) = plt.subplots(3, sharex=True, figsize=(9, 7), dpi=100) #fig.suptitle('Vertically stacked subplots') @@ -65,6 +67,7 @@ ax2.yaxis.set_minor_locator(ticker.MultipleLocator(0.2)) ax3.yaxis.set_minor_locator(ticker.MultipleLocator(0.2)) lon=(df1['LON1']+df1['LON2'])/2 +ax1.plot(df_cobe[0],df_cobe[2]/3, color='red', linewidth=4) ax1.errorbar(lon, df1['GRXE_SIM_FLUX']/scale, yerr=df1['GRXE_SIM_ERROR']/scale, xerr=(df1['LON2']-df1['LON1'])/2,