diff --git a/cscripts/cslightcrv.par b/cscripts/cslightcrv.par index 3e7d03d..93823df 100644 --- a/cscripts/cslightcrv.par +++ b/cscripts/cslightcrv.par @@ -28,8 +28,8 @@ outfile, f, a, lightcurve.fits,,, "Output light curve file" # Script parameters #================== tbinalg, s, a, GTI,FILE|LIN|GTI,, "Algorithm for defining time bins" -tmin, t, a, MJD 51544.5,,,"Lightcurve start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, MJD 51544.6,,,"Lightcurve stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, MJD 51544.5,,,"Lightcurve start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, MJD 51544.6,,,"Lightcurve stop time (UTC string, JD, MJD or MET in seconds)" tbins, i, a, 5,1,10000, "Number of time bins" tbinfile, f, a, NONE,,, "File defining the time binning" emin, r, a, 0.1,,, "Lower energy limit of events (TeV)" diff --git a/cscripts/cspull.par b/cscripts/cspull.par index 3d0bd3c..2ad62cb 100644 --- a/cscripts/cspull.par +++ b/cscripts/cspull.par @@ -35,8 +35,8 @@ proj, s, a, TAN,AIT|AZP|CAR|GLS|MER|MOL|SFL|SIN|STG|TAN,, "Projection method emin, r, a, 0.1,,, "Lower energy limit (TeV)" emax, r, a, 100.0,,, "Upper energy limit (TeV)" enumbins, i, a, 0,,, "Number of energy bins (0=unbinned)" -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)" npix, i, a, 200,,, "Number of pixels for binned" binsz, r, a, 0.05,,, "Pixel size for binned (degrees/pixel)" rad, r, h, 5.0,0,180, "Radius of ROI (degrees)" diff --git a/cscripts/cstsdist.par b/cscripts/cstsdist.par index 3347c72..cfc8014 100644 --- a/cscripts/cstsdist.par +++ b/cscripts/cstsdist.par @@ -40,8 +40,8 @@ proj, s, a, TAN,AIT|AZP|CAR|GLS|MER|MOL|SFL|SIN|STG|TAN,, "Projection method emin, r, a, 0.1,,, "Lower energy limit (TeV)" emax, r, a, 100.0,,, "Upper energy limit (TeV)" enumbins, i, a, 0,,, "Number of energy bins (0=unbinned)" -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)" npix, i, a, 200,,, "Number of pixels for binned" binsz, r, a, 0.05,,, "Pixel size for binned (degrees/pixel)" rad, r, h, 5.0,0,180, "Radius of ROI (degrees)" diff --git a/cscripts/csviscube.par b/cscripts/csviscube.par index 1202799..203985d 100644 --- a/cscripts/csviscube.par +++ b/cscripts/csviscube.par @@ -16,8 +16,8 @@ # # General parameters #=================== -tmin, t, a, 2020-01-01T00:00:00,,, "Start time of observation (UTC string, JD, MJD or time in seconds)" -tmax, t, a, 2021-01-01T00:00:00,,, "Stop time of observation (UTC string, JD, MJD or time in seconds)" +tmin, t, a, 2020-01-01T00:00:00,,, "Start time of observation (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, 2021-01-01T00:00:00,,, "Stop time of observation (UTC string, JD, MJD or MET in seconds)" geolon, r, a, 79.4041,,, "Geographic longitude of array (deg)" geolat, r, a, -24.6272,,, "Geographic latitude of array (deg)" sunzenith, r, h, 105.0,,, "Minimum Sun zenith angle for observations (deg)" diff --git a/doc/source/users/reference_manual/cslightcrv.rst b/doc/source/users/reference_manual/cslightcrv.rst index bdae218..bd7ae9d 100644 --- a/doc/source/users/reference_manual/cslightcrv.rst +++ b/doc/source/users/reference_manual/cslightcrv.rst @@ -52,10 +52,10 @@ General parameters Algorithm for defining time bins. ``tmin [time]`` - Lightcurve start time (UTC string, JD, MJD or time in seconds). + Lightcurve start time (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Lightcurve stop time (UTC string, JD, MJD or time in seconds). + Lightcurve stop time (UTC string, JD, MJD or MET in seconds). ``tbins [integer]`` Number of time bins. diff --git a/doc/source/users/reference_manual/cspull.rst b/doc/source/users/reference_manual/cspull.rst index b8ee1de..7974558 100644 --- a/doc/source/users/reference_manual/cspull.rst +++ b/doc/source/users/reference_manual/cspull.rst @@ -84,10 +84,10 @@ General parameters Number of energy bins (0=unbinned). ``tmin [time]`` - Start time (UTC string, JD, MJD or time in seconds). + Start time (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Stop time (UTC string, JD, MJD or time in seconds). + Stop time (UTC string, JD, MJD or MET in seconds). ``npix [integer]`` Number of pixels for binned analysis. diff --git a/doc/source/users/reference_manual/cstsdist.rst b/doc/source/users/reference_manual/cstsdist.rst index e4bc95f..1461ec0 100644 --- a/doc/source/users/reference_manual/cstsdist.rst +++ b/doc/source/users/reference_manual/cstsdist.rst @@ -91,10 +91,10 @@ General parameters Number of energy bins (0=unbinned). ``tmin [time]`` - Start time (UTC string, JD, MJD or time in seconds). + Start time (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Stop time (UTC string, JD, MJD or time in seconds). + Stop time (UTC string, JD, MJD or MET in seconds). ``npix [integer]`` Number of pixels for binned analysis. diff --git a/doc/source/users/reference_manual/csviscube.rst b/doc/source/users/reference_manual/csviscube.rst index addc886..7419400 100644 --- a/doc/source/users/reference_manual/csviscube.rst +++ b/doc/source/users/reference_manual/csviscube.rst @@ -25,10 +25,10 @@ General parameters ------------------ ``tmin [time]`` - Start time of observation (UTC string, JD, MJD or time in seconds). + Start time of observation (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Stop time of observation (UTC string, JD, MJD or time in seconds). + Stop time of observation (UTC string, JD, MJD or MET in seconds). ``geolon [real]`` Geographic longitude of the IACT array in degrees. diff --git a/doc/source/users/reference_manual/ctlike.rst b/doc/source/users/reference_manual/ctlike.rst index 1f8e251..87f0a1e 100644 --- a/doc/source/users/reference_manual/ctlike.rst +++ b/doc/source/users/reference_manual/ctlike.rst @@ -67,13 +67,16 @@ General parameters Input model XML file. ``expcube [file]`` - Input exposure cube file (only needed for stacked analysis). + Input exposure cube file. ``psfcube [file]`` - Input PSF cube file (only needed for stacked analysis). + Input PSF cube file. ``bkgcube [file]`` - Input background cube file (only needed for stacked analysis). + Input background cube file. + +``edispcube [file]`` + Input energy dispersion cube file. ``caldb [string]`` Calibration database. diff --git a/doc/source/users/reference_manual/ctmodel.rst b/doc/source/users/reference_manual/ctmodel.rst index f9d076e..4f698a5 100644 --- a/doc/source/users/reference_manual/ctmodel.rst +++ b/doc/source/users/reference_manual/ctmodel.rst @@ -87,10 +87,10 @@ General parameters Radius of field of view (in degrees). ``tmin [time]`` - Start time (UTC string, JD, MJD or time in seconds). + Start time (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Stop time (UTC string, JD, MJD or time in seconds). + Stop time (UTC string, JD, MJD or MET in seconds). ``(deadc = 0.95) [real]`` Average deadtime correction factor. diff --git a/doc/source/users/reference_manual/ctobssim.rst b/doc/source/users/reference_manual/ctobssim.rst index 286ae4c..43d2517 100644 --- a/doc/source/users/reference_manual/ctobssim.rst +++ b/doc/source/users/reference_manual/ctobssim.rst @@ -84,10 +84,10 @@ General parameters Radius of CTA field of view (simulation cone radius) (in degrees). ``tmin [time]`` - Start time (UTC string, JD, MJD or time in seconds). + Start time (UTC string, JD, MJD or MET in seconds). ``tmax [time]`` - Stop time (UTC string, JD, MJD or time in seconds). + Stop time (UTC string, JD, MJD or MET in seconds). ``emin [real]`` Lower energy limit of simulated events (in TeV). diff --git a/src/ctlike/ctlike.par b/src/ctlike/ctlike.par index de0d771..f96deb8 100644 --- a/src/ctlike/ctlike.par +++ b/src/ctlike/ctlike.par @@ -18,10 +18,10 @@ #=================== inobs, f, a, "events.fits",,, "Input event list, counts cube or observation definition XML file" inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Input model definition XML file" -expcube, f, a, "NONE",,, "Input exposure cube file (only needed for stacked analysis)" -psfcube, f, a, "NONE",,, "Input PSF cube file (only needed for stacked analysis)" -edispcube, f, a, "NONE",,, "Input energy dispersion cube file (only needed for stacked analysis)" -bkgcube, f, a, "NONE",,, "Input background cube file (only needed for stacked analysis)" +expcube, f, a, "NONE",,, "Input exposure cube file" +psfcube, f, a, "NONE",,, "Input PSF cube file" +edispcube, f, a, "NONE",,, "Input energy dispersion cube file" +bkgcube, f, a, "NONE",,, "Input background cube file" caldb, s, a, "prod2",,, "Calibration database" irf, s, a, "South_0.5h",,, "Instrument response function" edisp, b, h, no,,, "Apply energy dispersion?" diff --git a/src/ctmodel/ctmodel.par b/src/ctmodel/ctmodel.par index f667362..77492a4 100644 --- a/src/ctmodel/ctmodel.par +++ b/src/ctmodel/ctmodel.par @@ -34,8 +34,8 @@ outcube, f, a, "modcube.fits",,, "Output model cube file" ra, r, a, 83.63,0,360, "RA of pointing (degrees)" dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)" rad, r, a, 5.0,0,180, "Radius of FOV (degrees)" -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)" deadc, r, h, 0.98,0,1, "Average deadtime correction factor" # diff --git a/src/ctobssim/ctobssim.par b/src/ctobssim/ctobssim.par index 832aaa8..28b81b7 100644 --- a/src/ctobssim/ctobssim.par +++ b/src/ctobssim/ctobssim.par @@ -32,8 +32,8 @@ seed, i, h, 1,,, "Random number generator seed" ra, r, a, 83.63,0,360, "RA of pointing (degrees)" dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)" rad, r, a, 5.0,0,180, "Radius of FOV (degrees)" -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)" emin, r, a, 0.1,,, "Lower energy limit (TeV)" emax, r, a, 100.0,,, "Upper energy limit (TeV)" deadc, r, h, 0.98,0,1, "Average deadtime correction factor" diff --git a/src/ctselect/ctselect.cpp b/src/ctselect/ctselect.cpp index 02640e9..47b3e30 100644 --- a/src/ctselect/ctselect.cpp +++ b/src/ctselect/ctselect.cpp @@ -696,7 +696,7 @@ void ctselect::select_events(GCTAObservation* obs, const std::string& gtiname) { // Write header into logger - log_header3(NORMAL, "Events selection"); + log_header3(NORMAL, "Event selection"); // Initialise selection and addition strings std::string selection; @@ -766,8 +766,13 @@ void ctselect::select_events(GCTAObservation* obs, sprintf(cmax, "%.8f", tmax); selection = "TIME >= "+std::string(cmin)+" && TIME <= "+std::string(cmax); add = " && "; - log_value(NORMAL, "Time range", - gammalib::str(tmin)+" - "+gammalib::str(tmax)+" s"); + log_value(NORMAL, "Time range (MJD)", + gammalib::str(gti.tstart().mjd())+" - "+ + gammalib::str(gti.tstop().mjd())+" days"); + log_value(NORMAL, "Time range (UTC)", + gti.tstart().utc()+" - "+gti.tstop().utc()); + log_value(NORMAL, "Time range (MET)", + gammalib::str(tmin)+" - "+gammalib::str(tmax)+" seconds"); } // endif: made time selection diff --git a/src/ctselect/ctselect.par b/src/ctselect/ctselect.par index 7356fe6..3956ca3 100644 --- a/src/ctselect/ctselect.par +++ b/src/ctselect/ctselect.par @@ -27,8 +27,8 @@ usepnt, b, h, no,,, "Use pointing instead of RA/DEC parameters?" ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)" dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)" rad, r, a, 3.0,0,180, "Radius of ROI (degrees)" -tmin, t, a, NONE,,, "Start time (UTC string, JD, MJD or time in seconds)" -tmax, t, a, NONE,,, "Stop time (UTC string, JD, MJD or time in seconds)" +tmin, t, a, NONE,,, "Start time (UTC string, JD, MJD or MET in seconds)" +tmax, t, a, NONE,,, "Stop time (UTC string, JD, MJD or MET in seconds)" emin, r, a, 0.1,,, "Lower energy limit (TeV)" emax, r, a, 100.0,,, "Upper energy limit (TeV)" phase, s, h, NONE,,, "Phase expression in the format phasemin0:phasemax0,phasemin1:phasemax1,..."