Commit 86d4c0732348078a9658996d6b0e935738d6b516

Authored by Jürgen Knödlseder
1 parent 12d0bd2b

Modify parameter limits to comply with GammaLib parameter range checking

scripts/cspull.py
@@ -109,8 +109,8 @@ class cspull(ctools.cscript): @@ -109,8 +109,8 @@ class cspull(ctools.cscript):
109 pars.append(gammalib.GApplicationPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)")) 109 pars.append(gammalib.GApplicationPar("enumbins","i","a","0","","","Number of energy bins (0=unbinned)"))
110 pars.append(gammalib.GApplicationPar("npix","i","h","200","","","Number of pixels for binned")) 110 pars.append(gammalib.GApplicationPar("npix","i","h","200","","","Number of pixels for binned"))
111 pars.append(gammalib.GApplicationPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)")) 111 pars.append(gammalib.GApplicationPar("binsz","r","h","0.05","","","Pixel size for binned (deg/pixel)"))
112 - pars.append(gammalib.GApplicationPar("deadc","r","h","0.95","","","Deadtime correction factor"))  
113 - pars.append(gammalib.GApplicationPar("rad","r","h","5.0","","","Radius of ROI (deg)")) 112 + pars.append(gammalib.GApplicationPar("deadc","r","h","0.95","0","1","Deadtime correction factor"))
  113 + pars.append(gammalib.GApplicationPar("rad","r","h","5.0","0","180","Radius of ROI (deg)"))
114 pars.append(gammalib.GApplicationPar("pattern","s","h","single","","","Observation pattern (single/four)")) 114 pars.append(gammalib.GApplicationPar("pattern","s","h","single","","","Observation pattern (single/four)"))
115 pars.append(gammalib.GApplicationPar("offset","r","h","1.5","","","Observation pattern offset (deg)")) 115 pars.append(gammalib.GApplicationPar("offset","r","h","1.5","","","Observation pattern offset (deg)"))
116 pars.append(gammalib.GApplicationPar("ntrials","i","a","10","","","Number of trials")) 116 pars.append(gammalib.GApplicationPar("ntrials","i","a","10","","","Number of trials"))
scripts/csresmap.py
@@ -105,8 +105,8 @@ class csresmap(ctools.cscript): @@ -105,8 +105,8 @@ class csresmap(ctools.cscript):
105 pars.append(gammalib.GApplicationPar("outmap","f","a","resmap.fits","","","Output residual map")) 105 pars.append(gammalib.GApplicationPar("outmap","f","a","resmap.fits","","","Output residual map"))
106 pars.append(gammalib.GApplicationPar("caldb","s","a","dummy","","","Calibration database")) 106 pars.append(gammalib.GApplicationPar("caldb","s","a","dummy","","","Calibration database"))
107 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) 107 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function"))
108 - pars.append(gammalib.GApplicationPar("emin","r","h","0.1","0","","Lower energy limit (TeV)"))  
109 - pars.append(gammalib.GApplicationPar("emax","r","h","100.0","0","","Upper energy limit (TeV)")) 108 + pars.append(gammalib.GApplicationPar("emin","r","h","0.1","","","Lower energy limit (TeV)"))
  109 + pars.append(gammalib.GApplicationPar("emax","r","h","100.0","","","Upper energy limit (TeV)"))
