Mathieu Servillat / ctools

Commit cd7c26fa60273bd586c8b949dd51e09046babd1a

Authored by Jürgen Knödlseder
2 parents ae1fdaec 08cc2a10

Merge branch 'devel' into integration

Inline Side-by-side
Showing 5 changed files with 48 additions and 26 deletions
cscripts/__init__.py.in
  View file @cd7c26f
... ... @@ -50,26 +50,26 @@ if cur_version > req_version:
50 50  
51 51  
52 52 # Import
53   -from .cscaldb import cscaldb
54   -from .csinfo import csinfo
55   -from .cslightcrv import cslightcrv
56   -from .csmodelinfo import csmodelinfo
57   -from .csmodelmerge import csmodelmerge
58   -from .csobs2caldb import csobs2caldb
59   -from .csobsdef import csobsdef
60   -from .csobsinfo import csobsinfo
61   -from .cspull import cspull
62   -from .csresmap import csresmap
63   -from .cssens import cssens
64   -from .csspec import csspec
65   -from .cstsdist import cstsdist
66   -from .cstsmapmerge import cstsmapmerge
67   -from . import obsutils
  53 +import cscaldb
  54 +import csinfo
  55 +import cslightcrv
  56 +import csmodelinfo
  57 +import csmodelmerge
  58 +import csobs2caldb
  59 +import csobsdef
  60 +import csobsinfo
  61 +import cspull
  62 +import csresmap
  63 +import cssens
  64 +import csspec
  65 +import cstsdist
  66 +import cstsmapmerge
  67 +import obsutils
68 68 if cur_version > req_version:
69   - from .csfindobs import csfindobs
70   - from .csiactcopy import csiactcopy
71   - from .csiactdata import csiactdata
72   - from .csiactobs import csiactobs
  69 + import csfindobs
  70 + import csiactcopy
  71 + import csiactdata
  72 + import csiactobs
73 73  
74 74 # Delete version check variables
75 75 del sys
... ...
cscripts/cspull.py
  View file @cd7c26f
... ... @@ -321,7 +321,11 @@ class cspull(ctools.cscript):
321 321 if seed == 0:
322 322 file = open(self.m_outfile.url(), 'w')
323 323 writer = csv.DictWriter(file, result['colnames'])
324   - writer.writerow(dict((_,_) for _ in result['colnames']))
  324 + headers = {}
  325 + for n in result['colnames']:
  326 + headers[n] = n
  327 + writer.writerow(headers)
  328 + #writer.writerow(dict((_,_) for _ in result['colnames']))
325 329 else:
326 330 file = open(self.m_outfile.url(), 'a')
327 331 writer = csv.DictWriter(file, result['colnames'])
... ...
cscripts/cssens.py
  View file @cd7c26f
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # This script computes the CTA sensitivity.
4 4 #
5   -# Copyright (C) 2011-2015 Juergen Knoedlseder
  5 +# Copyright (C) 2011-2016 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -251,7 +251,11 @@ class cssens(ctools.cscript):
251 251 if ieng == 0:
252 252 f = open(self.m_outfile.url(), 'w')
253 253 writer = csv.DictWriter(f, colnames)
254   - writer.writerow(dict((_,_) for _ in colnames))
  254 + headers = {}
  255 + for n in colnames:
  256 + headers[n] = n
  257 + writer.writerow(headers)
  258 + #writer.writerow(dict((_,_) for _ in colnames))
255 259 writer.writerow(result)
256 260 f.close()
257 261 else:
... ...
cscripts/csspec.py
  View file @cd7c26f
... ... @@ -217,14 +217,24 @@ class csspec(ctools.cscript):
217 217  
218 218 # Create energy boundaries
219 219 self.m_ebounds = gammalib.GEbounds()
220   - for i in range(len(use_layers))[::n_layers]:
221   - i_start = i
222   - i_stop = i + n_layers - 1
  220 + i_start = 0
  221 + i_stop = n_layers - 1
  222 + while i_start < len(use_layers):
223 223 if i_stop >= len(use_layers):
224 224 i_stop = len(use_layers) - 1
225 225 ebinmin = cube_ebounds.emin(use_layers[i_start])
226 226 ebinmax = cube_ebounds.emax(use_layers[i_stop])
227 227 self.m_ebounds.append(ebinmin, ebinmax)
  228 + i_start += n_layers
  229 + i_stop += n_layers
  230 + #for i in range(len(use_layers))[::n_layers]:
  231 + # i_start = i
  232 + # i_stop = i + n_layers - 1
  233 + # if i_stop >= len(use_layers):
  234 + # i_stop = len(use_layers) - 1
  235 + # ebinmin = cube_ebounds.emin(use_layers[i_start])
  236 + # ebinmax = cube_ebounds.emax(use_layers[i_stop])
  237 + # self.m_ebounds.append(ebinmin, ebinmax)
228 238  
229 239 # Unbinned mode
230 240 else:
... ...
cscripts/cstsdist.py
  View file @cd7c26f
... ... @@ -251,7 +251,11 @@ class cstsdist(ctools.cscript):
251 251 if seed == 0:
252 252 file = open(self.m_outfile.url(), 'w')
253 253 writer = csv.DictWriter(file, result['colnames'])
254   - writer.writerow(dict((_,_) for _ in result['colnames']))
  254 + headers = {}
  255 + for n in result['colnames']:
  256 + headers[n] = n
  257 + writer.writerow(headers)
  258 + #writer.writerow(dict((_,_) for _ in result['colnames']))
255 259 else:
256 260 file = open(self.m_outfile.url(), 'a')
257 261 writer = csv.DictWriter(file, result['colnames'])
... ...