Fix/validate bias source limit (#56)

Author: pavannarayana

script-gen-manager/src/instr_metadata/mpsu50_metadata.rs

@@ -35,7 +35,7 @@ impl Mpsu50Metadata {
             max_supported_current,
         );
 
-        base.add_range("source.limiti".to_string(), 0.01, 5.1);
+        base.add_range("source.limiti".to_string(), -5.1, 5.1);
 
         base.add_range("source.step_to_sweep_delay".to_string(), 0.0, 100.0);
 
@@ -44,21 +44,21 @@ impl Mpsu50Metadata {
         let exclude_i = NumberLimit::new(-10.0e-9, 10.0e-9, false, None);
         let mut region_map_metadata = RegionMapMetadata::new(None, exclude_i);
 
-        region_map_metadata.add_region(1, 0.0, 0.0, 10.0, max_supported_current);
-        region_map_metadata.add_region(1, 0.0, 0.0, -10.0, -max_supported_current);
+        region_map_metadata.add_region(1, 0.0, 10.0e-9, 10.0, max_supported_current);
+        region_map_metadata.add_region(1, 0.0, -10.0e-9, -10.0, -max_supported_current);
 
         Self::add_1st_quadrant_curved_region(
             10.0,
             max_supported_voltage,
             0.0001,
-            0.0,
+            10.0e-9,
             &mut region_map_metadata,
         ); //First quadrant curve
         Self::add_3rd_quadrant_curved_region(
             -10.0,
             -max_supported_voltage,
             -0.0001,
-            0.0,
+            -10.0e-9,
             &mut region_map_metadata,
         ); //Third quadrant curve
 

script-gen-manager/src/instr_metadata/msmu60_metadata.rs

@@ -69,8 +69,8 @@ impl Msmu60Metadata {
         base.add_range("source.levelv".to_string(), -60.6, 60.6);
         base.add_range("source.leveli".to_string(), -1.515, 1.515);
 
-        base.add_range("source.limiti".to_string(), -1.515, 1.515);
-        base.add_range("source.limitv".to_string(), -60.6, 60.6);
+        base.add_range("source.limiti".to_string(), 10.0e-9, 1.515);
+        base.add_range("source.limitv".to_string(), 10.0e-9, 60.6);
 
         base.add_range("source.step_to_sweep_delay".to_string(), 0.0, 100.0);
 

script-gen-manager/src/model/chan_data/bias_channel.rs

@@ -26,6 +26,8 @@ impl BiasChannel {
 
     pub fn evaluate(&mut self) {
         self.common_chan_attributes.evaluate();
+        self.common_chan_attributes
+            .evaluate_source_limits(&self.bias, &self.bias); //Use the bias value for both start and stop as the absolute max is used
         self.determine_bias_value();
     }
 

script-gen-manager/src/model/chan_data/default_channel.rs

@@ -286,13 +286,13 @@ impl CommonChanAttributes {
         stop_value: &ParameterFloat,
     ) {
         //Use region map to further limit the source limits based on the source function and range
-        let mut limit_value = start_value.value;
+        let mut limit_value = start_value.value.abs();
         if let Some(region_map) =
             self.get_region_map(&self.device.metadata, &self.source_range.value)
         {
             if stop_value.value.abs() > limit_value.abs() {
                 //Use the largest absolute value
-                limit_value = stop_value.value;
+                limit_value = stop_value.value.abs();
             }
             match &self.source_function.value[..] {
                 s if s == BaseMetadata::FUNCTION_VOLTAGE => {

script-gen-manager/src/model/chan_data/start_stop_channel.rs

@@ -57,16 +57,33 @@ impl StartStopChannel {
         }
     }
 
-    pub fn evaluate(&mut self, list_size: usize) {
+    pub fn evaluate(&mut self, list_size: usize, is_list_enabled: bool) {
         self.common_chan_attributes.evaluate();
         self.determine_start_value();
         self.determine_stop_value();
 
         //List evaluation
 
         self.update_list(list_size);
-        self.common_chan_attributes
-            .evaluate_source_limits(&self.start, &self.stop);
+
+        if is_list_enabled {
+            let min_value = self
+                .list
+                .iter()
+                .min_by(|a, b| a.value.partial_cmp(&b.value).unwrap())
+                .unwrap();
+            let max_value = self
+                .list
+                .iter()
+                .max_by(|a, b| a.value.partial_cmp(&b.value).unwrap())
+                .unwrap();
+
+            self.common_chan_attributes
+                .evaluate_source_limits(min_value, max_value);
+        } else {
+            self.common_chan_attributes
+                .evaluate_source_limits(&self.start, &self.stop);
+        }
     }
 
     fn update_list(&mut self, list_size: usize) {

script-gen-manager/src/model/sweep_data/sweep_config.rs

@@ -393,14 +393,16 @@ impl SweepConfig {
         }
 
         for step_channel in &mut self.step_channels {
-            step_channel
-                .start_stop_channel
-                .evaluate(self.step_global_parameters.step_points.value as usize);
+            step_channel.start_stop_channel.evaluate(
+                self.step_global_parameters.step_points.value as usize,
+                self.step_global_parameters.list_step,
+            );
         }
         for sweep_channel in &mut self.sweep_channels {
-            sweep_channel
-                .start_stop_channel
-                .evaluate(self.sweep_global_parameters.sweep_points.value as usize);
+            sweep_channel.start_stop_channel.evaluate(
+                self.sweep_global_parameters.sweep_points.value as usize,
+                self.sweep_global_parameters.list_sweep,
+            );
         }
     }