Track source limit for a PSU (#39)

Co-authored-by: jharajeev55 <[email protected]>

Author: pavannarayana

kic-script-gen/src/back_end/data_model.rs

@@ -93,7 +93,7 @@ impl DataModel {
     pub fn process_data_from_saved_config(&mut self, data: String) -> String {
         match serde_json::from_str::<SweepModel>(&data) {
             Ok(mut sweep_model) => {
-                println!("Successfully deserialized saved JSON in server: {sweep_model:?}");
+                //println!("Successfully deserialized saved JSON in server: {sweep_model:?}");
                 sweep_model.sweep_config.evaluate();
 
                 self.sweep_model = sweep_model.clone();

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

@@ -22,8 +22,18 @@ impl Mpsu50Metadata {
 
         //TODO: verify for Trebuchet PSU (model: MPSU50-2ST)
         // Add ranges
-        base.add_range("source.levelv".to_string(), -50.1, 50.1);
-        base.add_range("source.leveli".to_string(), -5.0, 5.0);
+        let max_supported_voltage = 50.1;
+        let max_supported_current = 5.0;
+        base.add_range(
+            "source.levelv".to_string(),
+            -max_supported_voltage,
+            max_supported_voltage,
+        );
+        base.add_range(
+            "source.leveli".to_string(),
+            -max_supported_current,
+            max_supported_current,
+        );
 
         base.add_range("source.limiti".to_string(), 0.01, 5.1);
 
@@ -33,11 +43,14 @@ impl Mpsu50Metadata {
         // when pulse mode is off
         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, 50.0, 1.0);
-        region_map_metadata.add_region(1, 0.0, 0.0, 10.0, 5.0);
-        region_map_metadata.add_region(1, 0.0, 0.0, -10.0, -5.0);
-        region_map_metadata.add_region(1, 0.0, 0.0, -50.0, -1.0);
-        base.add_region_map("psu.region", region_map_metadata);
+
+        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);
+
+        Self::add_1st_quadrant_curved_region(10.0, 50.0, 0.001, 0.0, &mut region_map_metadata); //First quadrant curve
+        Self::add_3rd_quadrant_curved_region(-10.0, -50.0, -0.001, 0.0, &mut region_map_metadata); //Third quadrant curve
+
+        base.add_region_map("50 V", region_map_metadata); //Use source range to identify region map
 
         base.add_overrange_scale(1.002);
 
@@ -46,6 +59,44 @@ impl Mpsu50Metadata {
             // Initialize additional properties
         }
     }
+
+    fn add_1st_quadrant_curved_region(
+        voltage_start: f64,
+        voltage_max: f64,
+        step: f64,    // Use the step parameter to finely control the approximation
+        current: f64, // Fixed current for the curve
+        region_map_metadata: &mut RegionMapMetadata,
+    ) {
+        // Add region maps iteratively as small rectangles to approximate the curve
+
+        let mut v1 = voltage_start;
+
+        while v1.abs() <= voltage_max.abs() {
+            let v2 = v1 + step;
+            let i2 = voltage_max / v2.abs();
+            region_map_metadata.add_region(1, v1, current, v2, i2);
+            v1 += step;
+        }
+    }
+
+    fn add_3rd_quadrant_curved_region(
+        voltage_start: f64,
+        voltage_max: f64,
+        step: f64,    // Use the step parameter to finely control the approximation
+        current: f64, // Fixed current for the curve
+        region_map_metadata: &mut RegionMapMetadata,
+    ) {
+        // Add region maps iteratively as small rectangles to approximate the curve
+
+        let mut v1 = voltage_start;
+
+        while v1.abs() <= voltage_max.abs() {
+            let v2 = v1 + step;
+            let i2 = voltage_max / v2.abs();
+            region_map_metadata.add_region(1, v2, i2, v1, current);
+            v1 += step;
+        }
+    }
 }
 
 impl Metadata for Mpsu50Metadata {

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

@@ -277,6 +277,43 @@ impl CommonChanAttributes {
         }
     }
 
+    pub fn evaluate_source_limits(
+        &mut self,
+        start_value: &ParameterFloat,
+        stop_value: &ParameterFloat,
+    ) {
+        if let Some((min, max)) = self.get_range_limits(&self.device.metadata, ":MODE") {
+            if let Some(ref mut limiti) = self.source_limiti {
+                limiti.value = Self::limit(limiti.value, min, max);
+            }
+        }
+
+        if let Some(region_map) =
+            self.get_region_map(&self.device.metadata, &self.source_range.value)
+        {
+            //Do this only to the PSU for now
+            let mut limit_value = start_value.value;
+            if stop_value.value.abs() > limit_value.abs() {
+                //Use the largest absolute value
+                limit_value = stop_value.value;
+            }
+            if let Some(ref mut limiti) = self.source_limiti {
+                let curr_limit = region_map.get_current_limit(limit_value);
+                limiti.value =
+                    Self::limit(limiti.value, curr_limit.get_min(), curr_limit.get_max());
+                println!("Evaluated current limit value is {:?}", limiti.value);
+            }
+        }
+
+        if let Some((min, max)) = self.get_range_limits(&self.device.metadata, "source.limitv") {
+            if let Some(ref mut limitv) = self.source_limitv {
+                limitv.value = Self::limit(limitv.value, min, max);
+            }
+        }
+
+        println!("Source range value is {:?}", self.source_range.value);
+    }
+
     fn limit(mut value: f64, min: f64, max: f64) -> f64 {
         if value >= min && value <= max {
             return value;

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

@@ -65,6 +65,8 @@ impl StartStopChannel {
         //List evaluation
 
         self.update_list(list_size);
+        self.common_chan_attributes
+            .evaluate_source_limits(&self.start, &self.stop);
     }
 
     fn update_list(&mut self, list_size: usize) {