fixed support for masked mock data sets; now skips over comments in halo catalogs

c_tools/mock/generateFromCatalog.cpp

@@ -528,7 +528,7 @@ int main(int argc, char **argv)
   
   generateFromCatalog_conf_print_version();
 
-  cout << "Loading NYU data..." << endl;
+  cout << "Loading data " << args_info.catalog_arg << "..." << endl;
   vector<NYU_Data> data;
   Healpix_Map<float> o_mask;
   vector<int> pixel_list;

pipeline/datasets/multidark.py

@@ -68,6 +68,7 @@ haloFileVXCol = 3
 haloFileVYCol = 4
 haloFileVZCol = 5
 haloFileColSep = ','
+haloFileNumComLines = 0
 
 # adjust these two parameters given the memory contraints on your system:
 #   numZobovDivisions: how many sub-volumes per dimension will zobov process

python_tools/pipeline_source/prepareCatalogs.in.py

@@ -316,7 +316,8 @@ if (args.script or args.all) and haloFileBase != "":
     dataFile = catalogDir+haloFileBase+fileNums[0]
     inFile = open(dataFile, 'r')
     numPart = 0
-    for line in inFile: 
+    for (iLine, line) in enumerate(inFile): 
+      if iLine < haloFileNumComLines: continue
       line = line.split(haloFileColSep)
       if minHaloMass == "none" or float(line[haloFileMCol]) > minHaloMass:
         numPart += 1
@@ -346,7 +347,8 @@ if (args.halos or args.all) and haloFileBase != "":
       dataFile = catalogDir+haloFileBase+fileNums[iRedshift]
       inFile = open(dataFile, 'r')
       numPart = 0
-      for line in inFile: 
+      for (iLine, line) in enumerate(inFile): 
+        if iLine < haloFileNumComLines: continue
         line = line.split(haloFileColSep)
         if minHaloMass == "none" or float(line[haloFileMCol]) > minHaloMass:
           numPart += 1

python_tools/void_python_tools/backend/launchers.py

@@ -32,7 +32,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
     if sample.dataFile == "":
       datafile = inputDataDir+"/"+sampleName
     else:
-      datafile = sample.dataFile
+      datafile = inputDataDir+"/"+sample.dataFile
 
     maskFile = sample.maskFile