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

Merge branch 'master' of ssh://bitbucket.org/cosmicvoids/void_identification

Browse source
This commit is contained in:
Guilhem Lavaux 2012-11-30 09:46:18 -05:00
commit 14d7e44572
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
c_tools/mock/loaders/multidark_loader.cpp
View file

@ -63,8 +63,7 @@ public:
fp >> simu->Id[i] >> simu->Pos[0][i] >> simu->Pos[1][i]
>> simu->Pos[2][i] >> simu->Vel[2][i];
uniqueID[i] = 1;
//uniqueID[i] = 1 * simu->Id[i];
uniqueID[i] = simu->Id[i];
if (simu->Id[i] == -99 &&
simu->Pos[0][i] == -99 && simu->Pos[1][i] == -99 &&

9
pipeline/pipeline_source/prepareCatalogs.in.py
View file

@ -327,13 +327,12 @@ if (args.script or args.all) and dataFormat == "multidark":
minRadius = 2*int(np.ceil(lbox/numPart**(1./3.)))
if dataFormat == "multidark":
setName = prefix+"halos_min"+str(minHaloMass)
writeScript(setName, "md.halos_min"+str(minHaloMass)+"_z",
setName = prefix+"halos_min"+str(minHaloMass)
writeScript(setName, prefix+"halos_min"+str(minHaloMass)+"_z",
scriptDir, catalogDir, fileNums,
redshifts,
numSubvolumes, numSlices, False, lbox, minRadius, omegaM)
writeScript(setName, "md.halos_min"+str(minHaloMass)+"_z",
writeScript(setName, prefix+"halos_min"+str(minHaloMass)+"_z",
scriptDir, catalogDir, fileNums,
redshifts,
numSubvolumes, numSlices, True, lbox, minRadius, omegaM)
@ -356,7 +355,7 @@ if args.halos or args.all:
numPart += 1
inFile.close()
sampleName = "md.halos_min"+str(minHaloMass)+"_z"+redshift
sampleName = prefix+"halos_min"+str(minHaloMass)+"_z"+redshift
outFile = open(catalogDir+"/"+sampleName+".dat", 'w')
outFile.write("%f\n" %(lbox))