Iftach Sadeh / ctools

Commit f9f30490956b6d3c8823e5b14e5f61c21f4f8cec

Authored by Jürgen Knödlseder
1 parent c4cb81cc

Change query text for time parameters

Inline Side-by-side
Showing 16 changed files with 44 additions and 36 deletions
cscripts/cslightcrv.par
  View file @f9f3049
... ... @@ -28,8 +28,8 @@ outfile, f, a, lightcurve.fits,,, "Output light curve file"
28 28 # Script parameters
29 29 #==================
30 30 tbinalg, s, a, GTI,FILE|LIN|GTI,, "Algorithm for defining time bins"
31   -tmin, t, a, MJD 51544.5,,,"Lightcurve start time (UTC string, JD, MJD or time in seconds)"
32   -tmax, t, a, MJD 51544.6,,,"Lightcurve stop time (UTC string, JD, MJD or time in seconds)"
  31 +tmin, t, a, MJD 51544.5,,,"Lightcurve start time (UTC string, JD, MJD or MET in seconds)"
  32 +tmax, t, a, MJD 51544.6,,,"Lightcurve stop time (UTC string, JD, MJD or MET in seconds)"
33 33 tbins, i, a, 5,1,10000, "Number of time bins"
34 34 tbinfile, f, a, NONE,,, "File defining the time binning"
35 35 emin, r, a, 0.1,,, "Lower energy limit of events (TeV)"
... ...
cscripts/cspull.par
  View file @f9f3049
... ... @@ -35,8 +35,8 @@ proj, s, a, TAN,AIT|AZP|CAR|GLS|MER|MOL|SFL|SIN|STG|TAN,, "Projection method
35 35 emin, r, a, 0.1,,, "Lower energy limit (TeV)"
36 36 emax, r, a, 100.0,,, "Upper energy limit (TeV)"
37 37 enumbins, i, a, 0,,, "Number of energy bins (0=unbinned)"
38   -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)"
39   -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)"
  38 +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)"
  39 +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)"
40 40 npix, i, a, 200,,, "Number of pixels for binned"
41 41 binsz, r, a, 0.05,,, "Pixel size for binned (degrees/pixel)"
42 42 rad, r, h, 5.0,0,180, "Radius of ROI (degrees)"
... ...
cscripts/cstsdist.par
  View file @f9f3049
... ... @@ -40,8 +40,8 @@ proj, s, a, TAN,AIT|AZP|CAR|GLS|MER|MOL|SFL|SIN|STG|TAN,, "Projection method
40 40 emin, r, a, 0.1,,, "Lower energy limit (TeV)"
41 41 emax, r, a, 100.0,,, "Upper energy limit (TeV)"
42 42 enumbins, i, a, 0,,, "Number of energy bins (0=unbinned)"
43   -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)"
44   -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)"
  43 +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)"
  44 +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)"
45 45 npix, i, a, 200,,, "Number of pixels for binned"
46 46 binsz, r, a, 0.05,,, "Pixel size for binned (degrees/pixel)"
47 47 rad, r, h, 5.0,0,180, "Radius of ROI (degrees)"
... ...
cscripts/csviscube.par
  View file @f9f3049
... ... @@ -16,8 +16,8 @@
16 16 #
17 17 # General parameters
18 18 #===================
19   -tmin, t, a, 2020-01-01T00:00:00,,, "Start time of observation (UTC string, JD, MJD or time in seconds)"
20   -tmax, t, a, 2021-01-01T00:00:00,,, "Stop time of observation (UTC string, JD, MJD or time in seconds)"
  19 +tmin, t, a, 2020-01-01T00:00:00,,, "Start time of observation (UTC string, JD, MJD or MET in seconds)"
  20 +tmax, t, a, 2021-01-01T00:00:00,,, "Stop time of observation (UTC string, JD, MJD or MET in seconds)"
21 21 geolon, r, a, 79.4041,,, "Geographic longitude of array (deg)"
22 22 geolat, r, a, -24.6272,,, "Geographic latitude of array (deg)"
23 23 sunzenith, r, h, 105.0,,, "Minimum Sun zenith angle for observations (deg)"
... ...
doc/source/users/reference_manual/cslightcrv.rst
  View file @f9f3049
... ... @@ -52,10 +52,10 @@ General parameters
52 52 Algorithm for defining time bins.
53 53  
54 54 ``tmin [time]``
55   - Lightcurve start time (UTC string, JD, MJD or time in seconds).
  55 + Lightcurve start time (UTC string, JD, MJD or MET in seconds).
56 56  
57 57 ``tmax [time]``
58   - Lightcurve stop time (UTC string, JD, MJD or time in seconds).
  58 + Lightcurve stop time (UTC string, JD, MJD or MET in seconds).
