Commit c213634cde72062ed7e8577b22a84f32204fccfe
1 parent
97cd3d1c
Use ; to separate phases instead of ,
Showing
3 changed files
with
5 additions
and
5 deletions
doc/source/users/reference_manual/comobsbin.rst
| ... | ... | @@ -34,7 +34,7 @@ General parameters |
| 34 | 34 | Maximum energy (MeV). |
| 35 | 35 | |
| 36 | 36 | ``phase [string]`` |
| 37 | - Phase expression in the format phasemin0-phasemax0,phasemin1-phasemax1,... | |
| 37 | + Phase expression in the format phasemin0-phasemax0;phasemin1-phasemax1;... | |
| 38 | 38 | |
| 39 | 39 | ``phase0 [time]`` |
| 40 | 40 | Date of Phase 0 (UTC string, JD, MJD or MET in seconds). | ... | ... |
modules/comscripts/comobsbin.par
| ... | ... | @@ -26,7 +26,7 @@ outfolder, s, a, $COMDATASTORE,,, "Output folder for files" |
| 26 | 26 | ebinalg, s, a, FILE,FILE|LIN|LOG,, "Algorithm for defining energy bins" |
| 27 | 27 | emin, r, a, 0.75,0.05,50.0, "Minimum energy (MeV)" |
| 28 | 28 | emax, r, a, 30.0,0.05,50.0, "Maximum energy (MeV)" |
| 29 | -phase, s, a, NONE,,, "Phase expression in the format phasemin0-phasemax0,phasemin1-phasemax1,..." | |
| 29 | +phase, s, a, NONE,,, "Phase expression in the format phasemin0-phasemax0;phasemin1-phasemax1;..." | |
| 30 | 30 | phase0, t, a, JD 2451943.09,,, "Date of Phase 0 (UTC string, JD, MJD or MET in seconds)" |
| 31 | 31 | period, r, a, 3.90603,,, "Period (days)" |
| 32 | 32 | enumbins, i, a, 1,1,20, "Number of energy bins" | ... | ... |
modules/comscripts/comobsbin.py
| ... | ... | @@ -113,7 +113,7 @@ class comobsbin(ctools.csobservation): |
| 113 | 113 | if gammalib.toupper(self['phase'].string()) != 'NONE': |
| 114 | 114 | |
| 115 | 115 | # Get phases and split them |
| 116 | - phases = self['phase'].string().split(',') | |
| 116 | + phases = self['phase'].string().split(';') | |
| 117 | 117 | |
| 118 | 118 | # Loop over phases |
| 119 | 119 | for phase in phases: |
| ... | ... | @@ -191,8 +191,8 @@ class comobsbin(ctools.csobservation): |
| 191 | 191 | |
| 192 | 192 | # Set suffix |
| 193 | 193 | phases = self['phase'].string() |
| 194 | - self._suffix = '_phases'+phases.replace(',', '_') | |
| 195 | - self._dre_suffix = '_phases'+phases.replace(',', '_') | |
| 194 | + self._suffix = '_phases'+phases.replace(';', '_') | |
| 195 | + self._dre_suffix = '_phases'+phases.replace(';', '_') | |
| 196 | 196 | |
| 197 | 197 | # If PSD interval differs from standard interval then set the interval |
| 198 | 198 | if self['psdmin'].integer() != 0 or self['psdmin'].integer() != 110: | ... | ... |