110 pars.append(gammalib.GApplicationPar("enumbins","i","h","20","","","Number of energy bins")) 110 pars.append(gammalib.GApplicationPar("enumbins","i","h","20","","","Number of energy bins"))
111 pars.append(gammalib.GApplicationPar("ebinalg","s","h","LOG","LIN|LOG|FILE","","Binning algorithm")) 111 pars.append(gammalib.GApplicationPar("ebinalg","s","h","LOG","LIN|LOG|FILE","","Binning algorithm"))
112 pars.append(gammalib.GApplicationPar("coordsys","s","a","CEL","CEL|GAL","","Coordinate System")) 112 pars.append(gammalib.GApplicationPar("coordsys","s","a","CEL","CEL|GAL","","Coordinate System"))
scripts/cssens.py
@@ -109,7 +109,7 @@ class cssens(ctools.cscript): @@ -109,7 +109,7 @@ class cssens(ctools.cscript):
109 pars.append(gammalib.GApplicationPar("caldb","s","a","$CTOOLS/share/caldb/data/cta/dummy","","","Calibration database")) 109 pars.append(gammalib.GApplicationPar("caldb","s","a","$CTOOLS/share/caldb/data/cta/dummy","","","Calibration database"))
110 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) 110 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function"))
111 pars.append(gammalib.GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) 111 pars.append(gammalib.GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)"))
112 - pars.append(gammalib.GApplicationPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) 112 + pars.append(gammalib.GApplicationPar("offset","r","a","0.0","","","Source offset angle (deg)"))
113 pars.append(gammalib.GApplicationPar("bkg","s","a","$CTOOLS/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)")) 113 pars.append(gammalib.GApplicationPar("bkg","s","a","$CTOOLS/share/models/bkg_dummy.txt","","","Background model file function (none=power law for E)"))
114 pars.append(gammalib.GApplicationPar("duration","r","a","180000.0","","","Effective exposure time (s)")) 114 pars.append(gammalib.GApplicationPar("duration","r","a","180000.0","","","Effective exposure time (s)"))
115 pars.append(gammalib.GApplicationPar("rad","r","a","5.0","","","Radius of ROI (deg)")) 115 pars.append(gammalib.GApplicationPar("rad","r","a","5.0","","","Radius of ROI (deg)"))
scripts/cstsdist.py
@@ -100,8 +100,8 @@ class cstsdist(ctools.cscript): @@ -100,8 +100,8 @@ class cstsdist(ctools.cscript):
100 pars.append(gammalib.GApplicationPar("psfcube","s","a","NONE","","","PSF cube file (only needed for stacked analysis)")) 100 pars.append(gammalib.GApplicationPar("psfcube","s","a","NONE","","","PSF cube file (only needed for stacked analysis)"))
101 pars.append(gammalib.GApplicationPar("caldb","s","a","dummy","","","Calibration database")) 101 pars.append(gammalib.GApplicationPar("caldb","s","a","dummy","","","Calibration database"))
102 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function")) 102 pars.append(gammalib.GApplicationPar("irf","s","a","cta_dummy_irf","","","Instrument response function"))
103 - pars.append(gammalib.GApplicationPar("ra","r","h","83.6331","0","360","RA of pointing (deg)"))  
104 - pars.append(gammalib.GApplicationPar("dec","r","h","22.0145","-90","90","Dec of pointing (deg)")) 103 + pars.append(gammalib.GApplicationPar("ra","r","h","83.63","0","360","RA of pointing (deg)"))
  104 + pars.append(gammalib.GApplicationPar("dec","r","h","22.01","-90","90","Dec of pointing (deg)"))
