From 78af446812325a7bb97d34a8feeb00b035af3e97 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 15 Apr 2016 12:22:57 -0500 Subject: [PATCH] fiducial omegaM is now correctly passed to generateFromCatalog --- c_tools/mock/generateFromCatalog.cpp | 6 +++--- c_tools/mock/generateFromCatalog.ggo | 2 ++ python_tools/void_python_tools/backend/launchers.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/c_tools/mock/generateFromCatalog.cpp b/c_tools/mock/generateFromCatalog.cpp index b10c1f1..badfa9c 100644 --- a/c_tools/mock/generateFromCatalog.cpp +++ b/c_tools/mock/generateFromCatalog.cpp @@ -115,7 +115,7 @@ void loadData(const string& fname, NYU_VData & data) } void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data, - bool useComoving) + bool useComoving, double omegaM) { double d2r = M_PI/180; @@ -126,7 +126,7 @@ void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data, int numZ = 1000, iZ; size_t nEval; - expanParams.Om = 0.27; + expanParams.Om = omegaM; expanParams.w0 = -1.0; expanParams.wa = 0.0; expanF.params = &expanParams; @@ -589,7 +589,7 @@ int main(int argc, char **argv) cout << "Placing galaxies..." << endl; generateGalaxiesInCube(data, output_data, args_info.useComoving_flag); generateSurfaceMask(args_info, mask, pixel_list, full_mask_list, - data, output_data); + data, output_data, args_info.omegaM); saveForZobov(output_data, args_info.output_arg, args_info.params_arg); // saveData(output_data); diff --git a/c_tools/mock/generateFromCatalog.ggo b/c_tools/mock/generateFromCatalog.ggo index 239ffa4..169cf91 100644 --- a/c_tools/mock/generateFromCatalog.ggo +++ b/c_tools/mock/generateFromCatalog.ggo @@ -15,3 +15,5 @@ option "output" - "Filename of particle datafile" string required option "params" - "Output parameters of the datacube" string required option "useComoving" - "Convert to real space using LCDM cosmology" flag off + +option "omegaM" - "Omega Matter for fiducial cosmology" double optional default="0.27" diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index d6726e4..11849a7 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -81,10 +81,11 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, density_fake %g %s %s + omegaM %g """ % (datafile, maskFile, outputFile, zobovDir+"/zobov_slice_"+sampleName+".par", sample.zBoundary[0], sample.zBoundary[1], sample.fakeDensity, - useComovingFlag, inputParameterFlag) + useComovingFlag, inputParameterFlag, sample.omegaM) parmFile = os.getcwd()+"/generate_"+sample.fullName+".par"