Commit 329a2c8b authored by Lynn Garren's avatar Lynn Garren
Browse files

adding missing change to setSystemOfUnits.cc

parent 009973c6
============================== ==============================
14.11.13 Release CLHEP-2.1.4.1 18.11.13 Release CLHEP-2.1.4.1
============================== ==============================
2013-11-18 Lynn Garren <garren@fnal.gov>
* src/setSystemOfUnits.cc: additional units to match Units
2013-11-14 Lynn Garren <garren@fnal.gov> 2013-11-14 Lynn Garren <garren@fnal.gov>
* Random/Random/Randomize.h: include RandExpZiggurat and RandGaussZiggurat * Random/Random/Randomize.h: include RandExpZiggurat and RandGaussZiggurat
......
============================== ==============================
14.11.13 Release CLHEP-2.1.4.1 18.11.13 Release CLHEP-2.1.4.1
============================== ==============================
2013-11-18 Lynn Garren <garren@fnal.gov>
* src/setSystemOfUnits.cc: additional units to match Units
============================== ==============================
05.11.13 Release CLHEP-2.1.4.0 05.11.13 Release CLHEP-2.1.4.0
============================== ==============================
......
...@@ -211,17 +211,30 @@ void Evaluator::setSystemOfUnits(double meter, ...@@ -211,17 +211,30 @@ void Evaluator::setSystemOfUnits(double meter,
const double Bq = 1./s; const double Bq = 1./s;
setVariable("becquerel", Bq); setVariable("becquerel", Bq);
setVariable("Bq", Bq); setVariable("Bq", Bq);
setVariable("kilobecquerel", kilo_ * Bq);
setVariable("kBq", kilo_ * Bq);
setVariable("megabecquerel", mega_ * Bq);
setVariable("MBq", mega_ * Bq);
setVariable("gigabecquerel", giga_ * Bq);
setVariable("GBq", giga_ * Bq);
// --- honors Pierre Curie (1859-1906) of France // --- honors Pierre Curie (1859-1906) of France
// and Marie Sklodowska Curie (1867-1934) of Poland // and Marie Sklodowska Curie (1867-1934) of Poland
setVariable("curie", 3.7e+10 * Bq); setVariable("curie", 3.7e+10 * Bq);
setVariable("Ci", 3.7e+10 * Bq); setVariable("Ci", 3.7e+10 * Bq);
setVariable("millicurie", milli_ * 3.7e+10 * Bq);
setVariable("mCi", milli_ * 3.7e+10 * Bq);
setVariable("microcurie", micro_ * 3.7e+10 * Bq);
setVariable("uCi", micro_ * 3.7e+10 * Bq);
// Specific energy // Specific energy
// --- honors Louis Harold Gray, F.R.S. (1905-1965) of England // --- honors Louis Harold Gray, F.R.S. (1905-1965) of England
const double Gy = J / kg; const double Gy = J / kg;
setVariable("gray", Gy); setVariable("gray", Gy);
setVariable("Gy", Gy); setVariable("Gy", Gy);
setVariable("kilogray", kilo_ * Gy);
setVariable("milligray", milli_ * Gy);
setVariable("microgray", micro_ * Gy);
// Dose equivalent // Dose equivalent
const double Sv = J / kg; const double Sv = J / kg;
......
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