From: W. Trevor King <wking@drexel.edu>
Date: Wed, 24 Mar 2010 19:16:23 +0000 (-0400)
Subject: Removed ineffectual logging code, bumped to v0.2
X-Git-Tag: v0.3~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af785406ccb1d97746c76abb2edb0e25d95402a0;p=pypid.git

Removed ineffectual logging code, bumped to v0.2
---

diff --git a/temperature.py b/temperature.py
index 3028a31..4874bf0 100644
--- a/temperature.py
+++ b/temperature.py
@@ -1,13 +1,11 @@
 import Melcor
 import time
-import data_logger
 import stripchart
 
-log_dir = "/home/wking/rsrch/data/temperature"
+VERSION = "0.2"
 
 # buzzwords: 'integrator windup' for integral term built up during a slow approach.
 
-
 class error (Exception) :
     "Errors with the temperature controller"
     pass
@@ -531,7 +529,7 @@ class tempController :
     	err = self.T.write(register, value)
     	if err != 0 :
     		raise errorMelcor
-    def getDeadtimeData(self, num_oscillations=10, curHysteresis=0.8, log=True) :
+    def getDeadtimeData(self, num_oscillations=10, curHysteresis=0.8) :
         orig_heat_gains = self.getHeatingGains()
         orig_cool_gains = self.getCoolingGains()
         if self.verbose :
@@ -590,8 +588,6 @@ class tempController :
             print " Restoring gains"
         self.setHeatingGains(*orig_heat_gains)
         self.setCoolingGains(*orig_cool_gains)
-        if log == True :
-            log = 1# MARK
     def time_getTemp(self) :
         "Rough estimate timeing of getTemp(), takes me about 0.1s"
         start = time.time()