Allow negative voltages in hooke.driver.picoforce.PicoForceDriver._translate_block_info
authorW. Trevor King <wking@drexel.edu>
Wed, 19 May 2010 06:47:37 +0000 (02:47 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 19 May 2010 06:47:37 +0000 (02:47 -0400)
hooke/driver/picoforce.py

index a203fcb4adb872ede1cd8cc40e75039e92f984b8..4ab2008a34de02f87bfbc2f60497c44c65e1e4d7 100644 (file)
@@ -261,7 +261,7 @@ class PicoForceDriver (Driver):
         ret['columns'] = ['z piezo (m)', 'deflection (m)']
 
         volt_re = re.compile(
-            'V \[Sens. (\w*)\] \(([.0-9]*) V/LSB\) ([.0-9]*) V')
+            'V \[Sens. (\w*)\] \(([.0-9]*) V/LSB\) (-?[.0-9]*) V')
         match = volt_re.match(z_piezo_info['@4:Z scale'])
         assert match.group(1) == 'ZSensorSens', z_piezo_info['@4:Z scale']
         ret['z piezo sensitivity (V/bit)'] = float(match.group(2))