Johan Bregeon / ctools

Commit fa75aec9aacf75499f92dd5b7bdccb91ef6f84db

Authored by Jürgen Knödlseder
1 parent d131d288

Use cscripts obsutils and create cscripts module.

Inline Side-by-side
Showing 4 changed files with 13 additions and 9 deletions
scripts/Makefile.am
  View file @fa75aec
@@ -5,21 +5,22 @@ binscripts = cta_kb_bkgrates.py cta_root2irf.py cta_make_nodes.py \ @@ -5,21 +5,22 @@ binscripts = cta_kb_bkgrates.py cta_root2irf.py cta_make_nodes.py \
5 tsmerge.py 5 tsmerge.py
6 6
7 # Scripts to be distributed in pythondir 7 # Scripts to be distributed in pythondir
8 -pythonscripts = cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py \ 8 +pythonscripts = __init__.py \
  9 + cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py \
9 cshessobs.py csobsdef.py csspec.py cslightcrv.py \ 10 cshessobs.py csobsdef.py csspec.py cslightcrv.py \
10 csinfo.py \ 11 csinfo.py \
11 - lsmodel.py 12 + obsutils.py
12 13
13 # Scripts for which symbolic links will be created in bindir 14 # Scripts for which symbolic links will be created in bindir
14 linkscripts = cspull cssens cstsdist cscaldb csresmap \ 15 linkscripts = cspull cssens cstsdist cscaldb csresmap \
15 cshessobs csobsdef csspec cslightcrv \ 16 cshessobs csobsdef csspec cslightcrv \
16 - csinfo lsmodel 17 + csinfo
17 18
18 # Distribute scripts 19 # Distribute scripts
19 EXTRA_DIST = $(binscripts) $(pythonscripts) 20 EXTRA_DIST = $(binscripts) $(pythonscripts)
20 binscriptsdir = $(bindir) 21 binscriptsdir = $(bindir)
21 binscripts_DATA = $(binscripts) 22 binscripts_DATA = $(binscripts)
22 -pythonscriptsdir = $(pythondir)/ctools 23 +pythonscriptsdir = $(pythondir)/cscripts
23 pythonscripts_DATA = $(pythonscripts) 24 pythonscripts_DATA = $(pythonscripts)
24 25
25 # Add hook rule to create symbolic links for cscripts 26 # Add hook rule to create symbolic links for cscripts
@@ -31,7 +32,7 @@ install-data-hook: @@ -31,7 +32,7 @@ install-data-hook:
31 @linklist='$(linkscripts)';\ 32 @linklist='$(linkscripts)';\
32 for p in $$linklist; do \ 33 for p in $$linklist; do \
33 rm -rf "$(DESTDIR)$(bindir)/$$p"; \ 34 rm -rf "$(DESTDIR)$(bindir)/$$p"; \
34 - ln -s "$(DESTDIR)$(pythondir)/ctools/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \  
35 - chmod +x "$(DESTDIR)$(pythondir)/ctools/$$p.py"; \ 35 + ln -s "$(DESTDIR)$(pythondir)/cscripts/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \
  36 + chmod +x "$(DESTDIR)$(pythondir)/cscripts/$$p.py"; \
36 done 37 done
37 38
scripts/cspull.py
  View file @fa75aec
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 # ========================================================================== 20 # ==========================================================================
21 import gammalib 21 import gammalib
22 import ctools 22 import ctools
23 -from ctools import obsutils 23 +#from ctools import obsutils
  24 +from cscripts import obsutils
24 import sys 25 import sys
25 import csv 26 import csv
26 27
scripts/cssens.py
  View file @fa75aec
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 # ========================================================================== 20 # ==========================================================================
21 import gammalib 21 import gammalib
22 import ctools 22 import ctools
23 -from ctools import obsutils 23 +#from ctools import obsutils
  24 +from cscripts import obsutils
24 import sys 25 import sys
25 import csv 26 import csv
26 import math 27 import math
scripts/cstsdist.py
  View file @fa75aec
@@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
21 # ========================================================================== 21 # ==========================================================================
22 import gammalib 22 import gammalib
23 import ctools 23 import ctools
24 -from ctools import obsutils 24 +#from ctools import obsutils
  25 +from cscripts import obsutils
25 import sys 26 import sys
26 import csv 27 import csv
27 28