guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fiducial omegaM is now correctly passed to generateFromCatalog

Browse source
This commit is contained in:
P.M. Sutter 2016-04-15 12:22:57 -05:00
parent 9485b2d720
commit 78af446812
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
c_tools/mock/generateFromCatalog.cpp
View file

@ -115,7 +115,7 @@ void loadData(const string& fname, NYU_VData & data)
} }
void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data, void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data,
bool useComoving) bool useComoving, double omegaM)
{ {
double d2r = M_PI/180; double d2r = M_PI/180;
@ -126,7 +126,7 @@ void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data,
int numZ = 1000, iZ; int numZ = 1000, iZ;
size_t nEval; size_t nEval;
expanParams.Om = 0.27; expanParams.Om = omegaM;
expanParams.w0 = -1.0; expanParams.w0 = -1.0;
expanParams.wa = 0.0; expanParams.wa = 0.0;
expanF.params = &expanParams; expanF.params = &expanParams;
@ -589,7 +589,7 @@ int main(int argc, char **argv)
cout << "Placing galaxies..." << endl; cout << "Placing galaxies..." << endl;
generateGalaxiesInCube(data, output_data, args_info.useComoving_flag); generateGalaxiesInCube(data, output_data, args_info.useComoving_flag);
generateSurfaceMask(args_info, mask, pixel_list, full_mask_list, 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); saveForZobov(output_data, args_info.output_arg, args_info.params_arg);
// saveData(output_data); // saveData(output_data);

2
c_tools/mock/generateFromCatalog.ggo
View file

@ -15,3 +15,5 @@ option "output" - "Filename of particle datafile" string required
option "params" - "Output parameters of the datacube" string required option "params" - "Output parameters of the datacube" string required
option "useComoving" - "Convert to real space using LCDM cosmology" flag off option "useComoving" - "Convert to real space using LCDM cosmology" flag off
option "omegaM" - "Omega Matter for fiducial cosmology" double optional default="0.27"

3
python_tools/void_python_tools/backend/launchers.py
View file

@ -81,10 +81,11 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
density_fake %g density_fake %g
%s %s
%s %s
omegaM %g
""" % (datafile, maskFile, outputFile, """ % (datafile, maskFile, outputFile,
zobovDir+"/zobov_slice_"+sampleName+".par", zobovDir+"/zobov_slice_"+sampleName+".par",
sample.zBoundary[0], sample.zBoundary[1], sample.fakeDensity, sample.zBoundary[0], sample.zBoundary[1], sample.fakeDensity,
useComovingFlag, inputParameterFlag) useComovingFlag, inputParameterFlag, sample.omegaM)
parmFile = os.getcwd()+"/generate_"+sample.fullName+".par" parmFile = os.getcwd()+"/generate_"+sample.fullName+".par"