specify lens type in los integration

lenstools/pipeline/settings.py

@@ -389,6 +389,7 @@ def _init_commmon(self):
 		self.format = "fits"
 		self.plane_format = "fits"
 		self.plane_name_format = "snap{0}_potentialPlane{1}_normal{2}.{3}"
+		self.lens_type = "PotentialPlane"
 
 		self.map_resolution = 128
 		self.map_angle = 1.6 * u.deg
@@ -460,6 +461,11 @@ def _read_common(self,options,section):
 			self.plane_name_format = options.get(section,"plane_name_format")
 		except NoOptionError:
 			pass
+
+		try:
+			self.lens_type = options.get(section,"lens_type")
+		except NoOptionError:
+			pass
 
 		self.map_resolution = options.getint(section,"map_resolution")
 

lenstools/scripts/raytracing.py

@@ -17,7 +17,7 @@
 from lenstools import ConvergenceMap,OmegaMap,ShearMap
 from lenstools.catalog import Catalog,ShearCatalog
 
-from lenstools.simulations.raytracing import RayTracer
+from lenstools.simulations.raytracing import RayTracer,DensityPlane
 from lenstools.pipeline.simulation import SimulationBatch
 from lenstools.pipeline.settings import MapSettings,TelescopicMapSettings,CatalogSettings
 
@@ -544,7 +544,12 @@ def losIntegrate(pool,batch,settings,batch_id):
 	for rloc,r in enumerate(range(first_map_realization,last_map_realization)):
 
 		#Instantiate the RayTracer
-		tracer = RayTracer()
+		if settings.lens_type=="PotentialPlane":
+			tracer = RayTracer()
+		elif settings.lens_type=="DensityPlane":
+			tracer = RayTracer(lens_type=DensityPlane)
+		else:
+			raise ValueError("Lens type {0} not recognized!".format(settings.lens_type))
 
 		#Force garbage collection
 		gc.collect()