Commit c2b1df2b authored by Lynn Garren's avatar Lynn Garren
Browse files

adding us and ps for microsecond and picosecond

parent b873a95e
// -*- C++ -*-
// $Id: setSystemOfUnits.cc,v 1.2 2003/08/13 20:00:10 garren Exp $
// $Id:$
// ----------------------------------------------------------------------
#include "CLHEP/Evaluator/defs.h"
......@@ -325,9 +325,11 @@ void Evaluator::setSystemOfUnits(double meter,
setVariable("millisecond", milli_ * s);
setVariable("ms", milli_ * s);
setVariable("microsecond", micro_ * s);
setVariable("us", micro_ * s);
setVariable("nanosecond", nano_ * s);
setVariable("ns", nano_ * s);
setVariable("picosecond", pico_ * s);
setVariable("ps", pico_ * s);
// Current
......
......@@ -24,7 +24,7 @@
// as it is needed for conversion factor : positron charge = e_SI (coulomb)
//
// The others physical constants are defined in the header file :
//PhysicalConstants.h
// PhysicalConstants.h
//
// Authors: M.Maire, S.Giani
//
......@@ -41,6 +41,7 @@
// 29.04.08 use PDG 2006 value of e_SI
// 03.11.08 use PDG 2008 value of e_SI
// 19.08.15 added liter and its sub units (mma)
// 12.01.16 added symbols for microsecond (us) and picosecond (ps) (mma)
#ifndef HEP_SYSTEM_OF_UNITS_H
#define HEP_SYSTEM_OF_UNITS_H
......@@ -149,6 +150,8 @@ namespace CLHEP {
static constexpr double ns = nanosecond;
static constexpr double s = second;
static constexpr double ms = millisecond;
static constexpr double us = microsecond;
static constexpr double ps = picosecond;
//
// Electric charge [Q]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment