fixed bugs associated with saving RA and Dec

c_tools/mock/generateFromCatalog.cpp

@@ -27,6 +27,7 @@ struct NYU_Data
   double cz;
   double fgotten;
   double phi_z;
+  double uniqueID;
 };
 
 struct Position
@@ -41,6 +42,7 @@ struct ParticleData
   vector<double> dec;
   vector<double> redshift;
   vector<double> catalogID;
+  vector<double> uniqueID;
   int id_mask;
   // PMS
   int mask_index;
@@ -408,6 +410,7 @@ void saveForZobov(ParticleData& pdata, const string& fname, const string& paramn
   UnformattedWrite f(fname);
   static const char axis[] = { 'X', 'Y', 'Z' };
   double Lmax = pdata.Lmax;
+  double r2d = 180./M_PI;
 
   f.beginCheckpoint();
   f.writeInt32(pdata.pos.size());
@@ -428,33 +431,31 @@ void saveForZobov(ParticleData& pdata, const string& fname, const string& paramn
   cout << format("Writing RA...")  << endl;
   f.beginCheckpoint();
   for (uint32_t i = 0; i < pdata.pos.size(); i++) {
-	  f.writeReal32(pdata.pos[i].ra);
+	  f.writeReal32(pdata.ra[i]*r2d);
 	}
   f.endCheckpoint();
    
   cout << format("Writing Dec...")  << endl;
   f.beginCheckpoint();
   for (uint32_t i = 0; i < pdata.pos.size(); i++) {
-	  f.writeReal32(pdata.pos[i].Dec);
+	  f.writeReal32(pdata.dec[i]*r2d);
 	}
   f.endCheckpoint();
     
   cout << format("Writing Redshift...")  << endl;
   f.beginCheckpoint();
   for (uint32_t i = 0; i < pdata.pos.size(); i++) {
-	  f.writeReal32(pdata.pos[i].cz);
+	  f.writeReal32(pdata.redshift[i]);
 	}
   f.endCheckpoint();
    
   cout << format("Writing Unique ID...")  << endl;
   f.beginCheckpoint();
   for (uint32_t i = 0; i < pdata.pos.size(); i++) {
-	  f.writeReal32(pdata.pos[i].uniqueID);
+	  f.writeReal32(pdata.uniqueID[i]);
 	}
   f.endCheckpoint();
    
-  NcFile fp(paramname.c_str(), NcFile::Replace);
-  NcFile fp(paramname.c_str(), NcFile::Replace);
   NcFile fp(paramname.c_str(), NcFile::Replace);
 
   fp.add_att("range_x_min", -Lmax/100.);

c_tools/mock/generateMock.cpp

@@ -178,16 +178,16 @@ SimuData *doLoadMultidark(const char *multidarkname)
   for (int k = 0; k < 3; k++)
     outd->Pos[k] = new float[outd->NumPart];
   outd->Vel[2] = new float[outd->NumPart];
-  outd->uniqueID = new float[outd->NumPart];
+  outd->Id = new int[outd->NumPart];
 
   cout << "loading multidark particles" << endl;
   actualNumPart = 0;
 	for (int i = 0; i < outd->NumPart; i++) {
-    fscanf(fp, "%d %f %f %f %f\n", &outd->uniqueID[i], 
+    fscanf(fp, "%d %d %f %f %f\n", &outd->Id[i], 
                                 &outd->Pos[0][i], &outd->Pos[1][i], 
                                 &outd->Pos[2][i], &outd->Vel[2][i]);
 
-    if (outd->uniqueID[i] == -99 && 
+    if (outd->Id[i] == -99 && 
         outd->Pos[0][i] == -99 && outd->Pos[1][i] == -99 && 
         outd->Pos[2][i] == -99 && outd->Vel[2][i] == -99) {
       break;
@@ -368,7 +368,7 @@ void generateOutput(SimuData *data, int axis,
   f.beginCheckpoint();
   for (uint32_t i = 0; i < data->NumPart; i++)
     {
-      f.writeReal32(data->uniqueID[i]);
+      f.writeReal32(data->Id[i]);
     }
   f.endCheckpoint();
 
@@ -376,7 +376,7 @@ void generateOutput(SimuData *data, int axis,
   f.beginCheckpoint();
   for (uint32_t i = 0; i < data->NumPart; i++)
     {
-      f.writeReal32(data->uniqueID[i]);
+      f.writeReal32(data->Id[i]);
     }
   f.endCheckpoint();
 
@@ -384,7 +384,7 @@ void generateOutput(SimuData *data, int axis,
   f.beginCheckpoint();
   for (uint32_t i = 0; i < data->NumPart; i++)
     {
-      f.writeReal32(data->uniqueID[i]);
+      f.writeReal32(data->Id[i]);
     }
   f.endCheckpoint();
 
@@ -392,7 +392,7 @@ void generateOutput(SimuData *data, int axis,
   f.beginCheckpoint();
   for (uint32_t i = 0; i < data->NumPart; i++)
     {
-      f.writeReal32(data->uniqueID[i]);
+      f.writeReal32(data->Id[i]);
     }
   f.endCheckpoint();
 

c_tools/stacking/pruneVoids.cpp

@@ -538,8 +538,7 @@ int main(int argc, char **argv) {
              voids[iVoid].redshift, 
              4./3.*M_PI*pow(voids[iVoid].radius, 3),
              voids[iVoid].voidID,
-             voids[iVoid].densCon,
+             voids[iVoid].densCon);
-             );
 
      fprintf(fpSkyPositions, "%.2f %.2f %.5f %.2f %d\n",
              atan((voids[iVoid].barycenter[1]-boxLen[1]/2.)/(voids[iVoid].barycenter[0]-boxLen[0]/2.)) * 180/M_PI + 180,  
@@ -591,6 +590,6 @@ int main(int argc, char **argv) {
   clock1 = clock();
 
 
-  printf("Done!");
+  printf("Done!\n");
   return 0;
 } // end main

external/cosmotool/src/loadSimu.hpp

@@ -41,6 +41,8 @@ namespace CosmoTool
 	delete[] type;
       if (Id)
 	delete[] Id;
+      if (uniqueID)
+  delete[] uniqueID;
     }    
   };
 

pipeline/generateCatalog.py

@@ -62,11 +62,11 @@ for sample in dataSampleList:
     os.makedirs(zobovDir)
 
   # save this sample's information
-  with open(zobovDir+"/sample_info.dat", 'wb') as output:
+  with open(zobovDir+"/sample_info.dat", 'w') as output:
     pickle.dump(sample, output, pickle.HIGHEST_PROTOCOL)
-  fp = open(zobovDir+"/sample_info.txt", 'w') 
+  #fp = open(zobovDir+"/sample_info.txt", 'w') 
-  fp.write("Redshift range: %f - %f" %(sample.zBoundary[0], sample.zBoundary[1])
+  #fp.write("Redshift range: %f - %f" %(sample.zBoundary[0], sample.zBoundary[1])
-  fp.close()
+  #fp.close()
 
 # ---------------------------------------------------------------------------
   if (startCatalogStage <= 1) and (endCatalogStage >= 1) and not sample.isCombo:

python_tools/void_python_tools/backend/launchers.py

@@ -297,12 +297,8 @@ def launchPrune(sample, binPath, thisDataPortion=None,
     cmd += " >& " + logFile
     os.system(cmd)
 
-<<<<<<< HEAD
     if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or \
-       jobSuccessful(logFile, "Done!"):
+       jobSuccessful(logFile, "Done!\n"):
-=======
-    if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or jobSuccessful(logFile, "Done!\n"):
->>>>>>> 3d6fae9882fde44515a59e1144646d77bbd1a124
       print "done"
     else:
       print "FAILED!"