Changeset 1627 for branches/alma

Timestamp:

09/03/09 15:15:48 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix.

asaplog.push( msg ) in the except section is not correct.
I have modified it to asaplog.push( msg.message ).

Location:

branches/alma/python

Files:

• __init__.py (modified) (1 diff)
• asapfitter.py (modified) (2 diffs)
• asaplotbase.py (modified) (1 diff)
• scantable.py (modified) (6 diffs)

branches/alma/python/__init__.py

@@ -233 +233 @@
         except ValueError, msg:
             #print ('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg))
-            asaplog.push('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg))
+            asaplog.push('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg.message))
             print_log('WARN')
             continue

branches/alma/python/asapfitter.py

@@ -165 +165 @@
             if len(ps) == 0 or estimate:
                 self.fitter.estimate()
-        try:
-            fxdpar = list(self.fitter.getfixedparameters())
+        try:            fxdpar = list(self.fitter.getfixedparameters())
             if len(fxdpar) and fxdpar.count(0) == 0:
                  raise RuntimeError,"No point fitting, if all parameters are fixed."
@@ -179 +178 @@
                 #print msg
                 print_log()
-                asaplog.push(msg)
+                asaplog.push(msg.message)
                 print_log('ERROR')
             else:

branches/alma/python/asaplotbase.py

@@ -450 +450 @@
                 #print 'Failed to save %s: Error msg was\n\n%s' % (fname, err)
                 print_log()
-                asaplog.push('Failed to save %s: Error msg was\n\n%s' % (fname, msg))
+                asaplog.push('Failed to save %s: Error msg was\n\n%s' % (fname, msg.message))
                 print_log( 'ERROR' )
                 return

branches/alma/python/scantable.py

@@ -765 +765 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
             else:
@@ -814 +814 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
                 return
@@ -848 +848 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
                 return
@@ -1230 +1230 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
                 return
@@ -1457 +1457 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
                 return
@@ -1537 +1537 @@
                 #print msg
                 print_log()
-                asaplog.push( msg )
+                asaplog.push( msg.message )
                 print_log( 'ERROR' )
                 return