Francois Brun / ctools

Commit 4d8c2812946e26d6ff9b26c1b744fe79571702ea

Authored by knodlseder
1 parent 99ced245

use hascolumn() instead of has()

Inline Side-by-side
Showing 1 changed file with 9 additions and 7 deletions
scripts/cta_root2caldb.py
  View file @4d8c281
@@ -452,7 +452,7 @@ class caldb(): @@ -452,7 +452,7 @@ class caldb():
452 # calls of this method 452 # calls of this method
453 # 453 #
454 # ENERG_LO 454 # ENERG_LO
455 - if not hdu.has("ENERG_LO"): 455 + if not hdu.hascolumn("ENERG_LO"):
456 hdu.append_column(GFitsTableFloatCol("ENERG_LO", 1, neng)) 456 hdu.append_column(GFitsTableFloatCol("ENERG_LO", 1, neng))
457 hdu["ENERG_LO"].unit("TeV") 457 hdu["ENERG_LO"].unit("TeV")
458 for ieng in range(neng): 458 for ieng in range(neng):
@@ -460,7 +460,7 @@ class caldb(): @@ -460,7 +460,7 @@ class caldb():
460 hdu["ENERG_LO"][0,ieng] = e_lo 460 hdu["ENERG_LO"][0,ieng] = e_lo
461 # 461 #
462 # ENERG_HI 462 # ENERG_HI
463 - if not hdu.has("ENERG_HI"): 463 + if not hdu.hascolumn("ENERG_HI"):
464 hdu.append_column(GFitsTableFloatCol("ENERG_HI", 1, neng)) 464 hdu.append_column(GFitsTableFloatCol("ENERG_HI", 1, neng))
465 hdu["ENERG_HI"].unit("TeV") 465 hdu["ENERG_HI"].unit("TeV")
466 for ieng in range(neng): 466 for ieng in range(neng):
@@ -468,7 +468,7 @@ class caldb(): @@ -468,7 +468,7 @@ class caldb():
468 hdu["ENERG_HI"][0,ieng] = e_hi 468 hdu["ENERG_HI"][0,ieng] = e_hi
469 # 469 #
470 # THETA_LO 470 # THETA_LO
471 - if not hdu.has("THETA_LO"): 471 + if not hdu.hascolumn("THETA_LO"):
472 hdu.append_column(GFitsTableFloatCol("THETA_LO", 1, noffset)) 472 hdu.append_column(GFitsTableFloatCol("THETA_LO", 1, noffset))
473 hdu["THETA_LO"].unit("deg") 473 hdu["THETA_LO"].unit("deg")
474 for ioff in range(noffset): 474 for ioff in range(noffset):
@@ -477,7 +477,7 @@ class caldb(): @@ -477,7 +477,7 @@ class caldb():
477 477
478 # 478 #
479 # THETA_LO 479 # THETA_LO
480 - if not hdu.has("THETA_HI"): 480 + if not hdu.hascolumn("THETA_HI"):
481 hdu.append_column(GFitsTableFloatCol("THETA_HI", 1, noffset)) 481 hdu.append_column(GFitsTableFloatCol("THETA_HI", 1, noffset))
482 hdu["THETA_HI"].unit("deg") 482 hdu["THETA_HI"].unit("deg")
483 for ioff in range(noffset): 483 for ioff in range(noffset):
@@ -485,7 +485,7 @@ class caldb(): @@ -485,7 +485,7 @@ class caldb():
485 hdu["THETA_HI"][0,ioff] = o_hi 485 hdu["THETA_HI"][0,ioff] = o_hi
486 # 486 #
487 # "NAME" 487 # "NAME"
488 - if not hdu.has(name): 488 + if not hdu.hascolumn(name):
489 hdu.append_column(GFitsTableFloatCol(name, 1, neng*noffset)) 489 hdu.append_column(GFitsTableFloatCol(name, 1, neng*noffset))
490 hdu[name].unit(unit) 490 hdu[name].unit(unit)
491 hdu[name].dim([neng, noffset]) 491 hdu[name].dim([neng, noffset])
@@ -593,8 +593,10 @@ if __name__ == '__main__': @@ -593,8 +593,10 @@ if __name__ == '__main__':
593 CTA response. 593 CTA response.
594 """ 594 """
595 # Set ROOT filename 595 # Set ROOT filename
596 - path = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/IFAEOffaxis"  
597 - irf = "SubarrayE_offaxis.root" 596 + #path = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/IFAEOffaxis"
  597 + #irf = "SubarrayE_offaxis.root"
  598 + path = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/IFAEOffaxisPerformanceBEI_Nov2011"
  599 + irf = "SubarrayE_IFAE_50hours_20111121_offaxis.root"
598 filename = path+"/"+irf 600 filename = path+"/"+irf
599 601
600 # Allocate caldb 602 # Allocate caldb