diff --git a/script-gen-manager/src/instr_metadata/base_metadata.rs b/script-gen-manager/src/instr_metadata/base_metadata.rs index aaac93a..666a483 100644 --- a/script-gen-manager/src/instr_metadata/base_metadata.rs +++ b/script-gen-manager/src/instr_metadata/base_metadata.rs @@ -37,7 +37,7 @@ impl BaseMetadata { //TODO: verify this value for Trebuchet pub const EPSILON: f64 = 1e-9; //TODO: verify this value for Trebuchet - pub const MIN_LOG_VALUE: f64 = 1e-12; + pub const MIN_LOG_VALUE: f64 = 5e-6; //TODO: verify this value for Trebuchet pub const MIN_BUFFER_TIME: f64 = 60e-6; diff --git a/xml-handler/src/resources/sweep/MP5000Sweep.xml b/xml-handler/src/resources/sweep/MP5000Sweep.xml index 1831c5a..e74a1b6 100644 --- a/xml-handler/src/resources/sweep/MP5000Sweep.xml +++ b/xml-handler/src/resources/sweep/MP5000Sweep.xml @@ -95,7 +95,7 @@ ---@class Measure ---@field nplc number | nil - ---@field aperature number | nil + ---@field aperture number | nil ---@field rate `CONSTANTS.RATE_FAST` | `CONSTANTS.RATE_NORMAL` | nil -- ---@field autozero boolean Whether autozero should be turned on or not ---@field count integer The number of measurments to take @@ -382,8 +382,8 @@ -- nplc if self.measure.nplc ~= nil then self.channel.measure.nplc = self.measure.nplc - elseif self.measure.aperature ~= nil then - self.channel.measure.aperature = self.measure.aperature + elseif self.measure.aperture ~= nil then + self.channel.measure.aperture = self.measure.aperture end -- count self.channel.measure.count = self.measure.count @@ -1353,7 +1353,7 @@ FUNC_DC_IV_COMBINED { - buffer = %NODE%.slot[%BIAS-DEVICE:SLOT-IDX%].%MODEL-TYPE%[%BIAS-DEVICE:CHANNEL-IDX%].defbuffer1, + buffer = %NODE%.slot[%SLOT-IDX%].%MODEL-TYPE%[%CHANNEL-IDX%].defbuffer1, type = CONSTANTS.FUNC_DC_CURRENT }, {