|
@@ -375,13 +375,19 @@
|
|
|
if (fromU === 'km') return val*1e12;
|
|
|
|
|
|
let c = 299792458; // m/s
|
|
|
- let hc = 1239841930.092394328; // m*eV
|
|
|
+ let hc = 1239841930.092394328e-15; // m*eV
|
|
|
if (fromU === 'THz') return c/(val*1e12)*1e9;
|
|
|
if (fromU === 'GHz') return c/(val*1e9)*1e9;
|
|
|
if (fromU === 'MHz') return c/(val*1e6)*1e9;
|
|
|
if (fromU === 'kHz') return c/(val*1e3)*1e9;
|
|
|
if (fromU === 'Hz') return c/(val*1e0)*1e9;
|
|
|
|
|
|
+ if (fromU === 'eV') return hc/(val*1e0)*1e9;
|
|
|
+ if (fromU === 'meV') return hc/(val/1e3)*1e9;
|
|
|
+
|
|
|
+ if (fromU === 'fs') return (val/1e12)/c*1e9;
|
|
|
+ if (fromU === 'ps') return (val/1e15)/c*1e9;
|
|
|
+
|
|
|
return undefined;
|
|
|
},
|
|
|
convertUnitsFrom_nm(toU, val) {
|
|
@@ -393,13 +399,19 @@
|
|
|
if (toU === 'km') return val/1e12;
|
|
|
|
|
|
let c = 299792458; // m/s
|
|
|
- let hc = 1239841930.092394328; // m*eV
|
|
|
+ let hc = 1239841930.092394328e-15; // m*eV
|
|
|
if (toU === 'THz') return c/(val/1e9)/1e12;
|
|
|
if (toU === 'GHz') return c/(val/1e9)/1e9;
|
|
|
if (toU === 'MHz') return c/(val/1e9)/1e6;
|
|
|
if (toU === 'kHz') return c/(val/1e9)/1e3;
|
|
|
if (toU === 'Hz') return c/(val/1e9)/1e0;
|
|
|
|
|
|
+ if (toU === 'eV') return hc/(val/1e9);
|
|
|
+ if (toU === 'meV') return hc/(val/1e9)*1e3;
|
|
|
+
|
|
|
+ if (toU === 'fs') return (val/1e9)/c*1e12;
|
|
|
+ if (toU === 'ps') return (val/1e9)/c*1e15;
|
|
|
+
|
|
|
return undefined;
|
|
|
},
|
|
|
convertUnits(fromU,toU, val) {
|