59 59  
60 60 ``tbins [integer]``
61 61 Number of time bins.
... ...
doc/source/users/reference_manual/cspull.rst
  View file @f9f3049
... ... @@ -84,10 +84,10 @@ General parameters
84 84 Number of energy bins (0=unbinned).
85 85  
86 86 ``tmin [time]``
87   - Start time (UTC string, JD, MJD or time in seconds).
  87 + Start time (UTC string, JD, MJD or MET in seconds).
88 88  
89 89 ``tmax [time]``
90   - Stop time (UTC string, JD, MJD or time in seconds).
  90 + Stop time (UTC string, JD, MJD or MET in seconds).
91 91  
92 92 ``npix [integer]``
93 93 Number of pixels for binned analysis.
... ...
doc/source/users/reference_manual/cstsdist.rst
  View file @f9f3049
... ... @@ -91,10 +91,10 @@ General parameters
91 91 Number of energy bins (0=unbinned).
92 92  
93 93 ``tmin [time]``
94   - Start time (UTC string, JD, MJD or time in seconds).
  94 + Start time (UTC string, JD, MJD or MET in seconds).
95 95  
96 96 ``tmax [time]``
97   - Stop time (UTC string, JD, MJD or time in seconds).
  97 + Stop time (UTC string, JD, MJD or MET in seconds).
98 98  
99 99 ``npix [integer]``
100 100 Number of pixels for binned analysis.
... ...
doc/source/users/reference_manual/csviscube.rst
  View file @f9f3049
... ... @@ -25,10 +25,10 @@ General parameters
25 25 ------------------
26 26  
27 27 ``tmin [time]``
28   - Start time of observation (UTC string, JD, MJD or time in seconds).
  28 + Start time of observation (UTC string, JD, MJD or MET in seconds).
29 29  
30 30 ``tmax [time]``
31   - Stop time of observation (UTC string, JD, MJD or time in seconds).
  31 + Stop time of observation (UTC string, JD, MJD or MET in seconds).
32 32  
33 33 ``geolon [real]``
34 34 Geographic longitude of the IACT array in degrees.
... ...
doc/source/users/reference_manual/ctlike.rst
  View file @f9f3049
... ... @@ -67,13 +67,16 @@ General parameters
67 67 Input model XML file.
68 68  
69 69 ``expcube [file]``
70   - Input exposure cube file (only needed for stacked analysis).
  70 + Input exposure cube file.
71 71  
72 72 ``psfcube [file]``
73   - Input PSF cube file (only needed for stacked analysis).
  73 + Input PSF cube file.
74 74  
75 75 ``bkgcube [file]``
76   - Input background cube file (only needed for stacked analysis).
  76 + Input background cube file.
  77 +
  78 +``edispcube [file]``
  79 + Input energy dispersion cube file.
77 80  
78 81 ``caldb [string]``
79 82 Calibration database.
... ...
doc/source/users/reference_manual/ctmodel.rst
  View file @f9f3049
... ... @@ -87,10 +87,10 @@ General parameters
87 87 Radius of field of view (in degrees).
88 88  
89 89 ``tmin [time]``
90   - Start time (UTC string, JD, MJD or time in seconds).
  90 + Start time (UTC string, JD, MJD or MET in seconds).
91 91  
92 92 ``tmax [time]``
93   - Stop time (UTC string, JD, MJD or time in seconds).
  93 + Stop time (UTC string, JD, MJD or MET in seconds).
94 94  
95 95 ``(deadc = 0.95) [real]``
96 96 Average deadtime correction factor.
... ...
doc/source/users/reference_manual/ctobssim.rst
  View file @f9f3049
... ... @@ -84,10 +84,10 @@ General parameters
84 84 Radius of CTA field of view (simulation cone radius) (in degrees).
85 85  
86 86 ``tmin [time]``
87   - Start time (UTC string, JD, MJD or time in seconds).
  87 + Start time (UTC string, JD, MJD or MET in seconds).
88 88  
89 89 ``tmax [time]``
90   - Stop time (UTC string, JD, MJD or time in seconds).
  90 + Stop time (UTC string, JD, MJD or MET in seconds).
91 91  
92 92 ``emin [real]``
93 93 Lower energy limit of simulated events (in TeV).
... ...
src/ctlike/ctlike.par
  View file @f9f3049
... ... @@ -18,10 +18,10 @@
18 18 #===================
19 19 inobs, f, a, "events.fits",,, "Input event list, counts cube or observation definition XML file"
20 20 inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Input model definition XML file"
21   -expcube, f, a, "NONE",,, "Input exposure cube file (only needed for stacked analysis)"
22   -psfcube, f, a, "NONE",,, "Input PSF cube file (only needed for stacked analysis)"
23   -edispcube, f, a, "NONE",,, "Input energy dispersion cube file (only needed for stacked analysis)"
24   -bkgcube, f, a, "NONE",,, "Input background cube file (only needed for stacked analysis)"
  21 +expcube, f, a, "NONE",,, "Input exposure cube file"
  22 +psfcube, f, a, "NONE",,, "Input PSF cube file"
  23 +edispcube, f, a, "NONE",,, "Input energy dispersion cube file"
  24 +bkgcube, f, a, "NONE",,, "Input background cube file"
