jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added new utility conversions DbU::toMicrons() & DbU::fromMicrons().

This commit is contained in:
Jean-Paul Chaput 2020-12-23 11:16:38 +01:00
parent ead11f8b93
commit 70d32528cd
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hurricane/src/hurricane/hurricane/DbU.h
View File

@ -29,13 +29,10 @@
// +-----------------------------------------------------------------+ // +-----------------------------------------------------------------+
#ifndef HURRICANE_DBU_H #pragma once
#define HURRICANE_DBU_H #include <cstdint>
#include <cmath>
#include "hurricane/Commons.h"
#include <cstdint>
#include <cmath>
#include "hurricane/Commons.h"
namespace Hurricane { namespace Hurricane {
@ -78,6 +75,8 @@ namespace Hurricane {
static inline Unit fromGrid ( double value ); static inline Unit fromGrid ( double value );
static inline Unit fromLambda ( double value ); static inline Unit fromLambda ( double value );
static inline Unit fromPhysical ( double value, UnitPower p ); static inline Unit fromPhysical ( double value, UnitPower p );
static inline Unit fromMicrons ( double value );
static inline Unit fromNanos ( double value );
// Old naming scheme (was not very clear). // Old naming scheme (was not very clear).
static inline Unit db ( Unit value ); static inline Unit db ( Unit value );
static inline Unit grid ( double value ); static inline Unit grid ( double value );
@ -116,6 +115,8 @@ namespace Hurricane {
static inline double toLambda ( double u ); static inline double toLambda ( double u );
static inline double toPhysical ( Unit u, UnitPower p ); static inline double toPhysical ( Unit u, UnitPower p );
static inline double toPhysical ( double u, UnitPower p ); static inline double toPhysical ( double u, UnitPower p );
static inline double toMicrons ( Unit u );
static inline double toNanos ( Unit u );
// Old naming scheme (not very clear). // Old naming scheme (not very clear).
static inline Unit getDb ( Unit u ); static inline Unit getDb ( Unit u );
static inline double getGrid ( Unit u ); static inline double getGrid ( Unit u );
@ -161,6 +162,8 @@ namespace Hurricane {
inline DbU::Unit DbU::fromGrid ( double value ) { checkGridBound (value); return (Unit)rint( value/_resolution ); } inline DbU::Unit DbU::fromGrid ( double value ) { checkGridBound (value); return (Unit)rint( value/_resolution ); }
inline DbU::Unit DbU::fromLambda ( double value ) { checkLambdaBound (value); return fromGrid(value*_gridsPerLambda); } inline DbU::Unit DbU::fromLambda ( double value ) { checkLambdaBound (value); return fromGrid(value*_gridsPerLambda); }
inline DbU::Unit DbU::fromPhysical ( double value, UnitPower p ) { checkPhysicalBound(value,p); return fromGrid((value*getUnitPower(p))/_physicalsPerGrid); } inline DbU::Unit DbU::fromPhysical ( double value, UnitPower p ) { checkPhysicalBound(value,p); return fromGrid((value*getUnitPower(p))/_physicalsPerGrid); }
inline DbU::Unit DbU::fromMicrons ( double value ) { return fromPhysical(value,UnitPower::Micro); }
inline DbU::Unit DbU::fromNanos ( double value ) { return fromPhysical(value,UnitPower::Nano); }
inline DbU::Unit DbU::toDb ( DbU::Unit u ) { return u; } inline DbU::Unit DbU::toDb ( DbU::Unit u ) { return u; }
inline double DbU::toGrid ( DbU::Unit u ) { return _resolution*(double)u; } inline double DbU::toGrid ( DbU::Unit u ) { return _resolution*(double)u; }
inline double DbU::toGrid ( double u ) { return _resolution*u; } inline double DbU::toGrid ( double u ) { return _resolution*u; }
@ -168,6 +171,8 @@ namespace Hurricane {
inline double DbU::toLambda ( double u ) { return toGrid(u)/_gridsPerLambda; } inline double DbU::toLambda ( double u ) { return toGrid(u)/_gridsPerLambda; }
inline double DbU::toPhysical ( DbU::Unit u, UnitPower p ) { return (_physicalsPerGrid*_resolution*(double)u)/getUnitPower(p); } inline double DbU::toPhysical ( DbU::Unit u, UnitPower p ) { return (_physicalsPerGrid*_resolution*(double)u)/getUnitPower(p); }
inline double DbU::toPhysical ( double u, UnitPower p ) { return (_physicalsPerGrid*_resolution*u)/getUnitPower(p); } inline double DbU::toPhysical ( double u, UnitPower p ) { return (_physicalsPerGrid*_resolution*u)/getUnitPower(p); }
inline double DbU::toMicrons ( Unit u ) { return toPhysical(u,UnitPower::Micro); }
inline double DbU::toNanos ( Unit u ) { return toPhysical(u,UnitPower::Nano); }
inline DbU::Unit DbU::getPolygonStep () { return _polygonStep; } inline DbU::Unit DbU::getPolygonStep () { return _polygonStep; }
// Old converter naming scheme. // Old converter naming scheme.
@ -255,6 +260,3 @@ inline Hurricane::Record* getRecord ( const std::vector<Hurricane::DbU::Unit>* v
} }
return record; return record;
} }
#endif // HURRICANE_DBU_H