avoid saving all pyfai internal matrices by default
This commit is contained in:
		
							parent
							
								
									0ad7587ede
								
							
						
					
					
						commit
						35757665ad
					
				| 
						 | 
					@ -218,7 +218,7 @@ def removeBackground(data,qlims=(0,10),max_iter=30,background_regions=[],force=F
 | 
				
			||||||
  return data
 | 
					  return data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def doFolder(folder,files='*.edf*',nQ = 1500,force=False,mask=None,dark=10,norm='auto',
 | 
					def doFolder(folder,files='*.edf*',nQ = 1500,force=False,mask=None,dark=10,norm='auto',save_pyfai=False,
 | 
				
			||||||
             saveChi=True,poni='pyfai.poni',storageFile='auto',save=True,diagnostic=None,skip_first=0,last=None):
 | 
					             saveChi=True,poni='pyfai.poni',storageFile='auto',save=True,diagnostic=None,skip_first=0,last=None):
 | 
				
			||||||
  """ calc 1D curves from files in folder, returning a dictionary of stuff
 | 
					  """ calc 1D curves from files in folder, returning a dictionary of stuff
 | 
				
			||||||
      nQ    : number of Q-points (equispaced)
 | 
					      nQ    : number of Q-points (equispaced)
 | 
				
			||||||
| 
						 | 
					@ -227,6 +227,7 @@ def doFolder(folder,files='*.edf*',nQ = 1500,force=False,mask=None,dark=10,norm=
 | 
				
			||||||
      mask  : can be a list of [filenames|array of booleans|mask string]
 | 
					      mask  : can be a list of [filenames|array of booleans|mask string]
 | 
				
			||||||
              pixels that are True are dis-regarded
 | 
					              pixels that are True are dis-regarded
 | 
				
			||||||
      saveChi: self-explanatory
 | 
					      saveChi: self-explanatory
 | 
				
			||||||
 | 
					      save_pyfai: save all pyfai's internal arrays (~110 MB)
 | 
				
			||||||
      poni  : could be:
 | 
					      poni  : could be:
 | 
				
			||||||
              → an AzimuthalIntegrator instance
 | 
					              → an AzimuthalIntegrator instance
 | 
				
			||||||
              → a filename that will be look for in
 | 
					              → a filename that will be look for in
 | 
				
			||||||
| 
						 | 
					@ -285,6 +286,7 @@ def doFolder(folder,files='*.edf*',nQ = 1500,force=False,mask=None,dark=10,norm=
 | 
				
			||||||
    ret = dict(q=q,folder=folder,files=files,data=data,err=err,
 | 
					    ret = dict(q=q,folder=folder,files=files,data=data,err=err,
 | 
				
			||||||
          data_orig=data.copy(),err_orig=err.copy(),q_orig=q.copy(),
 | 
					          data_orig=data.copy(),err_orig=err.copy(),q_orig=q.copy(),
 | 
				
			||||||
          pyfai=ai_as_dict(ai),pyfai_info=ai_as_str(ai),mask=mask)
 | 
					          pyfai=ai_as_dict(ai),pyfai_info=ai_as_str(ai),mask=mask)
 | 
				
			||||||
 | 
					    if not save_pyfai: del ret['pyfai']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # add info from diagnostic if provided
 | 
					    # add info from diagnostic if provided
 | 
				
			||||||
    if diagnostic is not None:
 | 
					    if diagnostic is not None:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue