Added parser for gateset.

Author: nwittler

c3/c3objs.py

@@ -25,9 +25,12 @@ def __init__(self, name, desc="", comment="", params={}):
         self.name = name
         self.desc = desc
         self.comment = comment
-        self.params = params
+        self.params = {}
         for name, par in params.items():
-            self.params[name] = Quantity(**par)
+            if isinstance(par, Quantity):
+                self.params[name] = par
+            else:
+                self.params[name] = Quantity(**par)
 
 
 class Quantity:
@@ -56,8 +59,11 @@ class Quantity:
     def __init__(self, value, min_val, max_val, unit="undefined", symbol=r"\alpha"):
         if unit[-3:] == "2pi":
             pref = 2 * np.pi
+        elif unit[-2:] == "pi":
+            pref = np.pi
         else:
             pref = 1
+        self.pref = pref
         self.offset = np.array(min_val * pref)
         self.scale = np.abs(np.array(max_val * pref) - np.array(min_val * pref))
         try:
@@ -76,6 +82,16 @@ def __init__(self, value, min_val, max_val, unit="undefined", symbol=r"\alpha"):
             self.shape = ()
             self.length = 1
 
+    def asdict(self):
+        pref = self.pref
+        return {
+            "value": self.numpy(),
+            "min_val": self.offset / pref,
+            "max_val": (self.scale + self.offset) / pref,
+            "unit": self.unit,
+            "symbol": self.symbol
+        }
+
     def __add__(self, other):
         return self.numpy() + other
 
@@ -147,6 +163,7 @@ def set_value(self, val):
         if np.any(tmp < -1) or np.any(tmp > 1):
             # TODO choose which error to raise
             # raise Exception(f"Value {val} out of bounds for quantity.")
+            print(f"Value {val} out of bounds for quantity.")
             raise ValueError
             # TODO if we want we can extend bounds when force flag is given
         else:

c3/signal/gates.py

@@ -240,7 +240,7 @@ def __init__(
             channels: list = [],
             t_start: np.float64 = 0.0,
             t_end: np.float64 = 0.0,
-            ):
+    ):
         self.name = name
         self.t_start = t_start
         self.t_end = t_end

c3/signal/pulse.py

@@ -33,49 +33,47 @@ def __init__(
             comment: str = " ",
             params: dict = {},
             shape: types.FunctionType = None,
-            ):
-        super().__init__(
-            name=name,
-            desc=desc,
-            comment=comment,
-            params=params,
-            )
+    ):
         self.shape = shape
-        if 'amp' not in params:
-            params['amp'] = Qty(
+        params_default = {
+            'amp': Qty(
                 value=0.0,
                 min_val=-1.0,
                 max_val=+1.0,
                 unit="V"
-            )
-        if 'delta' not in params:
-            params['delta'] = Qty(
+            ),
+            'delta': Qty(
                 value=0.0,
                 min_val=-1.0,
                 max_val=+1.0,
                 unit="V"
-            )
-        if 'freq_offset' not in params:
-            params['freq_offset'] = Qty(
+            ),
+            'freq_offset': Qty(
                 value=0.0,
                 min_val=-1.0,
                 max_val=+1.0,
                 unit='Hz 2pi'
-            )
-        if 'xy_angle' not in params:
-            params['xy_angle'] = Qty(
+            ),
+            'xy_angle': Qty(
                 value=0.0,
                 min_val=-1.0,
                 max_val=+1.0,
                 unit='rad'
-            )
-        if 't_final' not in params:
-            params['t_final'] = Qty(
+            ),
+            't_final': Qty(
                 value=0.0,
                 min_val=-1.0,
                 max_val=+1.0,
                 unit="s"
             )
+        }
+        params_default.update(params)
+        super().__init__(
+            name=name,
+            desc=desc,
+            comment=comment,
+            params=params_default,
+        )
 
     def get_shape_values(self, ts, t_before=None):
         """Return the value of the shape function at the specified times.
@@ -96,7 +94,7 @@ def get_shape_values(self, ts, t_before=None):
             vals = self.shape(ts, self.params)
             mask = tf.cast(ts < t_final.numpy(), tf.float64)
         # With the offset, we make sure the signal starts with amplitude 0.
-        return vals*mask
+        return vals * mask
 
 
 @comp_reg_deco
@@ -109,10 +107,10 @@ def __init__(
             desc: str = " ",
             comment: str = " ",
             params: dict = {},
-            ):
+    ):
         super().__init__(
             name=name,
             desc=desc,
             comment=comment,
             params=params,
-            )
+        )

c3/system/chip.py

@@ -315,10 +315,6 @@ def __init__(self, **props):
             self.hamiltonian_func = h_func
         else:
             self.hamiltonian_func = hamiltonians[h_func]
-        params = props.pop("params", {})
-        self.params = params
-        for name, par in params.items():
-            self.params[name] = Quantity(**par)
         super().__init__(**props)
         self.Hs = {}
 
@@ -335,6 +331,7 @@ class Coupling(LineComponent):
         all physical components coupled via this specific coupling
 
     """
+
     def init_Hs(self, opers_list):
         self.Hs['strength'] = tf.constant(
             self.hamiltonian_func(opers_list), dtype=tf.complex128

c3/utils/parsers.py

@@ -63,7 +63,6 @@ def create_model(filepath: str) -> Model:
         line_components.append(
             chip.Coupling(**props)
         )
-        print(f"Creating coupling with\n {props}")
     for name, props in cfg["Drives"].items():
         props.update({"name": name})
         line_components.append(
@@ -91,8 +90,9 @@ def create_gateset(filepath: str) -> GateSet:
     for key, gate in cfg.items():
         if "mapto" in gate.keys():
             instr = copy.deepcopy(gateset.instructions[gate["mapto"]])
+            instr.name = key
             for drive_chan, comps in gate["drive_channels"].items():
-                for comp, props in comps:
+                for comp, props in comps.items():
                     for par, val in props["params"].items():
                         instr.comps[drive_chan][comp].params[par].set_value(val)
         else:

test/instructions.cfg

@@ -53,7 +53,7 @@
       "d1":{
         "gaussian": {
           "params":{
-            "xy_angle": 1.5617
+            "xy_angle": 0.5
           }
         }
       }
@@ -65,7 +65,7 @@
       "d1":{
         "gaussian": {
           "params":{
-            "xy_angle": 3.1415
+            "xy_angle": 1
           }
         }
       }
@@ -77,7 +77,7 @@
       "d1":{
         "gaussian": {
           "params":{
-            "xy_angle": 4.7
+            "xy_angle": -0.5
           }
         }
       }

test/test_quantity.py

@@ -0,0 +1,25 @@
+"""Unit tests for Quantity class"""
+
+import hjson
+from c3.c3objs import Quantity
+
+amp = Quantity(value=0.0, min_val=-1.0, max_val=+1.0, unit="V")
+amp_dict = {
+    'value': 0.0,
+    'min_val': -1.0,
+    'max_val': 1.0,
+    'unit': 'V',
+    'symbol': '\\alpha'
+}
+
+
+def test_qty_asdict() -> None:
+    assert amp.asdict() == amp_dict
+
+
+def test_qty_write_cfg() -> None:
+    print(hjson.dumps(amp.asdict()))
+
+
+def test_qty_read_cfg() -> None:
+    assert Quantity(**amp_dict).asdict() == amp.asdict()