Changeset 12977 for fact/tools/pyscripts/pyfact/SignalGenerator.py

Timestamp:

03/01/12 08:29:54 (13 years ago)

Author:

neise

Message:

debugged wrong handling of option_str in __init__

File:

• fact/tools/pyscripts/pyfact/SignalGenerator.py (modified) (2 diffs)

fact/tools/pyscripts/pyfact/SignalGenerator.py

@@ -55 +55 @@
 
     def __call__(self, option_str = ''):
-        self.option_str = option_str.lower()
-        if self.option_str:
+        if option_str:
+            self.option_str = option_str.lower()
             self.options = make_options_from_str(self.option_str)
             self.parse_options()
@@ -120 +120 @@
 if __name__ == '__main__':
     """ test the class """
-    myGenerator = SignalGenerator()
-    sig = myGenerator('len 100 noise 0.3 bsl -2.5 step 20.3 12 24 triangle 10.2 50 10 30 spike 2 50. 20 50')
+    myGenerator = SignalGenerator('len 100 noise 0.3 bsl -2.5 step 20.3 12 24 triangle 10.2 50 10 30 spike 2 50. 20 50')
+    sig = myGenerator()
     print myGenerator
-    plotter(sig, myGenerator.option_str)
+    plotter(sig, myGenerator.option_str)