Skip to content
Snippets Groups Projects
Commit 28f2b6c0 authored by flavigny's avatar flavigny
Browse files

Fix conflict in pascal unit definition with ROOT

parent 34056ac2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NPLib/Core/NPSystemOfUnits.h
+ 2
− 3
View file @ 28f2b6c0
......@@ -168,9 +168,8 @@ namespace NPUNITS {
//
//#define pascal hep_pascal // a trick to avoid warnings
static const double hep_pascal = newton/m2; // pascal = 6.24150 e+3 * MeV/mm3
static const double pascal = newton/m2; // pascal = 6.24150 e+3 * MeV/mm3
static const double bar = 100000*pascal; // bar = 6.24150 e+8 * MeV/mm3
static const double atmosphere = 101325*pascal; // atm = 6.32420 e+8 * MeV/mm3
static const double bar = 100000*hep_pascal; // bar = 6.24150 e+8 * MeV/mm3
static const double atmosphere = 101325*hep_pascal; // atm = 6.32420 e+8 * MeV/mm3
static const double torr = 0.00133322*bar;
//
......
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