Luigi Tibaldo / ctools

Commit 7057753bac22df03d32a410a30bc6fe176627085

Authored by Jürgen Knödlseder
1 parent b9778a81

Change names of effective area ROOT histograms in csroot2caldb.py

Inline Side-by-side
Showing 3 changed files with 10 additions and 4 deletions
ChangeLog
  View file @7057753
1 -2017-04-05 1 +2017-04-06
2 2
3 * Version 1.3.0 released 3 * Version 1.3.0 released
4 ======================== 4 ========================
5 5
  6 + Use correct ROOT histograms in csroot2caldb
6 Implement regression scheme in cssens and remove num_avg parameter (#1989) 7 Implement regression scheme in cssens and remove num_avg parameter (#1989)
7 Copy cscripts into bin directory instead of creating a symbolic links (#1987) 8 Copy cscripts into bin directory instead of creating a symbolic links (#1987)
8 If code originates from Git, always compile the Python bindings (#1985) 9 If code originates from Git, always compile the Python bindings (#1985)
1 New Features and Important Changes in ctools 1.3.0.dev1 1 New Features and Important Changes in ctools 1.3.0.dev1
2 2
3 -5 April 2017 3 +6 April 2017
4 4
5 5
6 Introduction 6 Introduction
@@ -137,6 +137,11 @@ A regression scheme now replaces the averaging scheme in cssens as this @@ -137,6 +137,11 @@ A regression scheme now replaces the averaging scheme in cssens as this
137 allows more accurately the prediction of the flux value at the threshold 137 allows more accurately the prediction of the flux value at the threshold
138 Test Statistic. The num_avg parameter has been removed (#1989). 138 Test Statistic. The num_avg parameter has been removed (#1989).
139 139
  140 +The names of some ROOT histograms has been changed in the Monte Carlo data
  141 +and the "EffectiveAreaEtrue_offaxis" needed to be changed to
  142 +"EffectiveAreaEtrueNoTheta2cut_offaxis" and "EffectiveAreaEtrue" to
  143 +"EffectiveAreaEtrueNoTheta2cut" in csroot2caldb.
  144 +
140 145
141 Examples 146 Examples
142 -------- 147 --------
cscripts/csroot2caldb.py
  View file @7057753
@@ -551,13 +551,13 @@ class csroot2caldb(ctools.cscript): @@ -551,13 +551,13 @@ class csroot2caldb(ctools.cscript):
551 self._log_header1(gammalib.TERSE, 'Generate effective area extension') 551 self._log_header1(gammalib.TERSE, 'Generate effective area extension')
552 552
553 # Get relevant ROOT histograms 553 # Get relevant ROOT histograms
554 - etrue = tfile.Get('EffectiveAreaEtrue_offaxis') 554 + etrue = tfile.Get('EffectiveAreaEtrueNoTheta2cut_offaxis')
555 555
556 # If requested then normalize the 2D histogram on the on-axis 1D 556 # If requested then normalize the 2D histogram on the on-axis 1D
557 # histogram. This assures that the 2D histogram has the same on-axis 557 # histogram. This assures that the 2D histogram has the same on-axis
558 # effective area dependence as the 1D histogram. 558 # effective area dependence as the 1D histogram.
559 if self['norm1d'].boolean(): 559 if self['norm1d'].boolean():
560 - etrue_1D = tfile.Get('EffectiveAreaEtrue') 560 + etrue_1D = tfile.Get('EffectiveAreaEtrueNoTheta2cut')
561 self._renorm_onaxis(etrue, etrue_1D) 561 self._renorm_onaxis(etrue, etrue_1D)
562 562
563 # If requested then rebin the effective area Etrue histogram. This 563 # If requested then rebin the effective area Etrue histogram. This