[Yt-svn] yt-commit r1176 - trunk/yt/extensions/lightcone

[britton at wrangler.dreamhost.com]

Author: britton
Date: Sat Feb 21 15:18:35 2009
New Revision: 1176
URL: http://yt.spacepope.org/changeset/1176

Log:
Add **kwargs to HaloMask functions to allow access to HaloProfiler options, 
such as using old style hop output files.


Modified:
   trunk/yt/extensions/lightcone/HaloMask.py

Modified: trunk/yt/extensions/lightcone/HaloMask.py
==============================================================================
--- trunk/yt/extensions/lightcone/HaloMask.py	(original)
+++ trunk/yt/extensions/lightcone/HaloMask.py	Sat Feb 21 15:18:35 2009
@@ -31,7 +31,7 @@
 
 #### Note: assumption of box width 1.  I'll fix it someday.
 
-def MakeLightConeHaloMask(lightCone,HaloMaskParameterFile,cube_file=None,mask_file=None):
+def MakeLightConeHaloMask(lightCone,HaloMaskParameterFile,cube_file=None,mask_file=None,**kwargs):
     "Make a boolean mask to cut clusters out of light cone projections."
 
     pixels = int(lightCone.lightConeParameters['FieldOfViewInArcMinutes'] * 60.0 / \
@@ -41,7 +41,7 @@
 
     # Loop through files in light cone solution and get virial quantities.
     for slice in lightCone.lightConeSolution:
-        hp = HaloProfiler(slice['filename'],HaloMaskParameterFile)
+        hp = HaloProfiler(slice['filename'],HaloMaskParameterFile,**kwargs)
         hp._LoadVirialData()
 
         lightConeMask.append(_MakeSliceMask(slice,hp.virialQuantities,pixels))
@@ -65,14 +65,14 @@
 
     return lightConeMask
 
-def MakeLightConeHaloMap(lightCone,HaloMaskParameterFile,map_file='halo_map.dat'):
+def MakeLightConeHaloMap(lightCone,HaloMaskParameterFile,map_file='halo_map.dat',**kwargs):
     "Make a text list of location of halos in a light cone image with virial quantities."
 
     haloMap = []
 
     # Loop through files in light cone solution and get virial quantities.
     for slice in lightCone.lightConeSolution:
-        hp = HaloProfiler(slice['filename'],HaloMaskParameterFile)
+        hp = HaloProfiler(slice['filename'],HaloMaskParameterFile,**kwargs)
         hp._LoadVirialData()
 
         haloMap.extend(_MakeSliceHaloMap(slice,hp.virialQuantities))