Track source limit by power envelop (#40)

Handle for the case of over range

Author: pavannarayana

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

@@ -72,7 +72,7 @@ impl DataModel {
         // Deserialize the JSON string into a serde_json::Value
         match serde_json::from_str::<SweepModel>(&data) {
             Ok(mut sweep_model) => {
-                println!("Successfully deserialized JSON in server: {sweep_model:?}");
+                //println!("Successfully deserialized JSON in server: {sweep_model:?}");
                 sweep_model.sweep_config.evaluate();
 
                 //update sweep variable - required for actual script generation
@@ -135,7 +135,7 @@ impl DataModel {
     pub fn add_remove_channel(&mut self, ipc_data: IpcData) -> String {
         match serde_json::from_str::<SweepModel>(ipc_data.json_value.as_str()) {
             Ok(mut sweep_model) => {
-                println!("Successfully deserialized JSON in server: {sweep_model:?}");
+                //println!("Successfully deserialized JSON in server: {sweep_model:?}");
 
                 sweep_model.sweep_config.update_channel_devices();
                 let res: Vec<&str> = ipc_data.additional_info.split(',').collect();

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

@@ -47,8 +47,20 @@ impl Mpsu50Metadata {
         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
+        Self::add_1st_quadrant_curved_region(
+            10.0,
+            max_supported_voltage,
+            0.0001,
+            0.0,
+            &mut region_map_metadata,
+        ); //First quadrant curve
+        Self::add_3rd_quadrant_curved_region(
+            -10.0,
+            -max_supported_voltage,
+            -0.0001,
+            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
 
@@ -73,7 +85,7 @@ impl Mpsu50Metadata {
 
         while v1.abs() <= voltage_max.abs() {
             let v2 = v1 + step;
-            let i2 = voltage_max / v2.abs();
+            let i2 = 50.0 / v2.abs();
             region_map_metadata.add_region(1, v1, current, v2, i2);
             v1 += step;
         }
@@ -92,7 +104,7 @@ impl Mpsu50Metadata {
 
         while v1.abs() <= voltage_max.abs() {
             let v2 = v1 + step;
-            let i2 = voltage_max / v2.abs();
+            let i2 = -50.0 / v2.abs();
             region_map_metadata.add_region(1, v2, i2, v1, current);
             v1 += step;
         }

script-gen-ui/src/app/websocket.service.ts

@@ -24,7 +24,7 @@ export class WebSocketService {
     };
 
     this.socket.onmessage = (event) => {
-      console.log('Message received from server:', event.data);
+      //console.log('Message received from server:', event.data);
       this.messageSubject.next(event.data);
     };