Changeset 13630 for fact/tools/pyscripts

Timestamp:

05/10/12 08:44:28 (12 years ago)

Author:

neise

Message:

return_dict=True is now default

File:

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

fact/tools/pyscripts/pyfact/pyfact.py

@@ -85 +85 @@
                 user_action_calib=lambda acal_data, data, blm, tom, gm, scells, nroi: None,
                 baseline_file_name='',
-                return_dict = None,
+                return_dict = True,
                 do_calibration = True,
                 use_CalFactFits = True):
@@ -101 +101 @@
         # manual implementation of default value, but I need to find out
         # if the user of this class is aware of the new option
-        if return_dict == None:
-            print 'Warning: Rawdata.__init__() has a new option "return_dict"'
-            print 'the default value of this option is False, so nothing changes for you at the moment.'
-            print
-            print 'you probably want, to get a dictionary out of the next() method anyway'
-            print ' so please change your scripts and set this option to True, for the moment'
-            print 'e.g. like this: run = RawData(data_filename, calib_filename, return_dict = True)'
-            print "after a while, the default value, will turn to True .. so you don't have to give the option anymore"
-            print 'and some time later, the option will not be supported anymore'
-            return_dict = False
+        if return_dict == False:
+            print 'DEPRECATION WARNING:'
+            print 'you are using RawData in a way, which is nor supported anymore.'
+            print ' Please set: return_dict = True, in the __init__ call'
         self.return_dict = return_dict
         self.use_CalFactFits = use_CalFactFits