From: W. Trevor King Date: Sat, 21 Aug 2010 18:47:02 +0000 (-0400) Subject: Fix to plugin experiment checks after 8687bbf30e87. X-Git-Url: http://git.tremily.us/?p=hooke.git;a=commitdiff_plain;h=b0ff44bbe4a8821f1a1703d45b70a2fab8d56d0f Fix to plugin experiment checks after 8687bbf30e87. --- diff --git a/hooke/plugin/convfilt.py b/hooke/plugin/convfilt.py index ff9e68c..a5780e9 100644 --- a/hooke/plugin/convfilt.py +++ b/hooke/plugin/convfilt.py @@ -149,7 +149,7 @@ class ConvolutionPeaksCommand (Command): deflection arrays. """ curve = params['curve'] - if curve.info['experiment'] != VelocityClamp: + if not isinstance(curve.info['experiment'], VelocityClamp): raise Failure('%s operates on VelocityClamp experiments, not %s' % (self.name, curve.info['experiment'])) data = None diff --git a/hooke/plugin/flatfilt.py b/hooke/plugin/flatfilt.py index 63a9967..79300cd 100644 --- a/hooke/plugin/flatfilt.py +++ b/hooke/plugin/flatfilt.py @@ -170,7 +170,7 @@ Name for storing the list of peaks in the `.info` dictionary. deflection arrays. """ curve = self._curve(hooke=hooke, params=params) - if curve.info['experiment'] != VelocityClamp: + if not isinstance(curve.info['experiment'], VelocityClamp): raise Failure('%s operates on VelocityClamp experiments, not %s' % (self.name, curve.info['experiment'])) for key,value in params.items():