From 70e9743c31b91678bd8ed538a7f5e1aea5d8c24c Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Tue, 15 Mar 2016 15:58:49 +0100 Subject: [PATCH] Try to resolve some Sonar issues. --- cscripts/cspull.py | 12 ++++++------ cscripts/cssens.py | 18 +++++++++--------- cscripts/csspec.py | 7 ++++--- cscripts/cstsdist.py | 10 +++++----- cscripts/cstsmapmerge.py | 4 ++-- cscripts/cta_kb_bkgrates.py | 22 ++++++++++------------ cscripts/cta_kb_root2caldb.py | 31 ++++++++++++++++--------------- cscripts/cta_make_nodes.py | 33 +++++++++++++++------------------ cscripts/cta_root2caldb.py | 9 +++++---- 9 files changed, 72 insertions(+), 74 deletions(-) diff --git a/cscripts/cspull.py b/cscripts/cspull.py index ec659ef..25f68a9 100755 --- a/cscripts/cspull.py +++ b/cscripts/cspull.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # # ========================================================================== -import gammalib +#import gammalib import ctools from cscripts import obsutils import sys @@ -410,17 +410,17 @@ class cspull(ctools.cscript): # Write out result immediately if seed == 0: - file = open(self._outfile.url(), 'w') - writer = csv.DictWriter(file, result['colnames']) + f = open(self._outfile.url(), 'w') + writer = csv.DictWriter(f, result['colnames']) headers = {} for n in result['colnames']: headers[n] = n writer.writerow(headers) else: - file = open(self._outfile.url(), 'a') - writer = csv.DictWriter(file, result['colnames']) + f = open(self._outfile.url(), 'a') + writer = csv.DictWriter(f, result['colnames']) writer.writerow(result['values']) - file.close() + f.close() # Return return diff --git a/cscripts/cssens.py b/cscripts/cssens.py index e526b67..89e3e89 100755 --- a/cscripts/cssens.py +++ b/cscripts/cssens.py @@ -347,18 +347,18 @@ class cssens(ctools.cscript): photon_flux_value = [] energy_flux_value = [] sensitivity_value = [] - iter = 0 + iterations = 0 test_crab_flux = 0.1 # Initial test flux in Crab units (100 mCrab) # Loop until we break while True: # Update iteration counter - iter += 1 + iterations += 1 # Write header if self._logExplicit(): - self._log.header2("Iteration "+str(iter)) + self._log.header2("Iteration "+str(iterations)) # Set source model. crab_prefactor is the Prefactor that # corresponds to 1 Crab @@ -370,7 +370,7 @@ class cssens(ctools.cscript): self._obs.models(src_model) # Simulate events - sim = obsutils.sim(self._obs, nbins=self._enumbins, seed=iter, + sim = obsutils.sim(self._obs, nbins=self._enumbins, seed=iterations, binsz=self._binsz, npix=self._npix, log=self._log_clients, debug=self._debug, edisp=self._edisp) @@ -464,8 +464,8 @@ class cssens(ctools.cscript): # Get fitted Crab, photon and energy fluxes crab_flux = result_all[self._srcname]['Prefactor'].value() / \ crab_prefactor - crab_flux_err = result_all[self._srcname]['Prefactor'].error() / \ - crab_prefactor + #crab_flux_err = result_all[self._srcname]['Prefactor'].error() / \ + # crab_prefactor photon_flux = result_all[self._srcname].spectral().flux(emin, emax) energy_flux = result_all[self._srcname].spectral().eflux(emin, emax) @@ -511,7 +511,7 @@ class cssens(ctools.cscript): for par in model: self._log(str(par)+"\n") elif self._logTerse(): - self._log.parformat("Iteration "+str(iter)) + self._log.parformat("Iteration "+str(iterations)) self._log("TS=") self._log(ts) self._log(" ") @@ -549,7 +549,7 @@ class cssens(ctools.cscript): sensitivity /= num # Compare average flux to last average - if iter > self._num_avg: + if iterations > self._num_avg: if test_crab_flux > 0: ratio = crab_flux/test_crab_flux @@ -570,7 +570,7 @@ class cssens(ctools.cscript): test_crab_flux = crab_flux # Exit loop if number of trials exhausted - if (iter >= self._max_iter): + if (iterations >= self._max_iter): if self._logTerse(): self._log(" Test ended after "+str(self._max_iter)+ " iterations.\n") diff --git a/cscripts/csspec.py b/cscripts/csspec.py index f011e20..6ef8762 100755 --- a/cscripts/csspec.py +++ b/cscripts/csspec.py @@ -158,9 +158,10 @@ class csspec(ctools.cscript): # If no layers overlap then throw an exception if (len(use_layers) == 0): - msg = "Energy range ["+str(cube_ebounds.emin(i))+ \ - ", "+str(cube_ebounds.emax(i))+"] of counts "+ \ - "cube does not overlap with specified energy range ["+ \ + msg = "Energy range ["+str(cube_ebounds.emin())+ \ + ", "+str(cube_ebounds.emax())+"] of counts "+ \ + "cube does not overlap with specified energy "+ \ + "range ["+ \ str(emin)+", "+str(emax)+"]. Specify "+ \ "overlapping energy range." raise RuntimeError(msg) diff --git a/cscripts/cstsdist.py b/cscripts/cstsdist.py index 137671b..070b681 100755 --- a/cscripts/cstsdist.py +++ b/cscripts/cstsdist.py @@ -419,17 +419,17 @@ class cstsdist(ctools.cscript): # Write out result immediately if seed == 0: - file = open(self._outfile.url(), 'w') - writer = csv.DictWriter(file, result['colnames']) + f = open(self._outfile.url(), 'w') + writer = csv.DictWriter(f, result['colnames']) headers = {} for n in result['colnames']: headers[n] = n writer.writerow(headers) else: - file = open(self._outfile.url(), 'a') - writer = csv.DictWriter(file, result['colnames']) + f = open(self._outfile.url(), 'a') + writer = csv.DictWriter(f, result['colnames']) writer.writerow(result['values']) - file.close() + f.close() # Return return diff --git a/cscripts/cstsmapmerge.py b/cscripts/cstsmapmerge.py index 4eccec7..a19a0ad 100755 --- a/cscripts/cstsmapmerge.py +++ b/cscripts/cstsmapmerge.py @@ -414,8 +414,8 @@ class cstsmapmerge(ctools.cscript): # Delete TS input maps if requested if self._delete: for filename in self._merged_files: - os.remove(filename) - if self._logTerse(): + os.remove(filename) + if self._logTerse(): self._log(gammalib.parformat("Deleted input file")) self._log(filename) self._log("\n") diff --git a/cscripts/cta_kb_bkgrates.py b/cscripts/cta_kb_bkgrates.py index adebc0a..ca16f81 100755 --- a/cscripts/cta_kb_bkgrates.py +++ b/cscripts/cta_kb_bkgrates.py @@ -4,7 +4,7 @@ # into a column separated file function table. The table is automatically # named "bkg_XXX.txt" where "XXX" is for example "kb_E_50h_v3". # -# Copyright (C) 2011-2014 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 @@ -38,8 +38,8 @@ def make_file_function(irfname, filename): filename - File function filename """ # Open performance file and file function - irf = open(irfname, "r") - file = open(filename, "w") + irf = open(irfname, "r") + f = open(filename, "w") # Read data for row in irf: @@ -53,12 +53,12 @@ def make_file_function(irfname, filename): # Extract data fields = row.replace(" ",",").replace(",,",",").rstrip("\n").split(",") logE = float(fields[0]) - aeff = float(fields[1]) - r68 = float(fields[2]) + #aeff = float(fields[1]) + #r68 = float(fields[2]) r80 = float(fields[3]) - eres = float(fields[4]) + #eres = float(fields[4]) bgd = float(fields[5]) - sens = float(fields[6]) + #sens = float(fields[6]) # Compute energy (in MeV) energy = math.pow(10.0, logE)*1.0e6 @@ -76,11 +76,11 @@ def make_file_function(irfname, filename): bkg_rate = 0.0 # Write - file.write(str(energy)+" "+str(bkg_rate)+"\n") + f.write(str(energy)+" "+str(bkg_rate)+"\n") # Close files irf.close() - file.close() + f.close() # Return return @@ -90,9 +90,7 @@ def make_file_function(irfname, filename): # Main entry point # # ================ # if __name__ == '__main__': - """ - Main entry point - """ + # Set parameters caldb = "/usr/local/gamma/share/caldb/data/cta/kb/" diff --git a/cscripts/cta_kb_root2caldb.py b/cscripts/cta_kb_root2caldb.py index 2ae96ab..7e3bdac 100755 --- a/cscripts/cta_kb_root2caldb.py +++ b/cscripts/cta_kb_root2caldb.py @@ -23,7 +23,8 @@ # along with this program. If not, see . # # ========================================================================== -from ROOT import TFile, TH1F, TH2F +#from ROOT import TFile, TH1F, TH2F +from ROOT import TFile, TH1F from datetime import datetime import gammalib import math @@ -506,11 +507,11 @@ if __name__ == '__main__': """ """ # Get ROOT filename from command line argument - if (len(sys.argv) > 1): - filename = sys.argv[1] - else: - db = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/Kb_all_20deg_root" - #db = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/Kb_all_50deg_root" + #if (len(sys.argv) > 1): + # filename = sys.argv[1] + #else: + db = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/Kb_all_20deg_root" + #db = "/Users/jurgen/Documents/Travail/Projects/CTA/WP-MC/root/Kb_all_50deg_root" # Get list of all performance files files = glob.glob(db+"/*.root") @@ -520,26 +521,26 @@ if __name__ == '__main__': irf = caldb("kb") # Loop over all files - for file in files: + for f in files: # Get filename - head, tail = os.path.split(file) + head, tail = os.path.split(f) # Build name name = tail.strip(".root") if name.find("kb_") != -1: name = name.replace("_20deg", "") elif name.find("IFAE_") != -1: - name = name.replace("Subarray", "") - name = name.replace("IFAE_", "") - name = "IFAE_"+name - i = name.find("hours") - if i != -1: - name = name[0:i+1] + name = name.replace("Subarray", "") + name = name.replace("IFAE_", "") + name = "IFAE_"+name + index = name.find("hours") + if index != -1: + name = name[0:index+1] print(tail) # Open calibration file irf.add(name) # Translate ROOT to CALDB information - irf.root2caldb(file) + irf.root2caldb(f) diff --git a/cscripts/cta_make_nodes.py b/cscripts/cta_make_nodes.py index 88291eb..e94c69b 100755 --- a/cscripts/cta_make_nodes.py +++ b/cscripts/cta_make_nodes.py @@ -20,7 +20,6 @@ # along with this program. If not, see . # # ========================================================================== -#from gammalib import * import sys import math @@ -28,7 +27,7 @@ import math # ============== # # Write one node # # ============== # -def write_node(file, energy, scale): +def write_node(f, energy, scale): """ Writes one node to XML file. """ @@ -37,22 +36,22 @@ def write_node(file, energy, scale): str_scale = str(scale) # Write start tag - file.write(' \n') + f.write(' \n') # Write energy - file.write(' \n') + f.write(' \n') # Write intensity - file.write(' \n') + f.write(' \n') # Write end tag - file.write(' \n') + f.write(' \n') # Return return @@ -66,7 +65,7 @@ def create_nodes(emin, emax, enumbins): Create nodes (energies in TeV). """ # Open file - file = open("nodes.xml", "w") + f = open("nodes.xml", "w") # Set node boundaries elogmin = math.log10(float(emin)) @@ -83,14 +82,14 @@ def create_nodes(emin, emax, enumbins): scale = 3.45e-17 * math.pow(energy, -2.63) # Write node - write_node(file, energy, scale) + write_node(f, energy, scale) # Debug #sys.stdout.write(energy) #sys.stdout.write(math.pow(10.0, int(math.log10(scale))-1.0)±"\n") # Close file - file.close() + f.close() # Return return @@ -100,9 +99,7 @@ def create_nodes(emin, emax, enumbins): # Main script entry point # # ======================= # if __name__ == '__main__': - """ - Compute nodes. - """ + # Check command line usage = "Usage: cta_make_nodes emin emax enumbins" if len(sys.argv) < 3: diff --git a/cscripts/cta_root2caldb.py b/cscripts/cta_root2caldb.py index aa2a6d7..4b88cf4 100755 --- a/cscripts/cta_root2caldb.py +++ b/cscripts/cta_root2caldb.py @@ -3,7 +3,7 @@ # This script generates IRFs in the CALDB format of HEASARC using ROOT # offaxis performance files. # ------------------------------------------------------------------------- -# Copyright (C) 2011-2015 Juergen Knoedlseder +# Copyright (C) 2011-2016 Juergen Knoedlseder # ------------------------------------------------------------------------- # # This program is free software: you can redistribute it and/or modify @@ -24,12 +24,13 @@ # - gammalib # - pyroot # ========================================================================== -from ROOT import TFile, TH1F, TH2F, TH3F +#from ROOT import TFile, TH1F, TH2F, TH3F +from ROOT import TFile, TH2F, TH3F import gammalib from datetime import datetime import math -import sys -import glob +#import sys +#import glob import os -- libgit2 0.21.4