Use separate drwsuffix and drwmethod

ctools · Mar 26, 2023 · 39bdcd2 · 39bdcd2
1 parent f560242
commit 39bdcd2
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/modules/comscripts/comobsbin.py b/modules/comscripts/comobsbin.py
@@ -503,23  503,24 @@ def _generate_dri(self, obs, ebounds):
         drwnames = []
         engindex = []
 
-        # Get DRW method in lower case
         # Get DRW method and suffix in lower case
         drwmethod = gammalib.tolower(self['drwmethod'].string())
-        if drwmethod == 'phibar':
-            drwmethod  = '%d' % (self['timebin'].real())
         drwsuffix = drwmethod
         if drwsuffix == 'phibar':
             drwsuffix  = '%d' % (self['timebin'].real())
 
         # Generate one DRW for each energy boundary
         for i in range(ebounds.size()):
 
             # Set DRW filename in output folder
             drwname = '%s/%s%s_drw-%s%s_%6.6d-%6.6dkeV.fits' % \
-                       (self['outfolder'].string(), obs.id(), dri_prefix, drwmethod,
                        (self['outfolder'].string(), obs.id(), dri_prefix, drwsuffix,
                         self._drw_suffix, ebounds.emin(i).keV(), ebounds.emax(i).keV())
             drwfile = gammalib.GFilename(drwname)
 
             # Set DRW filename in global data store
             drwname_global = '%s/%s%s_drw-%s%s_%6.6d-%6.6dkeV.fits' % \
-                              (self._global_datastore, obs.id(), dri_prefix, drwmethod,
                               (self._global_datastore, obs.id(), dri_prefix, drwsuffix,
                                self._drw_suffix, ebounds.emin(i).keV(), ebounds.emax(i).keV())
             drwfile_global = gammalib.GFilename(drwname_global)