Commit 318346b4e01ad137963ba16688431cefc07c64e0
1 parent
413461b4
Use migration matrix index
Showing
1 changed file
with
8 additions
and
9 deletions
scripts/cta_root2caldb.py
| @@ -25,7 +25,6 @@ | @@ -25,7 +25,6 @@ | ||
| 25 | # - pyroot | 25 | # - pyroot |
| 26 | # ========================================================================== | 26 | # ========================================================================== |
| 27 | from ROOT import TFile, TH1F, TH2F, TH3F | 27 | from ROOT import TFile, TH1F, TH2F, TH3F |
| 28 | -#from gammalib import * | ||
| 29 | import gammalib | 28 | import gammalib |
| 30 | from datetime import datetime | 29 | from datetime import datetime |
| 31 | import math | 30 | import math |
| @@ -871,17 +870,17 @@ class caldb(): | @@ -871,17 +870,17 @@ class caldb(): | ||
| 871 | if not hdu.contains("MIGRA_LO"): | 870 | if not hdu.contains("MIGRA_LO"): |
| 872 | hdu.append(gammalib.GFitsTableFloatCol("MIGRA_LO", 1, nmigra)) | 871 | hdu.append(gammalib.GFitsTableFloatCol("MIGRA_LO", 1, nmigra)) |
| 873 | hdu["MIGRA_LO"].unit("") | 872 | hdu["MIGRA_LO"].unit("") |
| 874 | - for ieng in range(nmigra): | ||
| 875 | - e_lo = pow(10.0, migra.GetBinLowEdge(ieng+1)) | ||
| 876 | - hdu["MIGRA_LO"][0,ieng] = e_lo | 873 | + for imigra in range(nmigra): |
| 874 | + migra_lo = migra.GetBinLowEdge(imigra+1) | ||
| 875 | + hdu["MIGRA_LO"][0,imigra] = migra_lo | ||
| 877 | # | 876 | # |
| 878 | # MIGRA_HI | 877 | # MIGRA_HI |
| 879 | if not hdu.contains("MIGRA_HI"): | 878 | if not hdu.contains("MIGRA_HI"): |
| 880 | hdu.append(gammalib.GFitsTableFloatCol("MIGRA_HI", 1, nmigra)) | 879 | hdu.append(gammalib.GFitsTableFloatCol("MIGRA_HI", 1, nmigra)) |
| 881 | hdu["MIGRA_HI"].unit("") | 880 | hdu["MIGRA_HI"].unit("") |
| 882 | - for ieng in range(nmigra): | ||
| 883 | - e_hi = pow(10.0, migra.GetBinUpEdge(ieng+1)) | ||
| 884 | - hdu["MIGRA_HI"][0,ieng] = e_hi | 881 | + for imigra in range(nmigra): |
| 882 | + migra_hi = migra.GetBinUpEdge(imigra+1) | ||
| 883 | + hdu["MIGRA_HI"][0,imigra] = migra_hi | ||
| 885 | # | 884 | # |
| 886 | # THETA_LO | 885 | # THETA_LO |
| 887 | if not hdu.contains("THETA_LO"): | 886 | if not hdu.contains("THETA_LO"): |
| @@ -891,7 +890,7 @@ class caldb(): | @@ -891,7 +890,7 @@ class caldb(): | ||
| 891 | o_lo = offsets.GetBinLowEdge(ioff+1) | 890 | o_lo = offsets.GetBinLowEdge(ioff+1) |
| 892 | hdu["THETA_LO"][0,ioff] = o_lo | 891 | hdu["THETA_LO"][0,ioff] = o_lo |
| 893 | # | 892 | # |
| 894 | - # THETA_LO | 893 | + # THETA_HI |
| 895 | if not hdu.contains("THETA_HI"): | 894 | if not hdu.contains("THETA_HI"): |
| 896 | hdu.append(gammalib.GFitsTableFloatCol("THETA_HI", 1, noffset)) | 895 | hdu.append(gammalib.GFitsTableFloatCol("THETA_HI", 1, noffset)) |
| 897 | hdu["THETA_HI"].unit("deg") | 896 | hdu["THETA_HI"].unit("deg") |
| @@ -1479,7 +1478,7 @@ def set_prod2_desy(): | @@ -1479,7 +1478,7 @@ def set_prod2_desy(): | ||
| 1479 | path_ten = "/project-data/cta/performance/prod2/Performance_DESY_20140131_Tenerife_50h" | 1478 | path_ten = "/project-data/cta/performance/prod2/Performance_DESY_20140131_Tenerife_50h" |
| 1480 | rebin = False | 1479 | rebin = False |
| 1481 | psftype = "Gauss" | 1480 | psftype = "Gauss" |
| 1482 | - eascale = 1.0 / 0.68 # Prod 2 DESY effective areas ar for 68% containment | 1481 | + eascale = 1.0 / 0.68 # Prod 2 DESY effective areas are for 68% containment |
| 1483 | 1482 | ||
| 1484 | # Set database content | 1483 | # Set database content |
| 1485 | db = [{'inst': "aar", 'id': "DESY20140105_50h", | 1484 | db = [{'inst': "aar", 'id': "DESY20140105_50h", |