Updating CRL object function descriptions

100idPyApp/python/pyCRL_system.py

@@ -71,13 +71,24 @@ class focusingSystem():
 
         '''
         Description:
+			Focusing system object -- either single CRL, double CRL or single
+			CRL + KB.
         
         Parameters:
-            ...             : ...
+           crl_setup		: ... 
+							  Default: None 
+           beam_config		: ... 
+							  Default: DEFAULT_CONFIG['beam']
+           beamline_config	: ... 
+							  Default: DEFAULT_CONFIG['beamline']
+           crl_configs		: ... 
+							  Default: DEFAULT_CONFIG['crl'] 
+           kb_config		: ... 
+							  Default: DEFAULT_CONFIG['kb']
+           sysType			: ... 
+							  Default: SYSTEM_TYPE.singleCRL
             
-        Returns:
-            ...             : ...
-        
+       
         '''
 
         self.verbose = True
@@ -186,7 +197,8 @@ class focusingSystem():
 
     def setupSourceEnergyDependent(self):
         '''
-        Fill in later
+        Sets various energy dependent source parameters. Called whenever energy 
+        is updated
         '''    
         self.beam['sigmaH'] =  (self.sigmaH_e**2 +  self.wl*self.L_und/2/np.pi/np.pi)**0.5
         self.beam['sigmaV'] =  (self.sigmaV_e**2 +  self.wl*self.L_und/2/np.pi/np.pi)**0.5
@@ -255,7 +267,6 @@ class focusingSystem():
             self.slits['KB'] = {'hor':0,'vert':0}
 
         
-    #TODO how to handle OE '1', '2', 'kb'; not 1, 2
     def updateSlitSize(self, size, oe, slit):
         '''
         Slit size updates are propagated to CRL object from EPICS.  The beam