diff --git a/ChangeLog b/ChangeLog index 42b2036..4c9472c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ -2013-12-13 Juergen Knoedlseder +2014-01-08 Juergen Knoedlseder * Version 0.7.0 released ======================== Adapt to GammaLib-00-08-00 interface ctobssim now only simulates events within ROI and supports - all kinds of data space models + all kinds of data space models; time slice durations are + determined based on source flux ctbin now implements LIN and FILE binning algorithms ctbin, ctskymap and ctmodel now generate maps with increasing longitude to the left diff --git a/NEWS b/NEWS index b467940..1f15dc4 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ New Features and Important Changes in ctools 00-07-00 Author(s) : Juergen Knoedlseder -13 December 2013 +8 January 2014 1. Introduction @@ -37,6 +37,11 @@ ctobssim now supports any kind of data space model for background simulations, using the abstract mc() method that is now available in the GModelData base class. +The time slice duration is now computed from the source flux and +set so that no more than 1000000 photons will be simulated in a +given slice. This limits the memory requirements during simulations +to about 100 MB, yet saving may still need more memory. + 5. ctselect - CTA event selection --------------------------------- diff --git a/scripts/cspull.py b/scripts/cspull.py index c5a4fd8..cf61755 100755 --- a/scripts/cspull.py +++ b/scripts/cspull.py @@ -87,28 +87,28 @@ class cspull(GApplication): parfile = self.name+".par" try: - pars = GPars(parfile) + pars = GApplicationPars(parfile) except: # Signal if parfile was not found sys.stdout.write("Parfile "+parfile+" not found. Create default parfile.\n") # Create default parfile - pars = GPars() - pars.append(GPar("srcmdl","f","a","$GAMMALIB/share/models/crab.xml","","","Source model")) - pars.append(GPar("outfile","f","a","pull.dat","","","Output file name")) - pars.append(GPar("ntrials","i","a","10","","","Number of trials")) - pars.append(GPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) - pars.append(GPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) - pars.append(GPar("ra","r","a","83.6331","0","360","RA of pointing (deg)")) - pars.append(GPar("dec","r","a","22.0145","-90","90","Dec of pointing (deg)")) - pars.append(GPar("emin","r","a","0.1","0.0","","Lower energy limit (TeV)")) - pars.append(GPar("emax","r","a","100.0","0.0","","Upper energy limit (TeV)")) - pars.append(GPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)")) - pars.append(GPar("duration","r","a","180000.0","","","Effective exposure time (s)")) - pars.append(GPar("deadc","r","h","0.95","","","Deadtime correction factor")) - pars.append(GPar("rad","r","h","5.0","","","Radius of ROI (deg)")) - pars.append(GPar("npix","i","h","200","","","Number of pixels for binned")) - pars.append(GPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) + pars = GApplicationPars() + pars.append(GApplicationPar("srcmdl","f","a","$GAMMALIB/share/models/crab.xml","","","Source model")) + pars.append(GApplicationPar("outfile","f","a","pull.dat","","","Output file name")) + pars.append(GApplicationPar("ntrials","i","a","10","","","Number of trials")) + pars.append(GApplicationPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) + pars.append(GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) + pars.append(GApplicationPar("ra","r","a","83.6331","0","360","RA of pointing (deg)")) + pars.append(GApplicationPar("dec","r","a","22.0145","-90","90","Dec of pointing (deg)")) + pars.append(GApplicationPar("emin","r","a","0.1","0.0","","Lower energy limit (TeV)")) + pars.append(GApplicationPar("emax","r","a","100.0","0.0","","Upper energy limit (TeV)")) + pars.append(GApplicationPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)")) + pars.append(GApplicationPar("duration","r","a","180000.0","","","Effective exposure time (s)")) + pars.append(GApplicationPar("deadc","r","h","0.95","","","Deadtime correction factor")) + pars.append(GApplicationPar("rad","r","h","5.0","","","Radius of ROI (deg)")) + pars.append(GApplicationPar("npix","i","h","200","","","Number of pixels for binned")) + pars.append(GApplicationPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) pars.append_standard() pars.save(parfile) diff --git a/scripts/cssens.py b/scripts/cssens.py index dcbc87d..725bf50 100755 --- a/scripts/cssens.py +++ b/scripts/cssens.py @@ -98,31 +98,31 @@ class cssens(GApplication): parfile = self.name+".par" try: - pars = GPars(parfile) + pars = GApplicationPars(parfile) except: # Signal if parfile was not found sys.stdout.write("Parfile "+parfile+" not found. Create default parfile.\n") # Create default parfile - pars = GPars() - pars.append(GPar("outfile","f","h","sensitivity.dat","","","Output file name")) - pars.append(GPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) - pars.append(GPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) - pars.append(GPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) - pars.append(GPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) - pars.append(GPar("bkg","s","a","$GAMMALIB/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)")) - pars.append(GPar("duration","r","a","180000.0","","","Effective exposure time (s)")) - pars.append(GPar("rad","r","a","5.0","","","Radius of ROI (deg)")) - pars.append(GPar("enumbins","i","h","0","","","Number of energy bins (0=unbinned)")) - pars.append(GPar("npix","i","h","200","","","Number of pixels for binned")) - pars.append(GPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) - pars.append(GPar("sigma","r","h","5.0","","","Significance threshold")) - pars.append(GPar("ts_use","b","h","yes","","","Use TS?")) - pars.append(GPar("index","r","h","-2.48","","","Assumed spectral index")) - pars.append(GPar("radius","r","h","0.1","","","Extended source model radius")) - pars.append(GPar("width","r","h","0.05","","","Extended source model width")) - pars.append(GPar("max_iter","i","h","50","","","Maximum number of iterations")) - pars.append(GPar("num_avg","i","h","3","","","Number of iterations for sliding average")) + pars = GApplicationPars() + pars.append(GApplicationPar("outfile","f","h","sensitivity.dat","","","Output file name")) + pars.append(GApplicationPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) + pars.append(GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) + pars.append(GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) + pars.append(GApplicationPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) + pars.append(GApplicationPar("bkg","s","a","$GAMMALIB/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)")) + pars.append(GApplicationPar("duration","r","a","180000.0","","","Effective exposure time (s)")) + pars.append(GApplicationPar("rad","r","a","5.0","","","Radius of ROI (deg)")) + pars.append(GApplicationPar("enumbins","i","h","0","","","Number of energy bins (0=unbinned)")) + pars.append(GApplicationPar("npix","i","h","200","","","Number of pixels for binned")) + pars.append(GApplicationPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) + pars.append(GApplicationPar("sigma","r","h","5.0","","","Significance threshold")) + pars.append(GApplicationPar("ts_use","b","h","yes","","","Use TS?")) + pars.append(GApplicationPar("index","r","h","-2.48","","","Assumed spectral index")) + pars.append(GApplicationPar("radius","r","h","0.1","","","Extended source model radius")) + pars.append(GApplicationPar("width","r","h","0.05","","","Extended source model width")) + pars.append(GApplicationPar("max_iter","i","h","50","","","Maximum number of iterations")) + pars.append(GApplicationPar("num_avg","i","h","3","","","Number of iterations for sliding average")) pars.append_standard() pars.save(parfile) diff --git a/scripts/cstsdist.py b/scripts/cstsdist.py index 8cc2cea..c5a0c36 100755 --- a/scripts/cstsdist.py +++ b/scripts/cstsdist.py @@ -88,28 +88,28 @@ class cstsdist(GApplication): parfile = self.name+".par" try: - pars = GPars(parfile) + pars = GApplicationPars(parfile) except: # Signal if parfile was not found sys.stdout.write("Parfile "+parfile+" not found. Create default parfile.\n") # Create default parfile - pars = GPars() - pars.append(GPar("outfile","f","h","ts.dat","","","Output file name")) - pars.append(GPar("ntrials","i","a","10","","","Number of trials")) - pars.append(GPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) - pars.append(GPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) - pars.append(GPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) - pars.append(GPar("index","r","h","-2.48","","","Spectral index")) - pars.append(GPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) - pars.append(GPar("bkg","s","a","$GAMMALIB/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)")) - pars.append(GPar("emin","r","a","0.1","0.0","","Lower energy limit (TeV)")) - pars.append(GPar("emax","r","a","100.0","0.0","","Upper energy limit (TeV)")) - pars.append(GPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)")) - pars.append(GPar("duration","r","a","180000.0","","","Effective exposure time (s)")) - pars.append(GPar("rad","r","h","5.0","","","Radius of ROI (deg)")) - pars.append(GPar("npix","i","h","200","","","Number of pixels for binned")) - pars.append(GPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) + pars = GApplicationPars() + pars.append(GApplicationPar("outfile","f","h","ts.dat","","","Output file name")) + pars.append(GApplicationPar("ntrials","i","a","10","","","Number of trials")) + pars.append(GApplicationPar("caldb","s","a","$GAMMALIB/share/caldb/cta","","","Calibration database")) + pars.append(GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) + pars.append(GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) + pars.append(GApplicationPar("index","r","h","-2.48","","","Spectral index")) + pars.append(GApplicationPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) + pars.append(GApplicationPar("bkg","s","a","$GAMMALIB/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)")) + pars.append(GApplicationPar("emin","r","a","0.1","0.0","","Lower energy limit (TeV)")) + pars.append(GApplicationPar("emax","r","a","100.0","0.0","","Upper energy limit (TeV)")) + pars.append(GApplicationPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)")) + pars.append(GApplicationPar("duration","r","a","180000.0","","","Effective exposure time (s)")) + pars.append(GApplicationPar("rad","r","h","5.0","","","Radius of ROI (deg)")) + pars.append(GApplicationPar("npix","i","h","200","","","Number of pixels for binned")) + pars.append(GApplicationPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) pars.append_standard() pars.save(parfile)