105 pars.append(gammalib.GApplicationPar("emin","r","a","0.1","","","Lower energy limit (TeV)")) 105 pars.append(gammalib.GApplicationPar("emin","r","a","0.1","","","Lower energy limit (TeV)"))
106 pars.append(gammalib.GApplicationPar("emax","r","a","100.0","","","Upper energy limit (TeV)")) 106 pars.append(gammalib.GApplicationPar("emax","r","a","100.0","","","Upper energy limit (TeV)"))
107 pars.append(gammalib.GApplicationPar("tmin","r","h","0.0","","","Start time (MET in s)")) 107 pars.append(gammalib.GApplicationPar("tmin","r","h","0.0","","","Start time (MET in s)"))
@@ -114,7 +114,7 @@ class cstsdist(ctools.cscript): @@ -114,7 +114,7 @@ class cstsdist(ctools.cscript):
114 pars.append(gammalib.GApplicationPar("ntrials","i","a","10","","","Number of trials")) 114 pars.append(gammalib.GApplicationPar("ntrials","i","a","10","","","Number of trials"))
115 pars.append(gammalib.GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)")) 115 pars.append(gammalib.GApplicationPar("type","s","a","point","","","Source model type (point/gauss/shell/disk)"))
116 pars.append(gammalib.GApplicationPar("index","r","h","-2.48","","","Spectral index")) 116 pars.append(gammalib.GApplicationPar("index","r","h","-2.48","","","Spectral index"))
117 - pars.append(gammalib.GApplicationPar("offset","r","a","0.0","0.0","","Source offset angle (deg)")) 117 + pars.append(gammalib.GApplicationPar("offset","r","a","0.0","","","Source offset angle (deg)"))
118 pars.append(gammalib.GApplicationPar("bkg","s","a","$CTOOLS/share/models/bkg_dummy.txt","","","Background model file function")) 118 pars.append(gammalib.GApplicationPar("bkg","s","a","$CTOOLS/share/models/bkg_dummy.txt","","","Background model file function"))
119 pars.append_standard() 119 pars.append_standard()
120 pars.append(gammalib.GApplicationPar("logfile","f","h","cstsdist.log","","","Log filename")) 120 pars.append(gammalib.GApplicationPar("logfile","f","h","cstsdist.log","","","Log filename"))
src/ctbin/ctbin.par
@@ -23,8 +23,8 @@ outcube, f, a, "cntcube.fits",,, "Output counts cube" @@ -23,8 +23,8 @@ outcube, f, a, "cntcube.fits",,, "Output counts cube"
23 # Energy binning parameters 23 # Energy binning parameters
24 #========================== 24 #==========================
25 ebinalg, s, a, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins" 25 ebinalg, s, a, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins"
26 -emin, r, a, 0.1,0,, "Start value for first energy bin in TeV"  
27 -emax, r, a, 100.0,0,, "Stop value for last energy bin in TeV" 26 +emin, r, a, 0.1,,, "Start value for first energy bin in TeV"
  27 +emax, r, a, 100.0,,, "Stop value for last energy bin in TeV"
28 enumbins, i, a, 20,,, "Number of energy bins" 28 enumbins, i, a, 20,,, "Number of energy bins"
29 ebinfile, f, a, "NONE",,, "Name of the file containing the energy bin definition" 29 ebinfile, f, a, "NONE",,, "Name of the file containing the energy bin definition"
30 # 30 #
src/ctbkgcube/ctbkgcube.par
@@ -28,8 +28,8 @@ irf, s, a, "cta_dummy_irf",,, "Instrument response function" @@ -28,8 +28,8 @@ irf, s, a, "cta_dummy_irf",,, "Instrument response function"
28 # Energy binning parameters 28 # Energy binning parameters
29 #========================== 29 #==========================
30 ebinalg, s, h, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins" 30 ebinalg, s, h, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins"
31 -emin, r, a, 0.1,0,, "Start value for first energy bin in TeV"  
32 -emax, r, a, 100.0,0,, "Stop value for last energy bin in TeV" 31 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  32 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
33 enumbins, i, a, 20,,, "Number of energy bins" 33 enumbins, i, a, 20,,, "Number of energy bins"
34 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition" 34 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition"
35 # 35 #
src/ctcubemask/ctcubemask.par
@@ -28,8 +28,8 @@ usepnt, b, h, no,,, "Use pointing instead of RA/DEC parameters?" @@ -28,8 +28,8 @@ usepnt, b, h, no,,, "Use pointing instead of RA/DEC parameters?"
28 ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)" 28 ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)"
29 dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)" 29 dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)"
30 rad, r, a, 3.0,0,180, "Radius of ROI (degrees)" 30 rad, r, a, 3.0,0,180, "Radius of ROI (degrees)"
31 -emin, r, a, 0.1,0,, "Lower energy limit (TeV)"  
32 -emax, r, a, 100.0,0,, "Upper energy limit (TeV)" 31 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  32 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
33 # 33 #
34 # Standard parameters 34 # Standard parameters
35 #==================== 35 #====================
src/ctexpcube/ctexpcube.par
@@ -27,8 +27,8 @@ edisp, b, h, no,,, "Apply energy dispersion?" @@ -27,8 +27,8 @@ edisp, b, h, no,,, "Apply energy dispersion?"
27 # Energy binning parameters 27 # Energy binning parameters
28 #========================== 28 #==========================
29 ebinalg, s, h, "LOG", FILE|LIN|LOG,,"Algorithm for defining energy bins" 29 ebinalg, s, h, "LOG", FILE|LIN|LOG,,"Algorithm for defining energy bins"
30 -emin, r, a, 0.1,0,,"Start value for first energy bin in TeV"  
31 -emax, r, a, 100.0,0,, "Stop value for last energy bin in TeV" 30 +emin, r, a, 0.1,,,"Lower energy limit (TeV)"
  31 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
