Merge 529760b into d90a333

BBN-Q · Nov 4, 2019 · a08c8f8 · a08c8f8
2 parents d90a333 + 529760b
commit a08c8f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/QGL/ChannelLibraries.py b/QGL/ChannelLibraries.py
@@ -150,7 +150,7 @@ def ls(self):
     def cal_ls(self):
         ''' List of auspex.pulse_calibration results '''
         caldb = bbndb.calibration.Calibration
-        c = self.session.query(caldb.sample_id, caldb.name, caldb.value, caldb.date).order_by(-caldb.sample_id).all()
+        c = self.session.query(caldb.id, caldb.sample_id, caldb.name, caldb.value, caldb.date).order_by(-caldb.id).all()
         table_code = ""
         for i, (sample_id, name, value, time) in enumerate(c):
             d,t  = str(time).split()

diff --git a/QGL/PulseSequencer.py b/QGL/PulseSequencer.py
@@ -47,7 +47,11 @@ def __new__(cls, label, channel, shapeParams, amp=1.0, phase=0, frameChange=0, i
         for param in requiredParams:
             if param not in shapeParams.keys():
                 raise NameError("shapeParams must include {0}".format(param))
-        isTimeAmp = (shapeParams['shape_fun'] == PulseShapes.constant)
+        if isinstance(shapeParams['shape_fun'],str):
+            shape = getattr(PulseShapes, shapeParams['shape_fun'])
+        else:
+            shape = shapeParams['shape_fun']
+        isTimeAmp = (shape == PulseShapes.constant)
         isZero = (amp == 0)
         return super(cls, Pulse).__new__(cls, label, channel,
                                          shapeParams['length'], amp, phase,