Commit 8e3068f32ba5b4efe52779d7e7bbdabc8fae93cf
1 parent
219af84c
new branck 1526-sensitivity_tev2erg_conversion, modified cssens.py. Sensitivity …
…definition, one of the erg_mean is replaced by e_mean
Showing
1 changed file
with
10 additions
and
2 deletions
cscripts/cssens.py
| @@ -52,6 +52,7 @@ class cssens(ctools.cscript): | @@ -52,6 +52,7 @@ class cssens(ctools.cscript): | ||
| 52 | self.m_dec = None | 52 | self.m_dec = None |
| 53 | 53 | ||
| 54 | # Make sure that parfile exists | 54 | # Make sure that parfile exists |
| 55 | + print "making sure the parfile exists" | ||
| 55 | file = self.parfile() | 56 | file = self.parfile() |
| 56 | 57 | ||
| 57 | # Initialise application | 58 | # Initialise application |
| @@ -88,6 +89,8 @@ class cssens(ctools.cscript): | @@ -88,6 +89,8 @@ class cssens(ctools.cscript): | ||
| 88 | """ | 89 | """ |
| 89 | # Set parfile name | 90 | # Set parfile name |
| 90 | parfile = self.name+".par" | 91 | parfile = self.name+".par" |
| 92 | + | ||
| 93 | + print "parfile ",parfile | ||
| 91 | 94 | ||
| 92 | try: | 95 | try: |
| 93 | pars = gammalib.GApplicationPars(parfile) | 96 | pars = gammalib.GApplicationPars(parfile) |
| @@ -233,9 +236,11 @@ class cssens(ctools.cscript): | @@ -233,9 +236,11 @@ class cssens(ctools.cscript): | ||
| 233 | 236 | ||
| 234 | # Set energies | 237 | # Set energies |
| 235 | if self.m_type == "Differential": | 238 | if self.m_type == "Differential": |
| 239 | + print "Differential " | ||
| 236 | emin = self.m_ebounds.emin(ieng) | 240 | emin = self.m_ebounds.emin(ieng) |
| 237 | emax = self.m_ebounds.emax(ieng) | 241 | emax = self.m_ebounds.emax(ieng) |
| 238 | elif self.m_type == "Integral": | 242 | elif self.m_type == "Integral": |
| 243 | + print "Integral " | ||
| 239 | emin = self.m_ebounds.emin(ieng) | 244 | emin = self.m_ebounds.emin(ieng) |
| 240 | emax = self.m_ebounds.emax() | 245 | emax = self.m_ebounds.emax() |
| 241 | else: | 246 | else: |
| @@ -469,6 +474,9 @@ class cssens(ctools.cscript): | @@ -469,6 +474,9 @@ class cssens(ctools.cscript): | ||
| 469 | sim = obsutils.sim(obs, nbins=self.m_enumbins, seed=iter, | 474 | sim = obsutils.sim(obs, nbins=self.m_enumbins, seed=iter, |
| 470 | binsz=self.m_binsz, npix=self.m_npix, | 475 | binsz=self.m_binsz, npix=self.m_npix, |
| 471 | log=self.m_log, debug=self.m_debug, edisp=self.m_edisp) | 476 | log=self.m_log, debug=self.m_debug, edisp=self.m_edisp) |
| 477 | + sim = obsutils.sim(obs, nbins=self.m_enumbins, seed=iter, | ||
| 478 | + binsz=self.m_binsz, npix=self.m_npix, | ||
| 479 | + log=self.m_log, debug=self.m_debug, edisp=self.m_edisp) | ||
| 472 | 480 | ||
| 473 | # Determine number of events in simulation | 481 | # Determine number of events in simulation |
| 474 | nevents = 0.0 | 482 | nevents = 0.0 |
| @@ -576,7 +584,7 @@ class cssens(ctools.cscript): | @@ -576,7 +584,7 @@ class cssens(ctools.cscript): | ||
| 576 | energy = gammalib.GEnergy(e_mean, "TeV") | 584 | energy = gammalib.GEnergy(e_mean, "TeV") |
| 577 | time = gammalib.GTime() | 585 | time = gammalib.GTime() |
| 578 | sensitivity = result_all[self.m_srcname].spectral().eval(energy, time) * \ | 586 | sensitivity = result_all[self.m_srcname].spectral().eval(energy, time) * \ |
| 579 | - erg_mean*erg_mean * 1.0e6 | 587 | + e_mean*erg_mean * 1.0e6 |
| 580 | 588 | ||
| 581 | # Compute flux correction factor based on average TS | 589 | # Compute flux correction factor based on average TS |
| 582 | correct = 1.0 | 590 | correct = 1.0 |
| @@ -727,7 +735,7 @@ class cssens(ctools.cscript): | @@ -727,7 +735,7 @@ class cssens(ctools.cscript): | ||
| 727 | self.log(str(par)+"\n") | 735 | self.log(str(par)+"\n") |
| 728 | 736 | ||
| 729 | # Store result | 737 | # Store result |
| 730 | - result = {'loge': loge, 'emin': emin.TeV(), 'emax': emax.TeV(), \ | 738 | + result = {'loge': loge, 'emin': math.log10(emin.TeV()), 'emax': math.log10(emax.TeV()), \ |
| 731 | 'crab_flux': crab_flux, 'photon_flux': photon_flux, \ | 739 | 'crab_flux': crab_flux, 'photon_flux': photon_flux, \ |
| 732 | 'energy_flux': energy_flux, \ | 740 | 'energy_flux': energy_flux, \ |
| 733 | 'sensitivity': sensitivity} | 741 | 'sensitivity': sensitivity} |