From b77f4f4e9e478c57bd2293e1d6cc6b015a2f4a12 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 30 Nov 2012 07:53:41 -0600 Subject: [PATCH 1/3] uniqueID now enabled for multidark --- c_tools/mock/loaders/multidark_loader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/c_tools/mock/loaders/multidark_loader.cpp b/c_tools/mock/loaders/multidark_loader.cpp index 9509c64..c13caeb 100644 --- a/c_tools/mock/loaders/multidark_loader.cpp +++ b/c_tools/mock/loaders/multidark_loader.cpp @@ -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 && From da7ed979c52a21fd364775ea5543712c93de3e83 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 30 Nov 2012 07:55:20 -0600 Subject: [PATCH 2/3] utility to retrieve the multidark catalog From 38a0e93ede0d2bfe1ef477f0319a6bbc41de0a49 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 30 Nov 2012 08:32:13 -0600 Subject: [PATCH 3/3] more general halo catalogs now supported --- pipeline/prepareCatalogs.in.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pipeline/prepareCatalogs.in.py b/pipeline/prepareCatalogs.in.py index e1daea4..ca300bc 100755 --- a/pipeline/prepareCatalogs.in.py +++ b/pipeline/prepareCatalogs.in.py @@ -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))