32 enumbins, i, a, 20,,, "Number of energy bins" 32 enumbins, i, a, 20,,, "Number of energy bins"
33 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition" 33 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition"
34 # 34 #
src/ctmodel/ctmodel.par
@@ -32,15 +32,15 @@ irf, s, a, "cta_dummy_irf",,, "Instrument response function" @@ -32,15 +32,15 @@ irf, s, a, "cta_dummy_irf",,, "Instrument response function"
32 ra, r, a, 83.63,0,360, "RA of pointing (degrees)" 32 ra, r, a, 83.63,0,360, "RA of pointing (degrees)"
33 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)" 33 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"
34 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)" 34 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)"
35 -tmin, r, a, 0.0,0,, "Start time (MET in s)"  
36 -tmax, r, a, 1800.0,0,, "End time (MET in s)" 35 +tmin, r, a, 0.0,,, "Start time (MET in s)"
  36 +tmax, r, a, 1800.0,,, "End time (MET in s)"
37 deadc, r, h, 0.95,0,1, "Average deadtime correction factor" 37 deadc, r, h, 0.95,0,1, "Average deadtime correction factor"
38 # 38 #
39 # Energy binning parameters 39 # Energy binning parameters
40 #========================== 40 #==========================
41 ebinalg, s, h, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins" 41 ebinalg, s, h, "LOG",FILE|LIN|LOG,, "Algorithm for defining energy bins"
42 -emin, r, a, 0.1,0,, "Start value for first energy bin in TeV"  
43 -emax, r, a, 100.0,0,, "Stop value for last energy bin in TeV" 42 +emin, r, a, 0.1,,, "Start value for first energy bin in TeV"
  43 +emax, r, a, 100.0,,, "Stop value for last energy bin in TeV"
44 enumbins, i, a, 20,,, "Number of energy bins" 44 enumbins, i, a, 20,,, "Number of energy bins"
45 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition" 45 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition"
46 # 46 #
src/ctobssim/ctobssim.par
@@ -33,10 +33,10 @@ seed, i, h, 1,,, "Random number generator seed" @@ -33,10 +33,10 @@ seed, i, h, 1,,, "Random number generator seed"
33 ra, r, a, 83.63,0,360, "RA of pointing (degrees)" 33 ra, r, a, 83.63,0,360, "RA of pointing (degrees)"
34 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)" 34 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"
35 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)" 35 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)"
36 -tmin, r, a, 0.0,0,, "Start time (MET in s)"  
37 -tmax, r, a, 1800.0,0,, "End time (MET in s)"  
38 -emin, r, a, 0.1,0,, "Lower energy limit (TeV)"  
39 -emax, r, a, 100.0,0,, "Upper energy limit (TeV)" 36 +tmin, r, a, 0.0,,, "Start time (MET in s)"
  37 +tmax, r, a, 1800.0,,, "End time (MET in s)"
  38 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  39 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
