Ignore:
Timestamp:
08/02/10 10:51:45 (14 years ago)
Author:
Malte Marquarding
Message:

merge -r1774:1797 from alma to newfiller

Location:
branches/newfiller
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/newfiller

  • branches/newfiller/python/asapfitter.py

    r1757 r1798  
    127127        return
    128128
    129     #@print_log_dec
     129    @print_log_dec
    130130    def fit(self, row=0, estimate=False):
    131131        """
     
    222222                self.data._addfit(fit,self._fittedrow)
    223223
    224     #@print_log_dec
     224    @print_log_dec
    225225    def set_parameters(self,*args,**kwargs):
    226226        """
     
    544544        return self.fitter.getfit()
    545545
    546     #@print_log_dec
     546    @print_log_dec
    547547    def commit(self):
    548548        """
     
    573573        return scan
    574574
    575     #@print_log_dec
     575    @print_log_dec
    576576    def plot(self, residual=False, components=None, plotparms=False,
    577577             filename=None):
     
    674674        print_log()
    675675
    676     #@print_log_dec
     676    @print_log_dec
    677677    def auto_fit(self, insitu=None, plot=False):
    678678        """
Note: See TracChangeset for help on using the changeset viewer.