Justine Devin / gammalib

Commit bff928b2a35c06c939ddb0cb55d58e12a73e7bcd

Authored by knodlseder
1 parent 9989c919

Timeunit may also be 's' or 'd' (see OGIP/93-003)

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
src/obs/GTime.cpp
  View file @bff928b
... ... @@ -299,7 +299,7 @@ void GTime::met(const double& time)
299 299 *
300 300 * @param[in] time Time value.
301 301 * @param[in] mjdref Reference MJD (days).
302   - * @param[in] timeunit Time unit ("sec(s)", "day(s)").
  302 + * @param[in] timeunit Time unit ("s", "d", "sec(s)", "day(s)").
303 303 * @param[in] timesys Time system (ignored so far).
304 304 * @param[in] timeref Time reference (ignored so far).
305 305 *
... ... @@ -320,15 +320,15 @@ void GTime::time(const double& time,
320 320 // Convert time to seconds
321 321 double time_in_seconds;
322 322 std::string u_timeunit = toupper(timeunit);
323   - if (u_timeunit == "DAY" || u_timeunit == "DAYS") {
  323 + if (u_timeunit == "D" || u_timeunit == "DAY" || u_timeunit == "DAYS") {
324 324 time_in_seconds = time * sec_in_day;
325 325 }
326   - else if (u_timeunit == "SEC" || u_timeunit == "SECS") {
  326 + else if (u_timeunit == "S" || u_timeunit == "SEC" || u_timeunit == "SECS") {
327 327 time_in_seconds = time;
328 328 }
329 329 else {
330 330 throw GException::time_invalid_unit(G_TIME, timeunit,
331   - "Valid units are \"day(s)\" and \"sec(s)\"");
  331 + "Valid units are \"d(ay(s))\" and \"s(ec(s))\"");
332 332 }
333 333  
334 334 // Store time and reference
... ...