25 25 caldb, s, a, "prod2",,, "Calibration database"
26 26 irf, s, a, "South_0.5h",,, "Instrument response function"
27 27 edisp, b, h, no,,, "Apply energy dispersion?"
... ...
src/ctmodel/ctmodel.par
  View file @f9f3049
... ... @@ -34,8 +34,8 @@ outcube, f, a, "modcube.fits",,, "Output model cube file"
34 34 ra, r, a, 83.63,0,360, "RA of pointing (degrees)"
35 35 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"
36 36 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)"
37   -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)"
38   -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)"
  37 +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)"
  38 +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)"
39 39 deadc, r, h, 0.98,0,1, "Average deadtime correction factor"
40 40  
41 41 #
... ...
src/ctobssim/ctobssim.par
  View file @f9f3049
... ... @@ -32,8 +32,8 @@ seed, i, h, 1,,, "Random number generator seed"
32 32 ra, r, a, 83.63,0,360, "RA of pointing (degrees)"
33 33 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"
34 34 rad, r, a, 5.0,0,180, "Radius of FOV (degrees)"
35   -tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or time in seconds)"
36   -tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or time in seconds)"
  35 +tmin, t, a, 2020-01-01T00:00:00,,, "Start time (UTC string, JD, MJD or MET in seconds)"
  36 +tmax, t, a, 2020-01-01T00:30:00,,, "Stop time (UTC string, JD, MJD or MET in seconds)"
37 37 emin, r, a, 0.1,,, "Lower energy limit (TeV)"
38 38 emax, r, a, 100.0,,, "Upper energy limit (TeV)"
39 39 deadc, r, h, 0.98,0,1, "Average deadtime correction factor"
... ...
src/ctselect/ctselect.cpp
  View file @f9f3049
... ... @@ -696,7 +696,7 @@ void ctselect::select_events(GCTAObservation* obs,
696 696 const std::string& gtiname)
697 697 {
698 698 // Write header into logger
699   - log_header3(NORMAL, "Events selection");
  699 + log_header3(NORMAL, "Event selection");
700 700  
701 701 // Initialise selection and addition strings
702 702 std::string selection;
... ... @@ -766,8 +766,13 @@ void ctselect::select_events(GCTAObservation* obs,
766 766 sprintf(cmax, "%.8f", tmax);
767 767 selection = "TIME >= "+std::string(cmin)+" && TIME <= "+std::string(cmax);
768 768 add = " && ";
769   - log_value(NORMAL, "Time range",
770   - gammalib::str(tmin)+" - "+gammalib::str(tmax)+" s");
  769 + log_value(NORMAL, "Time range (MJD)",
  770 + gammalib::str(gti.tstart().mjd())+" - "+
  771 + gammalib::str(gti.tstop().mjd())+" days");
  772 + log_value(NORMAL, "Time range (UTC)",
  773 + gti.tstart().utc()+" - "+gti.tstop().utc());
  774 + log_value(NORMAL, "Time range (MET)",
  775 + gammalib::str(tmin)+" - "+gammalib::str(tmax)+" seconds");
771 776  
772 777 } // endif: made time selection
773 778  
... ...
src/ctselect/ctselect.par
  View file @f9f3049
... ... @@ -27,8 +27,8 @@ usepnt, b, h, no,,, &quot;Use pointing instead of RA/DEC parameters?&quot;
27 27 ra, r, a, 83.63,0,360, "RA for ROI centre (degrees)"
28 28 dec, r, a, 22.01,-90,90, "Dec for ROI centre (degrees)"
29 29 rad, r, a, 3.0,0,180, "Radius of ROI (degrees)"
30   -tmin, t, a, NONE,,, "Start time (UTC string, JD, MJD or time in seconds)"
31   -tmax, t, a, NONE,,, "Stop time (UTC string, JD, MJD or time in seconds)"
  30 +tmin, t, a, NONE,,, "Start time (UTC string, JD, MJD or MET in seconds)"
  31 +tmax, t, a, NONE,,, "Stop time (UTC string, JD, MJD or MET in seconds)"
32 32 emin, r, a, 0.1,,, "Lower energy limit (TeV)"
33 33 emax, r, a, 100.0,,, "Upper energy limit (TeV)"
34 34 phase, s, h, NONE,,, "Phase expression in the format phasemin0:phasemax0,phasemin1:phasemax1,..."
... ...