Fix improper .res header in multiPopMcmc when running parallax

- Parallax runs still use "modulus" in .res file header
- Modifies the file IO backend to output the appropriate header based on whether parallax or distMod is in use
- Affects only multiple population MCMC

base9/IO/MultiPopMcmc.cpp

@@ -19,7 +19,7 @@ void MultiPopMcmc_FileBackingStore::save(MultiPopMcmcRecord data)
 
     if (data.iter.val == 1)
     {
-        header(clust0.priorVar);
+        header(clust0.priorVar, data.modIsParallax);
     }
 
     for (int p = 0; p < NPARAMS; p++)
@@ -39,12 +39,14 @@ void MultiPopMcmc_FileBackingStore::save(MultiPopMcmcRecord data)
 }
 
 
-void MultiPopMcmc_FileBackingStore::header(array<double, NPARAMS> const &priors)
+void MultiPopMcmc_FileBackingStore::header(array<double, NPARAMS> const &priors, bool modIsParallax)
 {
+    auto distanceName = modIsParallax ? "    parallax" : "     modulus";
+
     const array<string, NPARAMS> paramNames = {  "     logAge",
                                                 "          YA",
                                                 "         FeH",
-                                                "     modulus",
+                                                  distanceName,
                                                 "  absorption",
                                                 " carbonicity",
                                                 "          YB",

base9/IO/MultiPopMcmc.hpp

@@ -15,7 +15,8 @@ class MultiPopMcmc_FileBackingStore : public FileBackingStore<MultiPopMcmcRecord
     void save(MultiPopMcmcRecord) override;
 
   protected:
-    void header(std::array<double, NPARAMS> const&) override;
+    void header(std::array<double, NPARAMS> const &params) override { header(params, false); }
+    void header(std::array<double, NPARAMS> const&, bool);
 };
 
 

base9/IO/Records.hpp

@@ -16,6 +16,8 @@ struct MultiPopMcmcRecord
     const Cluster clust1;
 
     const double logPost;
+
+    const bool modIsParallax;
 };
 
 typedef BackingStore<MultiPopMcmcRecord> MultiPopBackingStore;

base9/IO/SinglePopMcmc.hpp

@@ -15,8 +15,8 @@ class SinglePopMcmc_FileBackingStore : public FileBackingStore<SinglePopMcmcReco
     void save(SinglePopMcmcRecord) override;
 
   protected:
-    void header(std::array<double, NPARAMS> const &params) { header(params, false); }
-    void header(std::array<double, NPARAMS> const&, bool modIsParallax);
+    void header(std::array<double, NPARAMS> const &params) override { header(params, false); }
+    void header(std::array<double, NPARAMS> const&, bool);
 };
 
 

multiPopMcmc/Chain.hpp

@@ -37,13 +37,16 @@ class Chain : public McmcApplication
     MultiPopBackingStore &mcmcStore;
     StarParamsBackingStore &paramsStore;
 
+    bool modIsParallax;
+
     double logPostCurr = -std::numeric_limits<double>::infinity();
 
     std::vector<double> starData;
 
   public:
-    Chain(uint32_t seed, double fsLike, std::array<double, NPARAMS> priorVar, T clust, MultiPopBackingStore &mcmcStore, StarParamsBackingStore &paramsStore)
+    Chain(uint32_t seed, double fsLike, std::array<double, NPARAMS> priorVar, T clust, MultiPopBackingStore &mcmcStore, StarParamsBackingStore &paramsStore, bool modIsParallax)
         : McmcApplication(seed), fsLike(fsLike), priorVar(priorVar), clust(clust), mcmcStore(mcmcStore), paramsStore(paramsStore)
+        , modIsParallax(modIsParallax)
     {}
 
     void reset()
@@ -111,7 +114,7 @@ class Chain : public McmcApplication
             {
                 const auto iter = mcmcStore.nextIteration();
 
-                mcmcStore.save({iter, stage, clust.lambda, clust.clust[0], clust.clust[1], logPostCurr});
+                mcmcStore.save({iter, stage, clust.lambda, clust.clust[0], clust.clust[1], logPostCurr, modIsParallax});
 
                 if (starData.size() >= 2)
                 {

multiPopMcmc/MpiMcmcApplication.cpp

@@ -339,7 +339,7 @@ int MpiMcmcApplication::run()
 
     fieldStarLikelihood->save({fsLike});
 
-    Chain<DualPopCluster> chain(static_cast<uint32_t>(std::uniform_int_distribution<>()(gen)), fsLike, ctrl.priorVar, clust, *mcmcStore, *paramsStore);
+    Chain<DualPopCluster> chain(static_cast<uint32_t>(std::uniform_int_distribution<>()(gen)), fsLike, ctrl.priorVar, clust, *mcmcStore, *paramsStore, settings.modIsParallax);
 
     allocateSSEMem();