From 5da6366d8273e20b2ab7d3956147f7d6b4130f3b Mon Sep 17 00:00:00 2001 From: ndilalla Date: Thu, 19 Feb 2026 15:02:21 -0800 Subject: [PATCH] Using prefix keyword in psmap. --- fermipy/psmap.py | 28 ++++++++++++++-------------- fermipy/tests/test_gtanalysis.py | 5 +++-- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fermipy/psmap.py b/fermipy/psmap.py index 346d8962..675cf7a9 100644 --- a/fermipy/psmap.py +++ b/fermipy/psmap.py @@ -59,28 +59,28 @@ def psmap(self, prefix='', **kwargs): mydatcounts = o['datcounts'] - ps_map = WcsNDMap(map_geom, o['psmap']) + ps_map = WcsNDMap(map_geom, o['psmap']) pssigma_map = WcsNDMap(map_geom, o['psmapsigma']) - o['name'] = 'PSmap' - o['ps_map']= ps_map - o['pssigma_map']=pssigma_map - o['config']=kwargs + o['name'] = utils.join_strings([prefix, 'PSmap']) + o['ps_map'] = ps_map + o['pssigma_map'] = pssigma_map + o['config'] = kwargs - outfile = config.get('outfile', None) - if outfile != '': - o['name'] = os.path.splitext(outfile)[0] + outfile = config.get('outfile', '') + if outfile == '': + outfile = utils.format_filename(self.workdir, 'PSmap', + prefix=[prefix]) + else: + outfile = os.path.join(self.workdir, + os.path.splitext(outfile)[0]) o['file'] = None if config['write_fits']: - if outfile=='': - outfile = utils.format_filename(self.workdir, 'PSmap') - else: - outfile = os.path.join(self.workdir, - os.path.splitext(outfile)[0]) o['file'] = os.path.basename(outfile) + '.fits' gtpsmap.make_psmap_fits(o,outfile + '.fits') - self.logger.log(config['loglevel'], 'Writing output file %s.',outfile + '.fits') + self.logger.log(config['loglevel'], 'Writing output file %s.', + outfile + '.fits') if config['make_plots']: diff --git a/fermipy/tests/test_gtanalysis.py b/fermipy/tests/test_gtanalysis.py index c4490c3f..a77db92f 100644 --- a/fermipy/tests/test_gtanalysis.py +++ b/fermipy/tests/test_gtanalysis.py @@ -164,14 +164,15 @@ def test_gtanalysis_tsmap(create_diffuse_dir, create_draco_analysis): gta.load_roi('fit1') gta.tsmap(model={}, make_plots=True) + def test_gtanalysis_psmap(create_diffuse_dir, create_draco_analysis): gta = create_draco_analysis gta.load_roi('fit1') gta.write_model_map(model_name="model01") mycmap = os.path.join(gta.workdir, 'ccube_00.fits') mymmap = os.path.join(gta.workdir, 'mcube_model01_00.fits') - print('cmap and mmap %s %s' %(mycmap,mymmap)) - gta.psmap(cmap=mycmap,mmap=mymmap,make_plots=True,emin=1000,emax=10000,nbinloge=4,outfile='testpsmap',chatter=3) + print('cmap and mmap %s %s' %(mycmap, mymmap)) + gta.psmap(cmap=mycmap, mmap=mymmap, make_plots=True, emin=1000, emax=10000, nbinloge=4, outfile='test_psmap', chatter=3, prefix='test_img') #@requires_git_version('99-00-01')