40 edisp, b, h, no,,, "Apply energy dispersion?" 40 edisp, b, h, no,,, "Apply energy dispersion?"
41 deadc, r, h, 0.95,0,1, "Average deadtime correction factor" 41 deadc, r, h, 0.95,0,1, "Average deadtime correction factor"
42 # 42 #
src/ctpsfcube/ctpsfcube.par
@@ -27,8 +27,8 @@ edisp, b, h, no,,, "Apply energy dispersion?" @@ -27,8 +27,8 @@ edisp, b, h, no,,, "Apply energy dispersion?"
27 # Energy binning parameters 27 # Energy binning parameters
28 #========================== 28 #==========================
29 ebinalg, s, h, "LOG", FILE|LIN|LOG,, "Algorithm for defining energy bins" 29 ebinalg, s, h, "LOG", FILE|LIN|LOG,, "Algorithm for defining energy bins"
30 -emin, r, a, 0.1,,, "Start value for first energy bin in TeV"  
31 -emax, r, a, 100.0,,, "Stop value for last energy bin in TeV" 30 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  31 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
32 enumbins, i, a, 20,,, "Number of energy bins" 32 enumbins, i, a, 20,,, "Number of energy bins"
33 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition" 33 ebinfile, f, h, "NONE",,, "Name of the file containing the energy bin definition"
34 # 34 #
@@ -45,7 +45,7 @@ proj, s, a, "CAR", AIT|AZP|CAR|MER|MOL|STG|TAN,, "Projection method" @@ -45,7 +45,7 @@ proj, s, a, "CAR", AIT|AZP|CAR|MER|MOL|STG|TAN,, "Projection method"
45 # 45 #
46 # Angular separation binning parameters 46 # Angular separation binning parameters
47 #====================================== 47 #======================================
48 -amax, r, h, 0.3,0,, "Upper bound of angular separation between true and measued photon direction (degrees)" 48 +amax, r, h, 0.3,,, "Upper bound of angular separation between true and measued photon direction (degrees)"
49 anumbins, i, h, 200,,, "Number of angular separation bins" 49 anumbins, i, h, 200,,, "Number of angular separation bins"
50 # 50 #
51 # Standard parameters 51 # Standard parameters
src/ctselect/ctselect.par
@@ -27,10 +27,10 @@ usepnt, b, h, no,,, "Use pointing instead of RA/DEC parameters?" @@ -27,10 +27,10 @@ usepnt, b, h, no,,, "Use pointing instead of RA/DEC parameters?"
27 ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)" 27 ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)"
28 dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)" 28 dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)"
29 rad, r, a, 3.0,0,180, "Radius of ROI (degrees)" 29 rad, r, a, 3.0,0,180, "Radius of ROI (degrees)"
30 -tmin, r, a, 0.0,0,, "Start time (CTA MET in seconds)"  
31 -tmax, r, a, 0.0,0,, "End time (CTA MET in seconds)"  
32 -emin, r, a, 0.1,0,, "Lower energy limit (TeV)"  
33 -emax, r, a, 100.0,0,, "Upper energy limit (TeV)" 30 +tmin, r, a, 0.0,,, "Start time (CTA MET in seconds)"
  31 +tmax, r, a, 0.0,,, "End time (CTA MET in seconds)"
  32 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  33 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
34 expr, s, h, "",,, "Additional selection expression" 34 expr, s, h, "",,, "Additional selection expression"
35 usethres,s, h, "NONE",NONE|DEFAULT|USER,, "Energy threshold type" 35 usethres,s, h, "NONE",NONE|DEFAULT|USER,, "Energy threshold type"
36 # 36 #
src/ctskymap/ctskymap.par
@@ -22,8 +22,8 @@ outmap, f, a, "skymap.fits",,, "Output file name" @@ -22,8 +22,8 @@ outmap, f, a, "skymap.fits",,, "Output file name"
22 # 22 #
23 # Event selection parameters 23 # Event selection parameters
24 #=========================== 24 #===========================
25 -emin, r, a, 0.1,0,, "Minimum energy in TeV"  
26 -emax, r, a, 100.0,0,, "Maximum energy in TeV" 25 +emin, r, a, 0.1,,, "Lower energy limit (TeV)"
  26 +emax, r, a, 100.0,,, "Upper energy limit (TeV)"
27 # 27 #
28 # Spatial binning parameters 28 # Spatial binning parameters
29 #=========================== 29 #===========================