Merge branch 'devel' into integration

Jürgen Knödlseder
2 parents ae1fdaec 08cc2a10
Showing 5 changed files with 48 additions and 26 deletions
cscripts/__init__.py.in
cscripts/cspull.py
cscripts/cssens.py
cscripts/csspec.py
cscripts/cstsdist.py
@@ -50,26 +50,26 @@ if cur_version &gt; req_version:
 # Import
-from .cscaldb      import cscaldb
-from .csinfo       import csinfo
-from .cslightcrv   import cslightcrv
-from .csmodelinfo  import csmodelinfo
-from .csmodelmerge import csmodelmerge
-from .csobs2caldb  import csobs2caldb
-from .csobsdef     import csobsdef
-from .csobsinfo    import csobsinfo
-from .cspull       import cspull
-from .csresmap     import csresmap
-from .cssens       import cssens
-from .csspec       import csspec
-from .cstsdist     import cstsdist
-from .cstsmapmerge import cstsmapmerge
-from . import obsutils
+import cscaldb
+import csinfo
+import cslightcrv
+import csmodelinfo
+import csmodelmerge
+import csobs2caldb
+import csobsdef
+import csobsinfo
+import cspull
+import csresmap
+import cssens
+import csspec
+import cstsdist
+import cstsmapmerge
+import obsutils
 if cur_version > req_version:
-    from .csfindobs    import csfindobs
-    from .csiactcopy   import csiactcopy
-    from .csiactdata   import csiactdata
-    from .csiactobs    import csiactobs
+    import csfindobs
+    import csiactcopy
+    import csiactdata
+    import csiactobs
 # Delete version check variables
 del sys
@@ -321,7 +321,11 @@ class cspull(ctools.cscript):
             if seed == 0:
                 file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
-                writer.writerow(dict((_,_) for _ in result['colnames']))
+                headers = {}
+                for n in result['colnames']:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
                 file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This script computes the CTA sensitivity.
 #
-# Copyright (C) 2011-2015 Juergen Knoedlseder
+# Copyright (C) 2011-2016 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -251,7 +251,11 @@ class cssens(ctools.cscript):
             if ieng == 0:
                 f      = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(f, colnames)
-                writer.writerow(dict((_,_) for _ in colnames))
+                headers = {}
+                for n in colnames:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in colnames))
                 writer.writerow(result)
                 f.close()
             else:
@@ -217,14 +217,24 @@ class csspec(ctools.cscript):
             # Create energy boundaries
             self.m_ebounds = gammalib.GEbounds()
-            for i in range(len(use_layers))[::n_layers]:
-                i_start = i
-                i_stop  = i + n_layers - 1
+            i_start = 0
+            i_stop  = n_layers - 1
+            while i_start < len(use_layers):
                 if i_stop >= len(use_layers):
                     i_stop = len(use_layers) - 1
                 ebinmin = cube_ebounds.emin(use_layers[i_start])
                 ebinmax = cube_ebounds.emax(use_layers[i_stop])
                 self.m_ebounds.append(ebinmin, ebinmax)
+                i_start += n_layers
+                i_stop  += n_layers
+            #for i in range(len(use_layers))[::n_layers]:
+            #    i_start = i
+            #    i_stop  = i + n_layers - 1
+            #    if i_stop >= len(use_layers):
+            #        i_stop = len(use_layers) - 1
+            #    ebinmin = cube_ebounds.emin(use_layers[i_start])
+            #    ebinmax = cube_ebounds.emax(use_layers[i_stop])
+            #    self.m_ebounds.append(ebinmin, ebinmax)
         # Unbinned mode       
         else:
@@ -251,7 +251,11 @@ class cstsdist(ctools.cscript):
             if seed == 0:
                 file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
-                writer.writerow(dict((_,_) for _ in result['colnames']))
+                headers = {}
+                for n in result['colnames']:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
                 file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])