Index: park_integration/test/Fitting.py
===================================================================
--- park_integration/test/Fitting.py	(revision 1d02586feaebac5162bc206b0b4c7da46ffe6bcb)
+++ 	(revision )
@@ -1,143 +1,0 @@
-#class Fitting
-from sans.guitools.plottables import Data1D
-from Loader import Load
-from scipy import optimize
-from ScipyFitting import ScipyFit
-from ParkFitting import ParkFit
-
-
-class Fit:
-    """ 
-        Wrap class that allows to select the fitting type 
-    """  
-    def __init__(self):
-        
-        # To initialize a type of Fit
-        self._engine=None
-          
-    def fit_engine(self,word):
-        """
-            Select the type of Fit 
-            @param word: the keyword to select the fit type 
-        """
-        if word=="scipy":
-            self._engine=ScipyFit()
-        elif word=="park":
-            self._engine=ParkFit()
-        else:
-            raise ValueError, "enter the keyword scipy or park"
-    def returnEngine(self):
-        return self._engine
-    
-    def fit(self,pars, qmin=None, qmax=None):
-        """ Do the fit """
-      
-    def set_model(self,model,Uid):
-        """ Set model """
-       
-    def set_data(self,data,Uid):
-        """ Receive plottable and create a list of data to fit"""
-            
-    def get_model(self,Uid):
-        """ return list of data"""
-    
-    def set_param(self,model, pars):
-        """ Recieve a dictionary of parameter and save it """
-   
-    def add_constraint(self, constraint):
-        """ User specify contraint to fit """
-        
-    def get_constraint(self):
-        """ return the contraint value """
-  
-    def set_constraint(self,constraint):
-        """ 
-            receive a string as a constraint
-            @param constraint: a string used to constraint some parameters to get a 
-                specific value
-        """
-if __name__ == "__main__": 
-    load= Load()
-    # test scipy 
-    """test fit one data set one model with scipy """
-    #load data 
-    load.set_filename("testdata_line.txt")
-    load.set_values()
-    data1 = Data1D(x=[], y=[], dx=None,dy=None)
-    data1.name = "data1"
-    load.load_data(data1)
-    #choose a model
-    from sans.guitools.LineModel import LineModel
-    model  = LineModel()
-    #Create a Fit engine
-    fitter =Fit()
-    fitter.fit_engine('scipy')
-    engine = fitter.returnEngine()
-    
-    #set the model
-    engine.set_model(model,1)
-    engine.set_data(data1,1)
-    
-    print"fit only one data SCIPY:",engine.fit({'A':2,'B':1},None,None)
-    
-    
-    """ test fit one data set one model with park """
-    fitter.fit_engine('scipy')
-    engine = fitter.returnEngine()
-    #set the model
-    engine.set_model(model,1)
-    engine.set_data(data1,1)
-    
-    print"fit only one data PARK:",engine.fit({'A':2,'B':1},None,None)
-    
-    
-    """test fit with 2 data and one model SCIPY:"""
-    # reinitialize the fitter
-    fitter =Fit()
-    #create an engine
-    fitter.fit_engine("scipy")
-    engine=fitter.returnEngine()
-    #set the model for fit
-    engine.set_model(model,2 )
-    #load 1 st data
-    load.set_filename("testdata1.txt")
-    load.set_values()
-    data2 = Data1D(x=[], y=[], dx=None,dy=None)
-    data2.name = "data2"
-    load.load_data(data2)
-    #load  2nd data
-    load.set_filename("testdata2.txt")
-    load.set_values()
-    data3 = Data1D(x=[], y=[], dx=None,dy=None)
-    data3.name = "data2"
-    load.load_data(data3)
-    
-    #set data in the engine
-    engine.set_data(data2,2)
-    engine.set_data(data3,2)
-    print"fit two data SCIPY:",engine.fit({'A':2,'B':1},None,None)
-    
-    """ test fit with 2 data and one model PARK:"""
-    fitter.fit_engine("park")
-    engine=fitter.returnEngine()
-    #set the model for fit
-    engine.set_model(model,2 )
-    #load 1 st data
-    load.set_filename("testdata1.txt")
-    load.set_values()
-    data2 = Data1D(x=[], y=[], dx=None,dy=None)
-    data2.name = "data2"
-    load.load_data(data2)
-    #load  2nd data
-    load.set_filename("testdata2.txt")
-    load.set_values()
-    data3 = Data1D(x=[], y=[], dx=None,dy=None)
-    data3.name = "data2"
-    load.load_data(data3)
-    
-    #set data in the engine
-    engine.set_data(data2,2)
-    engine.set_data(data3,2)
-    print"fit two data PARK:",engine.fit({'A':2,'B':1},None,None)
-    
-  
Index: park_integration/test/Loader.py
===================================================================
--- park_integration/test/Loader.py	(revision 1d02586feaebac5162bc206b0b4c7da46ffe6bcb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-# class Loader  to load any king of file
-import wx
-import string,numpy
-class Load:
-    """
-        This class is loading values from given file or value giving by the user
-    """
-    
-    def _init_(self,x=None,y=None,dx=None,dy=None):
-        # variable to store loaded values
-        self.x = x
-        self.y = y
-        self.dx = dx
-        self.dy = dy
-        self.filename = None
-        
-    def set_filename(self,path=None):
-        """
-            Store path into a variable.If the user doesn't give a path as a parameter a pop-up
-            window appears to select the file.
-            @param path: the path given by the user
-        """
-        self.filename = path
-       
-
-    def get_filename(self):
-        """ return the file's path"""
-        return self.filename
-    
-    def set_values(self):
-        """ Store the values loaded from file in local variables """
-        if not self.filename == None:
-            input_f =  open(self.filename,'r')
-            buff = input_f.read()
-            lines = buff.split('\n')
-            self.x=[]
-            self.y=[]
-            self.dx = [] 
-            self.dy=[]
-            for line in lines:
-                try:
-                    toks = line.split()
-                    x = float(toks[0])
-                    y = float(toks[1])
-                    dy = float(toks[2])
-                    
-                    self.x.append(x)
-                    self.y.append(y)
-                    self.dy.append(dy)
-                    self.dx = numpy.zeros(len(self.x))
-                except:
-                    print "READ ERROR", line
-            
-            
-            # Sanity check
-            if not len(self.x) == len(self.dx):
-                raise ValueError, "x and dx have different length"
-            if not len(self.y) == len(self.dy):
-                raise ValueError, "y and dy have different length"
-            
-            
-    def get_values(self):
-        """ Return x, y, dx, dy """
-        return self.x,self.y,self.dx,self.dy
-    
-    def load_data(self,data):
-        """ Return plottable """
-        #load data
-        data.x = self.x
-        data.y = self.y
-        data.dx = self.dx
-        data.dy =self.dy
-        #Load its View class
-        #plottable.reset_view()
-       
-    
-if __name__ == "__main__": 
-    load= Load()
-    load.set_filename("testdata_line.txt")
-    print load.get_filename() 
-    load.set_values()
-    print load.get_values()
-    
-            
