From 30eeb6af6136ad9b771fec29c3cc3604ab5da904 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Tue, 30 Jun 2015 21:18:55 +0200 Subject: [PATCH] Correct code formatting. --- examples/benchmark_cta_analysis.py | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- examples/check_models.py | 24 ++++++++++++------------ examples/make_spectrum.py | 18 +++++++++--------- examples/make_ts_distributions.py | 30 +++++++++++++++--------------- examples/pipeline_binned_disk.py | 36 ++++++++++++++++++------------------ examples/pipeline_binned_mem.py | 16 ++++++++-------- examples/pipeline_stacked_disk.py | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------- examples/pipeline_stacked_mem.py | 86 +++++++++++++++++++++++++++++++++++++++++++------------------------------------------- examples/pipeline_unbinned_disk.py | 30 +++++++++++++++--------------- examples/pipeline_unbinned_mem.py | 14 +++++++------- scripts/cslightcrv.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- scripts/csresmap.py | 26 +++++++++++++------------- scripts/csspec.py | 92 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- test/test_ctbin.py | 22 +++++++++++----------- test/test_ctbkgcube.py | 30 +++++++++++++++--------------- test/test_ctbutterfly.py | 10 +++++----- test/test_ctcubemask.py | 12 ++++++------ test/test_cterror.py | 12 ++++++------ test/test_ctexpcube.py | 28 ++++++++++++++-------------- test/test_ctlike.py | 10 +++++----- test/test_ctmodel.py | 44 ++++++++++++++++++++++---------------------- test/test_ctobssim.py | 22 +++++++++++----------- test/test_ctpsfcube.py | 30 +++++++++++++++--------------- test/test_ctselect.py | 16 ++++++++-------- test/test_ctskymap.py | 20 ++++++++++---------- test/test_cttsmap.py | 26 +++++++++++++------------- test/test_ctulimit.py | 10 +++++----- test/test_pipelines.py | 68 ++++++++++++++++++++++++++++++++++---------------------------------- 28 files changed, 561 insertions(+), 566 deletions(-) diff --git a/examples/benchmark_cta_analysis.py b/examples/benchmark_cta_analysis.py index 947288e..7cd45e1 100755 --- a/examples/benchmark_cta_analysis.py +++ b/examples/benchmark_cta_analysis.py @@ -56,22 +56,22 @@ def unbinned_pipeline(duration): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax sim.run() # Select events select = ctools.ctselect(sim.obs()) - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad_select + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad_select select["tmin"] = tstart select["tmax"] = tstop select["emin"] = emin @@ -125,30 +125,30 @@ def binned_pipeline(duration): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax sim.run() # Bin events into counts map bin = ctools.ctbin(sim.obs()) - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["xref"] = ra - bin["yref"] = dec - bin["proj"] = proj + bin["xref"] = ra + bin["yref"] = dec + bin["proj"] = proj bin.run() # Get ctlike start CPU time @@ -198,82 +198,82 @@ def stacked_pipeline(duration): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax sim.run() # Bin events into counts map bin = ctools.ctbin(sim.obs()) - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["proj"] = proj - bin["xref"] = ra - bin["yref"] = dec + bin["proj"] = proj + bin["xref"] = ra + bin["yref"] = dec bin.run() # Create exposure cube expcube = ctools.ctexpcube(sim.obs()) - expcube["incube"] = "NONE" - expcube["caldb"] = caldb - expcube["irf"] = irf - expcube["ebinalg"] = "LOG" - expcube["emin"] = emin - expcube["emax"] = emax + expcube["incube"] = "NONE" + expcube["caldb"] = caldb + expcube["irf"] = irf + expcube["ebinalg"] = "LOG" + expcube["emin"] = emin + expcube["emax"] = emax expcube["enumbins"] = enumbins - expcube["nxpix"] = nxpix - expcube["nypix"] = nypix - expcube["binsz"] = binsz + expcube["nxpix"] = nxpix + expcube["nypix"] = nypix + expcube["binsz"] = binsz expcube["coordsys"] = coordsys - expcube["proj"] = proj - expcube["xref"] = ra - expcube["yref"] = dec + expcube["proj"] = proj + expcube["xref"] = ra + expcube["yref"] = dec expcube.run() # Create PSF cube psfcube = ctools.ctpsfcube(sim.obs()) - psfcube["incube"] = "NONE" - psfcube["caldb"] = caldb - psfcube["irf"] = irf - psfcube["ebinalg"] = "LOG" - psfcube["emin"] = emin - psfcube["emax"] = emax + psfcube["incube"] = "NONE" + psfcube["caldb"] = caldb + psfcube["irf"] = irf + psfcube["ebinalg"] = "LOG" + psfcube["emin"] = emin + psfcube["emax"] = emax psfcube["enumbins"] = enumbins - psfcube["nxpix"] = 10 - psfcube["nypix"] = 10 - psfcube["binsz"] = 1.0 + psfcube["nxpix"] = 10 + psfcube["nypix"] = 10 + psfcube["binsz"] = 1.0 psfcube["coordsys"] = coordsys - psfcube["proj"] = proj - psfcube["xref"] = ra - psfcube["yref"] = dec + psfcube["proj"] = proj + psfcube["xref"] = ra + psfcube["yref"] = dec psfcube.run() # Create background cube bkgcube = ctools.ctbkgcube(sim.obs()) - bkgcube["incube"] = "NONE" - bkgcube["ebinalg"] = "LOG" - bkgcube["emin"] = emin - bkgcube["emax"] = emax + bkgcube["incube"] = "NONE" + bkgcube["ebinalg"] = "LOG" + bkgcube["emin"] = emin + bkgcube["emax"] = emax bkgcube["enumbins"] = enumbins - bkgcube["nxpix"] = 10 - bkgcube["nypix"] = 10 - bkgcube["binsz"] = 1.0 + bkgcube["nxpix"] = 10 + bkgcube["nypix"] = 10 + bkgcube["binsz"] = 1.0 bkgcube["coordsys"] = coordsys - bkgcube["proj"] = proj - bkgcube["xref"] = ra - bkgcube["yref"] = dec + bkgcube["proj"] = proj + bkgcube["xref"] = ra + bkgcube["yref"] = dec bkgcube.run() # Attach background model to observation container diff --git a/examples/check_models.py b/examples/check_models.py index dad457b..cc1d8d8 100755 --- a/examples/check_models.py +++ b/examples/check_models.py @@ -62,22 +62,22 @@ def pipeline(model_name): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax sim.run() # Select events select = ctools.ctselect(sim.obs()) - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad_select + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad_select select["tmin"] = tstart select["tmax"] = tstop select["emin"] = emin diff --git a/examples/make_spectrum.py b/examples/make_spectrum.py index 48a9688..4492633 100755 --- a/examples/make_spectrum.py +++ b/examples/make_spectrum.py @@ -49,15 +49,15 @@ def make_spectrum(): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax sim.run() # Generate an energy binning diff --git a/examples/make_ts_distributions.py b/examples/make_ts_distributions.py index 6937af0..3c87943 100755 --- a/examples/make_ts_distributions.py +++ b/examples/make_ts_distributions.py @@ -61,22 +61,22 @@ def create_ts(loge, emin, emax, ntrials=100, duration=180000.0, \ # Setup cstsdist tool tsdist = cstsdist() - tsdist["inmodel"] = "$CTOOLS/share/models/crab.xml" - tsdist["srcname"] = "Crab" - tsdist["outfile"] = outfile - tsdist["ntrials"] = ntrials - tsdist["caldb"] = "prod2" - tsdist["irf"] = "South_50h" - tsdist["ra"] = 83.63 - tsdist["dec"] = 22.01 - tsdist["emin"] = emin - tsdist["emax"] = emax + tsdist["inmodel"] = "$CTOOLS/share/models/crab.xml" + tsdist["srcname"] = "Crab" + tsdist["outfile"] = outfile + tsdist["ntrials"] = ntrials + tsdist["caldb"] = "prod2" + tsdist["irf"] = "South_50h" + tsdist["ra"] = 83.63 + tsdist["dec"] = 22.01 + tsdist["emin"] = emin + tsdist["emax"] = emax tsdist["enumbins"] = enumbins - tsdist["tmin"] = 0 - tsdist["tmax"] = duration - tsdist["rad"] = 5.0 - tsdist["npix"] = 200 - tsdist["binsz"] = 0.05 + tsdist["tmin"] = 0 + tsdist["tmax"] = duration + tsdist["rad"] = 5.0 + tsdist["npix"] = 200 + tsdist["binsz"] = 0.05 #tsdist["debug"].boolean(True) # Optionally open the log file diff --git a/examples/pipeline_binned_disk.py b/examples/pipeline_binned_disk.py index c9f52e5..21830a5 100755 --- a/examples/pipeline_binned_disk.py +++ b/examples/pipeline_binned_disk.py @@ -132,18 +132,18 @@ def run_pipeline(obs, emin=0.1, emax=100.0, \ # Bin events for that observation bin = ctools.ctbin() - bin["inobs"] = eventfile - bin["outcube"] = cubefile - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["inobs"] = eventfile + bin["outcube"] = cubefile + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["usepnt"] = True - bin["proj"] = proj + bin["usepnt"] = True + bin["proj"] = proj bin.execute() # Set observation ID @@ -160,15 +160,15 @@ def run_pipeline(obs, emin=0.1, emax=100.0, \ # Perform maximum likelihood fitting like = ctools.ctlike() - like["inobs"] = "obs_cube.xml" - like["inmodel"] = model + like["inobs"] = "obs_cube.xml" + like["inmodel"] = model like["outmodel"] = "fit_results.xml" - like["expcube"] = "NONE" - like["psfcube"] = "NONE" - like["bkgcube"] = "NONE" - like["caldb"] = caldb - like["irf"] = irf - like["debug"] = True # Switch this always on for results in console + like["expcube"] = "NONE" + like["psfcube"] = "NONE" + like["bkgcube"] = "NONE" + like["caldb"] = caldb + like["irf"] = irf + like["debug"] = True # Switch this always on for results in console like.execute() # Return diff --git a/examples/pipeline_binned_mem.py b/examples/pipeline_binned_mem.py index 210b3c2..010f274 100755 --- a/examples/pipeline_binned_mem.py +++ b/examples/pipeline_binned_mem.py @@ -125,16 +125,16 @@ def run_pipeline(obs, emin=0.1, emax=100.0, \ # Bin events for that observation bin = ctools.ctbin(container) - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["usepnt"] = True - bin["proj"] = proj + bin["usepnt"] = True + bin["proj"] = proj bin.run() # Append result to observations diff --git a/examples/pipeline_stacked_disk.py b/examples/pipeline_stacked_disk.py index 2b7cec0..d6aa738 100755 --- a/examples/pipeline_stacked_disk.py +++ b/examples/pipeline_stacked_disk.py @@ -116,104 +116,104 @@ def run_pipeline(obs, ra=83.63, dec=22.01, emin=0.1, emax=100.0, \ """ # Simulate events sim = ctools.ctobssim(obs) - sim["debug"] = debug + sim["debug"] = debug sim["outevents"] = "obs.xml" sim.execute() # Bin events into counts map bin = ctools.ctbin() - bin["inobs"] = "obs.xml" - bin["outcube"] = "cntcube.fits" - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["inobs"] = "obs.xml" + bin["outcube"] = "cntcube.fits" + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["proj"] = proj - bin["xref"] = ra - bin["yref"] = dec - bin["debug"] = debug + bin["proj"] = proj + bin["xref"] = ra + bin["yref"] = dec + bin["debug"] = debug bin.execute() # Create exposure cube expcube = ctools.ctexpcube() - expcube["inobs"] = "obs.xml" - expcube["incube"] = "cntcube.fits" - expcube["outcube"] = "expcube.fits" - expcube["caldb"] = caldb - expcube["irf"] = irf - expcube["ebinalg"] = "LOG" - expcube["emin"] = emin - expcube["emax"] = emax + expcube["inobs"] = "obs.xml" + expcube["incube"] = "cntcube.fits" + expcube["outcube"] = "expcube.fits" + expcube["caldb"] = caldb + expcube["irf"] = irf + expcube["ebinalg"] = "LOG" + expcube["emin"] = emin + expcube["emax"] = emax expcube["enumbins"] = enumbins - expcube["nxpix"] = nxpix - expcube["nypix"] = nypix - expcube["binsz"] = binsz + expcube["nxpix"] = nxpix + expcube["nypix"] = nypix + expcube["binsz"] = binsz expcube["coordsys"] = coordsys - expcube["proj"] = proj - expcube["xref"] = ra - expcube["yref"] = dec - expcube["debug"] = debug + expcube["proj"] = proj + expcube["xref"] = ra + expcube["yref"] = dec + expcube["debug"] = debug expcube.execute() # Create PSF cube psfcube = ctools.ctpsfcube() - psfcube["inobs"] = "obs.xml" - psfcube["incube"] = "NONE" - psfcube["outcube"] = "psfcube.fits" - psfcube["caldb"] = caldb - psfcube["irf"] = irf - psfcube["ebinalg"] = "LOG" - psfcube["emin"] = emin - psfcube["emax"] = emax + psfcube["inobs"] = "obs.xml" + psfcube["incube"] = "NONE" + psfcube["outcube"] = "psfcube.fits" + psfcube["caldb"] = caldb + psfcube["irf"] = irf + psfcube["ebinalg"] = "LOG" + psfcube["emin"] = emin + psfcube["emax"] = emax psfcube["enumbins"] = enumbins - psfcube["nxpix"] = 10 - psfcube["nypix"] = 10 - psfcube["binsz"] = 1.0 + psfcube["nxpix"] = 10 + psfcube["nypix"] = 10 + psfcube["binsz"] = 1.0 psfcube["coordsys"] = coordsys - psfcube["proj"] = proj - psfcube["xref"] = ra - psfcube["yref"] = dec - psfcube["debug"] = debug + psfcube["proj"] = proj + psfcube["xref"] = ra + psfcube["yref"] = dec + psfcube["debug"] = debug psfcube.execute() # Create background cube bkgcube = ctools.ctbkgcube() - bkgcube["inobs"] = "obs.xml" - bkgcube["inmodel"] = model - bkgcube["incube"] = "cntcube.fits" - bkgcube["outcube"] = "bkgcube.fits" + bkgcube["inobs"] = "obs.xml" + bkgcube["inmodel"] = model + bkgcube["incube"] = "cntcube.fits" + bkgcube["outcube"] = "bkgcube.fits" bkgcube["outmodel"] = "model_bkg.xml" - bkgcube["caldb"] = caldb - bkgcube["irf"] = irf - bkgcube["ebinalg"] = "LOG" - bkgcube["emin"] = emin - bkgcube["emax"] = emax + bkgcube["caldb"] = caldb + bkgcube["irf"] = irf + bkgcube["ebinalg"] = "LOG" + bkgcube["emin"] = emin + bkgcube["emax"] = emax bkgcube["enumbins"] = enumbins - bkgcube["nxpix"] = 10 - bkgcube["nypix"] = 10 - bkgcube["binsz"] = 1.0 + bkgcube["nxpix"] = 10 + bkgcube["nypix"] = 10 + bkgcube["binsz"] = 1.0 bkgcube["coordsys"] = coordsys - bkgcube["proj"] = proj - bkgcube["xref"] = ra - bkgcube["yref"] = dec - bkgcube["debug"] = debug + bkgcube["proj"] = proj + bkgcube["xref"] = ra + bkgcube["yref"] = dec + bkgcube["debug"] = debug bkgcube.execute() # Perform maximum likelihood fitting like = ctools.ctlike() - like["inobs"] = "cntcube.fits" - like["inmodel"] = "model_bkg.xml" + like["inobs"] = "cntcube.fits" + like["inmodel"] = "model_bkg.xml" like["outmodel"] = "fit_results.xml" - like["expcube"] = "expcube.fits" - like["psfcube"] = "psfcube.fits" - like["bkgcube"] = "bkgcube.fits" - like["caldb"] = caldb - like["irf"] = irf - like["debug"] = True # Switch this always on for results in console + like["expcube"] = "expcube.fits" + like["psfcube"] = "psfcube.fits" + like["bkgcube"] = "bkgcube.fits" + like["caldb"] = caldb + like["irf"] = irf + like["debug"] = True # Switch this always on for results in console like.execute() # Return diff --git a/examples/pipeline_stacked_mem.py b/examples/pipeline_stacked_mem.py index 1a13f1c..c48bfa8 100755 --- a/examples/pipeline_stacked_mem.py +++ b/examples/pipeline_stacked_mem.py @@ -118,69 +118,69 @@ def run_pipeline(obs, ra=83.63, dec=22.01, emin=0.1, emax=100.0, \ # Bin events into counts map bin = ctools.ctbin(sim.obs()) - bin["ebinalg"] = "LOG" - bin["emin"] = emin - bin["emax"] = emax + bin["ebinalg"] = "LOG" + bin["emin"] = emin + bin["emax"] = emax bin["enumbins"] = enumbins - bin["nxpix"] = nxpix - bin["nypix"] = nypix - bin["binsz"] = binsz + bin["nxpix"] = nxpix + bin["nypix"] = nypix + bin["binsz"] = binsz bin["coordsys"] = coordsys - bin["proj"] = proj - bin["xref"] = ra - bin["yref"] = dec - bin["debug"] = debug + bin["proj"] = proj + bin["xref"] = ra + bin["yref"] = dec + bin["debug"] = debug bin.run() # Create exposure cube expcube = ctools.ctexpcube(sim.obs()) - expcube["incube"] = "NONE" - expcube["ebinalg"] = "LOG" - expcube["emin"] = emin - expcube["emax"] = emax + expcube["incube"] = "NONE" + expcube["ebinalg"] = "LOG" + expcube["emin"] = emin + expcube["emax"] = emax expcube["enumbins"] = enumbins - expcube["nxpix"] = nxpix - expcube["nypix"] = nypix - expcube["binsz"] = binsz + expcube["nxpix"] = nxpix + expcube["nypix"] = nypix + expcube["binsz"] = binsz expcube["coordsys"] = coordsys - expcube["proj"] = proj - expcube["xref"] = ra - expcube["yref"] = dec - expcube["debug"] = debug + expcube["proj"] = proj + expcube["xref"] = ra + expcube["yref"] = dec + expcube["debug"] = debug expcube.run() # Create PSF cube psfcube = ctools.ctpsfcube(sim.obs()) - psfcube["incube"] = "NONE" - psfcube["ebinalg"] = "LOG" - psfcube["emin"] = emin - psfcube["emax"] = emax + psfcube["incube"] = "NONE" + psfcube["ebinalg"] = "LOG" + psfcube["emin"] = emin + psfcube["emax"] = emax psfcube["enumbins"] = enumbins - psfcube["nxpix"] = 10 - psfcube["nypix"] = 10 - psfcube["binsz"] = 1.0 + psfcube["nxpix"] = 10 + psfcube["nypix"] = 10 + psfcube["binsz"] = 1.0 psfcube["coordsys"] = coordsys - psfcube["proj"] = proj - psfcube["xref"] = ra - psfcube["yref"] = dec - psfcube["debug"] = debug + psfcube["proj"] = proj + psfcube["xref"] = ra + psfcube["yref"] = dec + psfcube["debug"] = debug psfcube.run() # Create background cube bkgcube = ctools.ctbkgcube(sim.obs()) - bkgcube["incube"] = "NONE" - bkgcube["ebinalg"] = "LOG" - bkgcube["emin"] = emin - bkgcube["emax"] = emax + bkgcube["incube"] = "NONE" + bkgcube["ebinalg"] = "LOG" + bkgcube["emin"] = emin + bkgcube["emax"] = emax bkgcube["enumbins"] = enumbins - bkgcube["nxpix"] = 10 - bkgcube["nypix"] = 10 - bkgcube["binsz"] = 1.0 + bkgcube["nxpix"] = 10 + bkgcube["nypix"] = 10 + bkgcube["binsz"] = 1.0 bkgcube["coordsys"] = coordsys - bkgcube["proj"] = proj - bkgcube["xref"] = ra - bkgcube["yref"] = dec - bkgcube["debug"] = debug + bkgcube["proj"] = proj + bkgcube["xref"] = ra + bkgcube["yref"] = dec + bkgcube["debug"] = debug bkgcube.run() # Attach background model to observation container diff --git a/examples/pipeline_unbinned_disk.py b/examples/pipeline_unbinned_disk.py index fd72465..e10425d 100755 --- a/examples/pipeline_unbinned_disk.py +++ b/examples/pipeline_unbinned_disk.py @@ -118,32 +118,32 @@ def run_pipeline(obs, ra=83.63, dec=22.01, rad=3.0, \ # Simulate events sim = ctools.ctobssim(obs) - sim["debug"] = debug + sim["debug"] = debug sim["outevents"] = "obs.xml" sim.execute() # Select events select = ctools.ctselect() - select["inobs"] = "obs.xml" + select["inobs"] = "obs.xml" select["outobs"] = "obs_selected.xml" - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad - select["emin"] = emin - select["emax"] = emax - select["tmin"] = tmin - select["tmax"] = tmax - select["debug"] = debug + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad + select["emin"] = emin + select["emax"] = emax + select["tmin"] = tmin + select["tmax"] = tmax + select["debug"] = debug select.execute() # Perform maximum likelihood fitting like = ctools.ctlike() - like["inobs"] = "obs_selected.xml" - like["inmodel"] = model + like["inobs"] = "obs_selected.xml" + like["inmodel"] = model like["outmodel"] = "fit_results.xml" - like["caldb"] = caldb - like["irf"] = irf - like["debug"] = True # Switch this always on for results in console + like["caldb"] = caldb + like["irf"] = irf + like["debug"] = True # Switch this always on for results in console like.execute() # Return diff --git a/examples/pipeline_unbinned_mem.py b/examples/pipeline_unbinned_mem.py index 89fcb86..3c31df1 100755 --- a/examples/pipeline_unbinned_mem.py +++ b/examples/pipeline_unbinned_mem.py @@ -116,13 +116,13 @@ def run_pipeline(obs, ra=83.63, dec=22.01, rad=3.0, \ # Select events select = ctools.ctselect(sim.obs()) - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad - select["emin"] = emin - select["emax"] = emax - select["tmin"] = tmin - select["tmax"] = tmax + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad + select["emin"] = emin + select["emax"] = emax + select["tmin"] = tmin + select["tmax"] = tmax select["debug"] = debug select.run() diff --git a/scripts/cslightcrv.py b/scripts/cslightcrv.py index c66c23c..05d1db6 100755 --- a/scripts/cslightcrv.py +++ b/scripts/cslightcrv.py @@ -112,7 +112,6 @@ class cslightcrv(ctools.cscript): pars.append(gammalib.GApplicationPar("tmax","r","a","51544.6","","days","Lightcurve stop time [MJD]")) pars.append(gammalib.GApplicationPar("tbins","i","a","5","","","Number of time bins")) pars.append(gammalib.GApplicationPar("tbinfile","f","a","tbins.fits","","", "File defining the time binning")) - #pars.append(gammalib.GApplicationPar("binned","b","a","no","yes|no","","Use binned analysis in each time bin")) pars.append(gammalib.GApplicationPar("enumbins","i","a","0","","","Number of energy bins per light curve bin (0=unbinned)")) pars.append(gammalib.GApplicationPar("emin","r","a","0.1","","","Lower energy limit of events (TeV)")) pars.append(gammalib.GApplicationPar("emax","r","a","100.0","","","Upper energy limit of events (TeV)")) @@ -205,7 +204,6 @@ class cslightcrv(ctools.cscript): self.m_emax = self["emax"].real() # Get binning flag - #self.m_binned = self["binned"].boolean() if self.m_binned: self.m_coordsys = self["coordsys"].string() self.m_proj = self["proj"].string() @@ -214,9 +212,6 @@ class cslightcrv(ctools.cscript): self.m_nxpix = self["nxpix"].integer() self.m_nypix = self["nypix"].integer() self.m_binsz = self["binsz"].real() - #self.m_ebins = self["enumbins"].integer() - #self.m_emin = self["emin"].real() - #self.m_emax = self["emax"].real() # Read other parameters self.m_outfile = self["outfile"].filename() @@ -382,9 +377,9 @@ class cslightcrv(ctools.cscript): select["emax"] = self.m_emax select["tmin"] = tmin.convert(select.time_reference()) select["tmax"] = tmax.convert(select.time_reference()) - select["rad"] = "UNDEFINED" - select["ra"] = "UNDEFINED" - select["dec"] = "UNDEFINED" + select["rad"] = "UNDEFINED" + select["ra"] = "UNDEFINED" + select["dec"] = "UNDEFINED" select.run() # Retrieve observation @@ -399,18 +394,18 @@ class cslightcrv(ctools.cscript): # Bin events bin = ctools.ctbin(select.obs()) - bin["usepnt"] = False - bin["ebinalg"] = "LOG" - bin["xref"] = self.m_xref - bin["yref"] = self.m_yref - bin["binsz"] = self.m_binsz - bin["nxpix"] = self.m_nxpix - bin["nypix"] = self.m_nypix + bin["usepnt"] = False + bin["ebinalg"] = "LOG" + bin["xref"] = self.m_xref + bin["yref"] = self.m_yref + bin["binsz"] = self.m_binsz + bin["nxpix"] = self.m_nxpix + bin["nypix"] = self.m_nypix bin["enumbins"] = self.m_ebins - bin["emin"] = self.m_emin - bin["emax"] = self.m_emax + bin["emin"] = self.m_emin + bin["emax"] = self.m_emax bin["coordsys"] = self.m_coordsys - bin["proj"] = self.m_proj + bin["proj"] = self.m_proj bin.run() # Header @@ -419,19 +414,19 @@ class cslightcrv(ctools.cscript): # Create exposure cube expcube = ctools.ctexpcube(select.obs()) - expcube["incube"] = "NONE" - expcube["usepnt"] = False - expcube["ebinalg"] = "LOG" - expcube["xref"] = self.m_xref - expcube["yref"] = self.m_yref - expcube["binsz"] = self.m_binsz - expcube["nxpix"] = self.m_nxpix - expcube["nypix"] = self.m_nypix + expcube["incube"] = "NONE" + expcube["usepnt"] = False + expcube["ebinalg"] = "LOG" + expcube["xref"] = self.m_xref + expcube["yref"] = self.m_yref + expcube["binsz"] = self.m_binsz + expcube["nxpix"] = self.m_nxpix + expcube["nypix"] = self.m_nypix expcube["enumbins"] = self.m_ebins - expcube["emin"] = self.m_emin - expcube["emax"] = self.m_emax + expcube["emin"] = self.m_emin + expcube["emax"] = self.m_emax expcube["coordsys"] = self.m_coordsys - expcube["proj"] = self.m_proj + expcube["proj"] = self.m_proj expcube.run() # Header @@ -440,19 +435,19 @@ class cslightcrv(ctools.cscript): # Create psf cube psfcube = ctools.ctpsfcube(select.obs()) - psfcube["incube"] = "NONE" - psfcube["usepnt"] = False - psfcube["ebinalg"] = "LOG" - psfcube["xref"] = self.m_xref - psfcube["yref"] = self.m_yref - psfcube["binsz"] = self.m_binsz - psfcube["nxpix"] = self.m_nxpix - psfcube["nypix"] = self.m_nypix + psfcube["incube"] = "NONE" + psfcube["usepnt"] = False + psfcube["ebinalg"] = "LOG" + psfcube["xref"] = self.m_xref + psfcube["yref"] = self.m_yref + psfcube["binsz"] = self.m_binsz + psfcube["nxpix"] = self.m_nxpix + psfcube["nypix"] = self.m_nypix psfcube["enumbins"] = self.m_ebins - psfcube["emin"] = self.m_emin - psfcube["emax"] = self.m_emax + psfcube["emin"] = self.m_emin + psfcube["emax"] = self.m_emax psfcube["coordsys"] = self.m_coordsys - psfcube["proj"] = self.m_proj + psfcube["proj"] = self.m_proj psfcube.run() # Header @@ -461,19 +456,19 @@ class cslightcrv(ctools.cscript): # Create background cube bkgcube = ctools.ctbkgcube(select.obs()) - bkgcube["incube"] = "NONE" - bkgcube["usepnt"] = False - bkgcube["ebinalg"] = "LOG" - bkgcube["xref"] = self.m_xref - bkgcube["yref"] = self.m_yref - bkgcube["binsz"] = self.m_binsz - bkgcube["nxpix"] = self.m_nxpix - bkgcube["nypix"] = self.m_nypix + bkgcube["incube"] = "NONE" + bkgcube["usepnt"] = False + bkgcube["ebinalg"] = "LOG" + bkgcube["xref"] = self.m_xref + bkgcube["yref"] = self.m_yref + bkgcube["binsz"] = self.m_binsz + bkgcube["nxpix"] = self.m_nxpix + bkgcube["nypix"] = self.m_nypix bkgcube["enumbins"] = self.m_ebins - bkgcube["emin"] = self.m_emin - bkgcube["emax"] = self.m_emax + bkgcube["emin"] = self.m_emin + bkgcube["emax"] = self.m_emax bkgcube["coordsys"] = self.m_coordsys - bkgcube["proj"] = self.m_proj + bkgcube["proj"] = self.m_proj bkgcube.run() # Set new binned observation diff --git a/scripts/csresmap.py b/scripts/csresmap.py index 19b4221..a8be365 100755 --- a/scripts/csresmap.py +++ b/scripts/csresmap.py @@ -217,20 +217,20 @@ class csresmap(ctools.cscript): # Create countsmap bin = ctools.ctbin(self.obs) - bin["nxpix"] = self.m_nxpix - bin["nypix"] = self.m_nypix - bin["proj"] = self.m_proj + bin["nxpix"] = self.m_nxpix + bin["nypix"] = self.m_nypix + bin["proj"] = self.m_proj bin["coordsys"] = self.m_coordsys - bin["xref"] = self.m_xref - bin["yref"] = self.m_yref + bin["xref"] = self.m_xref + bin["yref"] = self.m_yref bin["enumbins"] = self.m_enumbins - bin["ebinalg"] = self.m_ebinalg - bin["emin"] = self.m_emin - bin["emax"] = self.m_emax - bin["binsz"] = self.m_binsz - bin["chatter"] = self.m_chatter - bin["clobber"] = self.m_clobber - bin["debug"] = self.m_debug + bin["ebinalg"] = self.m_ebinalg + bin["emin"] = self.m_emin + bin["emax"] = self.m_emax + bin["binsz"] = self.m_binsz + bin["chatter"] = self.m_chatter + bin["clobber"] = self.m_clobber + bin["debug"] = self.m_debug bin.run() # Store counts map as residual map. Note that we need a @@ -252,7 +252,7 @@ class csresmap(ctools.cscript): model.cube(bin.cube()) model["chatter"] = self.m_chatter model["clobber"] = self.m_clobber - model["debug"] = self.m_debug + model["debug"] = self.m_debug model.run() # Get model map into GSkymap object diff --git a/scripts/csspec.py b/scripts/csspec.py index 163afdb..796ad9b 100755 --- a/scripts/csspec.py +++ b/scripts/csspec.py @@ -326,9 +326,9 @@ class csspec(ctools.cscript): select["emax"] = emax.TeV() select["tmin"] = "UNDEFINED" select["tmax"] = "UNDEFINED" - select["rad"] = "UNDEFINED" - select["ra"] = "UNDEFINED" - select["dec"] = "UNDEFINED" + select["rad"] = "UNDEFINED" + select["ra"] = "UNDEFINED" + select["dec"] = "UNDEFINED" select.run() # Retrieve observation @@ -343,18 +343,18 @@ class csspec(ctools.cscript): # Bin events bin = ctools.ctbin(select.obs()) - bin["usepnt"] = False - bin["ebinalg"] = "LOG" - bin["xref"] = self.m_xref - bin["yref"] = self.m_yref - bin["binsz"] = self.m_binsz - bin["nxpix"] = self.m_nxpix - bin["nypix"] = self.m_nypix + bin["usepnt"] = False + bin["ebinalg"] = "LOG" + bin["xref"] = self.m_xref + bin["yref"] = self.m_yref + bin["binsz"] = self.m_binsz + bin["nxpix"] = self.m_nxpix + bin["nypix"] = self.m_nypix bin["enumbins"] = self.m_ebins - bin["emin"] = emin.TeV() - bin["emax"] = emax.TeV() + bin["emin"] = emin.TeV() + bin["emax"] = emax.TeV() bin["coordsys"] = self.m_coordsys - bin["proj"] = self.m_proj + bin["proj"] = self.m_proj bin.run() # Header @@ -363,19 +363,19 @@ class csspec(ctools.cscript): # Create exposure cube expcube = ctools.ctexpcube(select.obs()) - expcube["incube"] = "NONE" - expcube["usepnt"] = False - expcube["ebinalg"] = "LOG" - expcube["xref"] = self.m_xref - expcube["yref"] = self.m_yref - expcube["binsz"] = self.m_binsz - expcube["nxpix"] = self.m_nxpix - expcube["nypix"] = self.m_nypix + expcube["incube"] = "NONE" + expcube["usepnt"] = False + expcube["ebinalg"] = "LOG" + expcube["xref"] = self.m_xref + expcube["yref"] = self.m_yref + expcube["binsz"] = self.m_binsz + expcube["nxpix"] = self.m_nxpix + expcube["nypix"] = self.m_nypix expcube["enumbins"] = self.m_ebins - expcube["emin"] = emin.TeV() - expcube["emax"] = emax.TeV() + expcube["emin"] = emin.TeV() + expcube["emax"] = emax.TeV() expcube["coordsys"] = self.m_coordsys - expcube["proj"] = self.m_proj + expcube["proj"] = self.m_proj expcube.run() # Header @@ -384,19 +384,19 @@ class csspec(ctools.cscript): # Create psf cube psfcube = ctools.ctpsfcube(select.obs()) - psfcube["incube"] = "NONE" - psfcube["usepnt"] = False - psfcube["ebinalg"] = "LOG" - psfcube["xref"] = self.m_xref - psfcube["yref"] = self.m_yref - psfcube["binsz"] = self.m_binsz - psfcube["nxpix"] = self.m_nxpix - psfcube["nypix"] = self.m_nypix + psfcube["incube"] = "NONE" + psfcube["usepnt"] = False + psfcube["ebinalg"] = "LOG" + psfcube["xref"] = self.m_xref + psfcube["yref"] = self.m_yref + psfcube["binsz"] = self.m_binsz + psfcube["nxpix"] = self.m_nxpix + psfcube["nypix"] = self.m_nypix psfcube["enumbins"] = self.m_ebins - psfcube["emin"] = emin.TeV() - psfcube["emax"] = emax.TeV() + psfcube["emin"] = emin.TeV() + psfcube["emax"] = emax.TeV() psfcube["coordsys"] = self.m_coordsys - psfcube["proj"] = self.m_proj + psfcube["proj"] = self.m_proj psfcube.run() # Header @@ -405,19 +405,19 @@ class csspec(ctools.cscript): # Create background cube bkgcube = ctools.ctbkgcube(select.obs()) - bkgcube["incube"] = "NONE" - bkgcube["usepnt"] = False - bkgcube["ebinalg"] = "LOG" - bkgcube["xref"] = self.m_xref - bkgcube["yref"] = self.m_yref - bkgcube["binsz"] = self.m_binsz - bkgcube["nxpix"] = self.m_nxpix - bkgcube["nypix"] = self.m_nypix + bkgcube["incube"] = "NONE" + bkgcube["usepnt"] = False + bkgcube["ebinalg"] = "LOG" + bkgcube["xref"] = self.m_xref + bkgcube["yref"] = self.m_yref + bkgcube["binsz"] = self.m_binsz + bkgcube["nxpix"] = self.m_nxpix + bkgcube["nypix"] = self.m_nypix bkgcube["enumbins"] = self.m_ebins - bkgcube["emin"] = emin.TeV() - bkgcube["emax"] = emax.TeV() + bkgcube["emin"] = emin.TeV() + bkgcube["emax"] = emax.TeV() bkgcube["coordsys"] = self.m_coordsys - bkgcube["proj"] = self.m_proj + bkgcube["proj"] = self.m_proj bkgcube.run() # Set new binned observation diff --git a/test/test_ctbin.py b/test/test_ctbin.py index 91c8999..b6c1161 100755 --- a/test/test_ctbin.py +++ b/test/test_ctbin.py @@ -64,19 +64,19 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctbin bin = ctools.ctbin() - bin["inobs"] = self.events_name - bin["outcube"] = "cntmap.fits" - bin["ebinalg"] = "LOG" - bin["emin"] = 0.1 - bin["emax"] = 100.0 + bin["inobs"] = self.events_name + bin["outcube"] = "cntmap.fits" + bin["ebinalg"] = "LOG" + bin["emin"] = 0.1 + bin["emax"] = 100.0 bin["enumbins"] = 20 - bin["nxpix"] = 200 - bin["nypix"] = 200 - bin["binsz"] = 0.02 + bin["nxpix"] = 200 + bin["nypix"] = 200 + bin["binsz"] = 0.02 bin["coordsys"] = "CEL" - bin["proj"] = "CAR" - bin["xref"] = 83.63 - bin["yref"] = 22.01 + bin["proj"] = "CAR" + bin["xref"] = 83.63 + bin["yref"] = 22.01 # Run tool self.test_try("Run ctbin") diff --git a/test/test_ctbkgcube.py b/test/test_ctbkgcube.py index 3957ae1..bb52469 100755 --- a/test/test_ctbkgcube.py +++ b/test/test_ctbkgcube.py @@ -67,24 +67,24 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctbkgcube bkgcube = ctools.ctbkgcube() - bkgcube["inobs"] = self.events_name - bkgcube["inmodel"] = self.bkg_model - bkgcube["incube"] = "NONE" - bkgcube["outcube"] = "bkgcube.fits" + bkgcube["inobs"] = self.events_name + bkgcube["inmodel"] = self.bkg_model + bkgcube["incube"] = "NONE" + bkgcube["outcube"] = "bkgcube.fits" bkgcube["outmodel"] = "bkgcube.xml" - bkgcube["caldb"] = self.caldb - bkgcube["irf"] = self.irf - bkgcube["ebinalg"] = "LOG" - bkgcube["emin"] = 0.1 - bkgcube["emax"] = 100 + bkgcube["caldb"] = self.caldb + bkgcube["irf"] = self.irf + bkgcube["ebinalg"] = "LOG" + bkgcube["emin"] = 0.1 + bkgcube["emax"] = 100 bkgcube["enumbins"] = 20 - bkgcube["nxpix"] = 10 - bkgcube["nypix"] = 10 - bkgcube["binsz"] = 0.4 + bkgcube["nxpix"] = 10 + bkgcube["nypix"] = 10 + bkgcube["binsz"] = 0.4 bkgcube["coordsys"] = "CEL" - bkgcube["proj"] = "CAR" - bkgcube["xref"] = 83.63 - bkgcube["yref"] = 22.01 + bkgcube["proj"] = "CAR" + bkgcube["xref"] = 83.63 + bkgcube["yref"] = 22.01 # Run tool self.test_try("Run ctbkgcube") diff --git a/test/test_ctbutterfly.py b/test/test_ctbutterfly.py index 1dfeeec..4fde8f6 100755 --- a/test/test_ctbutterfly.py +++ b/test/test_ctbutterfly.py @@ -67,13 +67,13 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctbutterfly butterfly = ctools.ctbutterfly() - butterfly["inobs"] = self.events_name + butterfly["inobs"] = self.events_name butterfly["inmodel"] = self.model_name butterfly["srcname"] = "Crab" - butterfly["caldb"] = self.caldb - butterfly["irf"] = self.irf - butterfly["emin"] = 0.1 - butterfly["emax"] = 100 + butterfly["caldb"] = self.caldb + butterfly["irf"] = self.irf + butterfly["emin"] = 0.1 + butterfly["emax"] = 100 butterfly["outfile"] = "butterfly.txt" # Run tool diff --git a/test/test_ctcubemask.py b/test/test_ctcubemask.py index acd3166..8d2179f 100755 --- a/test/test_ctcubemask.py +++ b/test/test_ctcubemask.py @@ -65,14 +65,14 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctcubemask mask = ctools.ctcubemask() - mask["inobs"] = self.cntmap_name + mask["inobs"] = self.cntmap_name mask["regfile"] = self.regfile mask["outcube"] = "filtered_cntmap.fits" - mask["ra"] = 83.63 - mask["dec"] = 22.01 - mask["rad"] = 2.0 - mask["emin"] = 0.1 - mask["emax"] = 100 + mask["ra"] = 83.63 + mask["dec"] = 22.01 + mask["rad"] = 2.0 + mask["emin"] = 0.1 + mask["emax"] = 100 # Run tool self.test_try("Run ctcubemask") diff --git a/test/test_cterror.py b/test/test_cterror.py index b6a62fa..a9aaaa6 100755 --- a/test/test_cterror.py +++ b/test/test_cterror.py @@ -68,12 +68,12 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up cterror error = ctools.cterror() - error["inobs"].filename(self.events_name) - error["inmodel"].filename(self.model_name) - error["outmodel"].filename(self.result_name) - error["srcname"].string("Crab") - error["caldb"].string(self.caldb) - error["irf"].string(self.irf) + error["inobs"] = self.events_name + error["inmodel"] = self.model_name + error["outmodel"] = self.result_name + error["srcname"] = "Crab" + error["caldb"] = self.caldb + error["irf"] = self.irf # Run tool self.test_try("Run cterror") diff --git a/test/test_ctexpcube.py b/test/test_ctexpcube.py index e971bbe..df5cb23 100755 --- a/test/test_ctexpcube.py +++ b/test/test_ctexpcube.py @@ -66,22 +66,22 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctexpcube expcube = ctools.ctexpcube() - expcube["inobs"] = self.events_name - expcube["incube"] = "NONE" - expcube["outcube"] = "expcube.fits" - expcube["caldb"] = self.caldb - expcube["irf"] = self.irf - expcube["ebinalg"] = "LOG" - expcube["emin"] = 0.1 - expcube["emax"] = 100 + expcube["inobs"] = self.events_name + expcube["incube"] = "NONE" + expcube["outcube"] = "expcube.fits" + expcube["caldb"] = self.caldb + expcube["irf"] = self.irf + expcube["ebinalg"] = "LOG" + expcube["emin"] = 0.1 + expcube["emax"] = 100 expcube["enumbins"] = 20 - expcube["nxpix"] = 200 - expcube["nypix"] = 200 - expcube["binsz"] = 0.02 + expcube["nxpix"] = 200 + expcube["nypix"] = 200 + expcube["binsz"] = 0.02 expcube["coordsys"] = "CEL" - expcube["proj"] = "CAR" - expcube["xref"] = 83.63 - expcube["yref"] = 22.01 + expcube["proj"] = "CAR" + expcube["xref"] = 83.63 + expcube["yref"] = 22.01 # Run tool self.test_try("Run ctexpcube") diff --git a/test/test_ctlike.py b/test/test_ctlike.py index 8618380..bc6b26b 100755 --- a/test/test_ctlike.py +++ b/test/test_ctlike.py @@ -67,11 +67,11 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctlike like = ctools.ctlike() - like["inobs"].filename(self.events_name) - like["inmodel"].filename(self.model_name) - like["caldb"].string(self.caldb) - like["irf"].string(self.irf) - like["outmodel"].filename("result.xml") + like["inobs"] = self.events_name + like["inmodel"] = self.model_name + like["caldb"] = self.caldb + like["irf"] = self.irf + like["outmodel"] = "result.xml" # Run tool self.test_try("Run ctlike") diff --git a/test/test_ctmodel.py b/test/test_ctmodel.py index d52e20f..8e7946c 100755 --- a/test/test_ctmodel.py +++ b/test/test_ctmodel.py @@ -66,30 +66,30 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctmodel from scratch model = ctools.ctmodel() - model["incube"] = "NONE" - model["outcube"] = "modmap.fits" - model["inmodel"] = self.model_name - model["inobs"] = "NONE" - model["expcube"] = "NONE" - model["psfcube"] = "NONE" - model["bkgcube"] = "NONE" - model["caldb"] = self.caldb - model["irf"] = self.irf - model["rad"] = 5 - model["ra"] = 83.63 - model["dec"] = 22.01 - model["tmin"] = 0 - model["tmax"] = 1800 - model["emin"] = 0.1 - model["emax"] = 100 + model["incube"] = "NONE" + model["outcube"] = "modmap.fits" + model["inmodel"] = self.model_name + model["inobs"] = "NONE" + model["expcube"] = "NONE" + model["psfcube"] = "NONE" + model["bkgcube"] = "NONE" + model["caldb"] = self.caldb + model["irf"] = self.irf + model["rad"] = 5 + model["ra"] = 83.63 + model["dec"] = 22.01 + model["tmin"] = 0 + model["tmax"] = 1800 + model["emin"] = 0.1 + model["emax"] = 100 model["enumbins"] = 20 - model["nxpix"] = 200 - model["nypix"] = 200 - model["binsz"] = 0.02 + model["nxpix"] = 200 + model["nypix"] = 200 + model["binsz"] = 0.02 model["coordsys"] = "CEL" - model["proj"] = "CAR" - model["xref"] = 83.63 - model["yref"] = 22.01 + model["proj"] = "CAR" + model["xref"] = 83.63 + model["yref"] = 22.01 # Run tool self.test_try("Run ctmodel") diff --git a/test/test_ctobssim.py b/test/test_ctobssim.py index 3f06801..a30917e 100755 --- a/test/test_ctobssim.py +++ b/test/test_ctobssim.py @@ -67,17 +67,17 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctobssim sim = ctools.ctobssim() - sim["inmodel"] = self.model_name + sim["inmodel"] = self.model_name sim["outevents"] = "events.fits" - sim["caldb"] = self.caldb - sim["irf"] = self.irf - sim["ra"] = 83.63 - sim["dec"] = 22.01 - sim["rad"] = 10.0 - sim["tmin"] = 0.0 - sim["tmax"] = 1800.0 - sim["emin"] = 0.1 - sim["emax"] = 100.0 + sim["caldb"] = self.caldb + sim["irf"] = self.irf + sim["ra"] = 83.63 + sim["dec"] = 22.01 + sim["rad"] = 10.0 + sim["tmin"] = 0.0 + sim["tmax"] = 1800.0 + sim["emin"] = 0.1 + sim["emax"] = 100.0 # Run tool self.test_try("Run ctobssim") @@ -118,7 +118,7 @@ class Test(gammalib.GPythonTestSuite): # Set-up ctobssim sim = ctools.ctobssim(obs) sim["outevents"] = "sim_events.xml" - sim["inmodel"] = self.model_name + sim["inmodel"] = self.model_name # Run tool self.test_try("Run ctobssim") try: diff --git a/test/test_ctpsfcube.py b/test/test_ctpsfcube.py index 5f08b72..07375aa 100755 --- a/test/test_ctpsfcube.py +++ b/test/test_ctpsfcube.py @@ -66,23 +66,23 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctpsfcube psfcube = ctools.ctpsfcube() - psfcube["inobs"] = self.events_name - psfcube["incube"] = "NONE" - psfcube["outcube"] = "psfcube.fits" - psfcube["caldb"] = self.caldb - psfcube["irf"] = self.irf - psfcube["ebinalg"] = "LOG" - psfcube["emin"] = 0.1 - psfcube["emax"] = 100 + psfcube["inobs"] = self.events_name + psfcube["incube"] = "NONE" + psfcube["outcube"] = "psfcube.fits" + psfcube["caldb"] = self.caldb + psfcube["irf"] = self.irf + psfcube["ebinalg"] = "LOG" + psfcube["emin"] = 0.1 + psfcube["emax"] = 100 psfcube["enumbins"] = 20 - psfcube["nxpix"] = 10 - psfcube["nypix"] = 10 - psfcube["binsz"] = 0.4 + psfcube["nxpix"] = 10 + psfcube["nypix"] = 10 + psfcube["binsz"] = 0.4 psfcube["coordsys"] = "CEL" - psfcube["proj"] = "CAR" - psfcube["xref"] = 83.63 - psfcube["yref"] = 22.01 - psfcube["amax"] = 0.3 + psfcube["proj"] = "CAR" + psfcube["xref"] = 83.63 + psfcube["yref"] = 22.01 + psfcube["amax"] = 0.3 psfcube["anumbins"] = 10 # Run tool diff --git a/test/test_ctselect.py b/test/test_ctselect.py index 962948a..f1f57cc 100755 --- a/test/test_ctselect.py +++ b/test/test_ctselect.py @@ -64,15 +64,15 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctselect select = ctools.ctselect() - select["inobs"] = self.events_name + select["inobs"] = self.events_name select["outobs"] = "selected_events.fits" - select["ra"] = 83.63 - select["dec"] = 22.01 - select["rad"] = 3 - select["tmin"] = 0 - select["tmax"] = 1800 - select["emin"] = 0.1 - select["emax"] = 100 + select["ra"] = 83.63 + select["dec"] = 22.01 + select["rad"] = 3 + select["tmin"] = 0 + select["tmax"] = 1800 + select["emin"] = 0.1 + select["emax"] = 100 # Run tool self.test_try("Run ctselect") diff --git a/test/test_ctskymap.py b/test/test_ctskymap.py index d368dd4..811270c 100755 --- a/test/test_ctskymap.py +++ b/test/test_ctskymap.py @@ -64,17 +64,17 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up ctskymap skymap = ctools.ctskymap() - skymap["inobs"] = self.events_name - skymap["outmap"] = "skymap.fits" - skymap["emin"] = 0.1 - skymap["emax"] = 100 - skymap["nxpix"] = 200 - skymap["nypix"] = 200 - skymap["binsz"] = 0.02 + skymap["inobs"] = self.events_name + skymap["outmap"] = "skymap.fits" + skymap["emin"] = 0.1 + skymap["emax"] = 100 + skymap["nxpix"] = 200 + skymap["nypix"] = 200 + skymap["binsz"] = 0.02 skymap["coordsys"] = "CEL" - skymap["proj"] = "CAR" - skymap["xref"] = 83.63 - skymap["yref"] = 22.01 + skymap["proj"] = "CAR" + skymap["xref"] = 83.63 + skymap["yref"] = 22.01 # Run tool self.test_try("Run ctskymap") diff --git a/test/test_cttsmap.py b/test/test_cttsmap.py index 27ffa68..a6382ec 100755 --- a/test/test_cttsmap.py +++ b/test/test_cttsmap.py @@ -63,23 +63,23 @@ class Test(gammalib.GPythonTestSuite): # Test cttsmap functionnality def test_functional(self): """ - Test cttsmap functionnality. + Test cttsmap functionality. """ # Set-up cttsmap tsmap = ctools.cttsmap() - tsmap["inobs"] = self.events_name - tsmap["inmodel"] = self.model_name - tsmap["srcname"] = "Crab" - tsmap["caldb"] = self.caldb - tsmap["irf"] = self.irf - tsmap["outmap"] = "tsmap.fits" - tsmap["nxpix"] = 5 - tsmap["nypix"] = 5 - tsmap["binsz"] = 0.02 + tsmap["inobs"] = self.events_name + tsmap["inmodel"] = self.model_name + tsmap["srcname"] = "Crab" + tsmap["caldb"] = self.caldb + tsmap["irf"] = self.irf + tsmap["outmap"] = "tsmap.fits" + tsmap["nxpix"] = 5 + tsmap["nypix"] = 5 + tsmap["binsz"] = 0.02 tsmap["coordsys"] = "CEL" - tsmap["proj"] = "CAR" - tsmap["xref"] = 83.63 - tsmap["yref"] = 22.01 + tsmap["proj"] = "CAR" + tsmap["xref"] = 83.63 + tsmap["yref"] = 22.01 # Run tool self.test_try("Run cttsmap") diff --git a/test/test_ctulimit.py b/test/test_ctulimit.py index 6f0db63..0684637 100755 --- a/test/test_ctulimit.py +++ b/test/test_ctulimit.py @@ -67,11 +67,11 @@ class Test(gammalib.GPythonTestSuite): """ # Set-up cttsmap ulimit = ctools.ctulimit() - ulimit["inobs"].filename(self.events_name) - ulimit["inmodel"].filename(self.model_name) - ulimit["srcname"].string("Crab") - ulimit["caldb"].string(self.caldb) - ulimit["irf"].string(self.irf) + ulimit["inobs"] = self.events_name + ulimit["inmodel"] = self.model_name + ulimit["srcname"] = "Crab" + ulimit["caldb"] = self.caldb + ulimit["irf"] = self.irf # Run tool self.test_try("Run ctulimit") diff --git a/test/test_pipelines.py b/test/test_pipelines.py index ce979b6..914c2c1 100755 --- a/test/test_pipelines.py +++ b/test/test_pipelines.py @@ -78,17 +78,17 @@ class Test(gammalib.GPythonTestSuite): # Simulate events sim = ctools.ctobssim() - sim["inmodel"] = model_name + sim["inmodel"] = model_name sim["outevents"] = events_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax self.test_try("Execute ctobssim") try: sim.execute() @@ -98,15 +98,15 @@ class Test(gammalib.GPythonTestSuite): # Select events select = ctools.ctselect() - select["inobs"] = events_name + select["inobs"] = events_name select["outobs"] = selected_events_name - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad_select - select["tmin"] = tstart - select["tmax"] = tstop - select["emin"] = emin - select["emax"] = emax + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad_select + select["tmin"] = tstart + select["tmax"] = tstop + select["emin"] = emin + select["emax"] = emax self.test_try("Execute ctselect") try: select.execute() @@ -116,11 +116,11 @@ class Test(gammalib.GPythonTestSuite): # Perform maximum likelihood fitting like = ctools.ctlike() - like["inobs"] = selected_events_name - like["inmodel"] = model_name + like["inobs"] = selected_events_name + like["inmodel"] = model_name like["outmodel"] = result_name - like["caldb"] = caldb - like["irf"] = irf + like["caldb"] = caldb + like["irf"] = irf self.test_try("Execute ctlike") try: like.execute() @@ -150,15 +150,15 @@ class Test(gammalib.GPythonTestSuite): # Simulate events sim = ctools.ctobssim() sim["inmodel"] = model_name - sim["caldb"] = caldb - sim["irf"] = irf - sim["ra"] = ra - sim["dec"] = dec - sim["rad"] = rad_sim - sim["tmin"] = tstart - sim["tmax"] = tstop - sim["emin"] = emin - sim["emax"] = emax + sim["caldb"] = caldb + sim["irf"] = irf + sim["ra"] = ra + sim["dec"] = dec + sim["rad"] = rad_sim + sim["tmin"] = tstart + sim["tmax"] = tstop + sim["emin"] = emin + sim["emax"] = emax self.test_try("Run ctobssim") try: sim.run() @@ -168,9 +168,9 @@ class Test(gammalib.GPythonTestSuite): # Select events select = ctools.ctselect(sim.obs()) - select["ra"] = ra - select["dec"] = dec - select["rad"] = rad_select + select["ra"] = ra + select["dec"] = dec + select["rad"] = rad_select select["tmin"] = tstart select["tmax"] = tstop select["emin"] = emin -- libgit2 0.21.4