Change from 'afac' to 'bias' to be a bit more descriptive

Author: Martin D. Weinberg

expui/BiorthBasis.H

@@ -1044,7 +1044,7 @@ namespace BasisClasses
     int lmaxfid, nmaxfid, mmax, mlim, nmax;
     int ncylodd, ncylnx, ncylny, ncylr, cmap, cmapR, cmapZ, vflag;
     int rnum, pnum, tnum;
-    double rcylmin, rcylmax, acyl, hcyl, afac;
+    double rcylmin, rcylmax, acyl, hcyl, bias;
     bool expcond, logarithmic, density, EVEN_M, sech2 = true;
 
     std::vector<Eigen::MatrixXd> potd, dpot, dpt2, dend;

expui/BiorthBasis.cc

@@ -1,4 +1,4 @@
-#include <algorithm>
+<#include <algorithm>
 
 #include "YamlCheck.H"
 #include "EXPException.H"
@@ -1377,7 +1377,7 @@ namespace BasisClasses
     rcylmin     = 0.001;
     rcylmax     = 20.0;
     acyl        = 0.01;
-    afac        = 1.0;
+    bias        = 1.0;
     hcyl        = 0.002;
     nmax        = 18;
     mmax        = 6;
@@ -1456,7 +1456,7 @@ namespace BasisClasses
       if (conf["rcylmax"   ])    rcylmax  = conf["rcylmax"   ].as<double>();
 
       if (conf["acyl"      ])       acyl  = conf["acyl"      ].as<double>();
-      if (conf["afac"      ])       afac  = conf["afac"      ].as<double>();
+      if (conf["bias"      ])       bias  = conf["bias"      ].as<double>();
       if (conf["hcyl"      ])       hcyl  = conf["hcyl"      ].as<double>();
       if (conf["sech2"     ])      sech2  = conf["sech2"     ].as<bool>();
       if (conf["lmaxfid"   ])    lmaxfid  = conf["lmaxfid"   ].as<int>();
@@ -1598,7 +1598,7 @@ namespace BasisClasses
     // Make the empirical orthogonal basis instance
     //
     sl = std::make_shared<EmpCylSL>
-      (nmaxfid, lmaxfid, mmax, nmax, afac*acyl, hcyl, ncylodd, cachename);
+      (nmaxfid, lmaxfid, mmax, nmax, bias*acyl, hcyl, ncylodd, cachename);
 
     // Set azimuthal harmonic order restriction?
     //
@@ -5190,7 +5190,7 @@ namespace BasisClasses
     file.createAttribute<double>("rcylmin", HighFive::DataSpace::From(rcylmin)).write(rcylmin);
     file.createAttribute<double>("rcylmax", HighFive::DataSpace::From(rcylmax)).write(rcylmax);
     file.createAttribute<double>("acyl", HighFive::DataSpace::From(acyl)).write(acyl);
-    file.createAttribute<double>("afac", HighFive::DataSpace::From(afac)).write(afac);
+    file.createAttribute<double>("bias", HighFive::DataSpace::From(bias)).write(bias);
     file.createAttribute<double>("hcyl", HighFive::DataSpace::From(hcyl)).write(hcyl);
   }
 

src/Cylinder.H

@@ -35,7 +35,7 @@ class MixtureBasis;
 
     @param acyl is the scale length
 
-    @param afac is the O(1) bias correction for deprojected scale length
+    @param bias is the O(1) bias correction for deprojected scale length
 
     @param hcyl is the scale height
 
@@ -153,7 +153,7 @@ private:
   void initialize(void);
 
 				// Parameters
-  double rcylmin, rcylmax, zmax, acyl, afac;
+  double rcylmin, rcylmax, zmax, acyl, bias;
   int nmaxfid, lmaxfid, mmax, mlim, nint;
   int ncylnx, ncylny, ncylr;
   double hcyl, hexp, snr, rem;
@@ -352,7 +352,7 @@ public:
   //! 
   //! Parameters settable in the configuration line include:
   //! \param acyl is the disk scale length for the basis
-  //! \param afac is the disk scale length bias factor for the basis
+  //! \param bias is the disk scale length bias factor for the basis
   //! \param hcyl is the disk scale height for the basis
   //! \param nmaxfid is the radial order for the underlying spherical basis
   //! \param lmaxfid is the harmonic order for the underlying spherical basis

src/Cylinder.cc

@@ -28,7 +28,7 @@ Cylinder::valid_keys = {
   "rcylmin",
   "rcylmax",
   "acyl",
-  "afac",
+  "bias",
   "hcyl",
   "sech2",
   "hexp",
@@ -108,7 +108,7 @@ Cylinder::Cylinder(Component* c0, const YAML::Node& conf, MixtureBasis *m) :
   ncylr           = 2000;
 
   acyl            = 0.01;
-  afac            = 1.0;
+  bias            = 1.0;
   lmaxfid         = 128;
   nmaxfid         = 64;
   mmax            = 6;
@@ -182,7 +182,7 @@ Cylinder::Cylinder(Component* c0, const YAML::Node& conf, MixtureBasis *m) :
   // Make the empirical orthogonal basis instance
   //
   ortho = std::make_shared<CylEXP>
-    (nmaxfid, lmaxfid, mmax, nmax, afac*acyl, hcyl, ncylodd, cachename);
+    (nmaxfid, lmaxfid, mmax, nmax, bias*acyl, hcyl, ncylodd, cachename);
 
   // Set azimuthal harmonic order restriction?
   //
@@ -339,7 +339,7 @@ Cylinder::Cylinder(Component* c0, const YAML::Node& conf, MixtureBasis *m) :
 		<< std::endl << sep << "rcylmin="     << rcylmin
 		<< std::endl << sep << "rcylmax="     << rcylmax
 		<< std::endl << sep << "acyl="        << acyl
-		<< std::endl << sep << "afac="        << afac
+		<< std::endl << sep << "bias="        << bias
 		<< std::endl << sep << "hcyl="        << hcyl
 		<< std::endl << sep << "precond="     << precond
 		<< std::endl << sep << "pcavar="      << pcavar
@@ -369,7 +369,7 @@ Cylinder::Cylinder(Component* c0, const YAML::Node& conf, MixtureBasis *m) :
 	      << std::endl << sep << "rcylmin="     << rcylmin
 	      << std::endl << sep << "rcylmax="     << rcylmax
 	      << std::endl << sep << "acyl="        << acyl
-	      << std::endl << sep << "afac="        << afac
+	      << std::endl << sep << "bias="        << bias
 	      << std::endl << sep << "hcyl="        << hcyl
 	      << std::endl << sep << "precond="     << precond
 	      << std::endl << sep << "pcavar="      << pcavar
@@ -426,7 +426,7 @@ void Cylinder::initialize()
     if (conf["rcylmax"   ])    rcylmax  = conf["rcylmax"   ].as<double>();
 
     if (conf["acyl"      ])       acyl  = conf["acyl"      ].as<double>();
-    if (conf["afac"      ])       afac  = conf["afac"      ].as<double>();
+    if (conf["bias"      ])       bias  = conf["bias"      ].as<double>();
     if (conf["hcyl"      ])       hcyl  = conf["hcyl"      ].as<double>();
     if (conf["sech2"     ])      sech2  = conf["sech2"     ].as<bool>();
     if (conf["hexp"      ])       hexp  = conf["hexp"      ].as<double>();
@@ -1880,7 +1880,7 @@ void Cylinder::writeCovarH5Params(HighFive::File& file)
   file.createAttribute<double>("rcylmin", HighFive::DataSpace::From(rcylmin)).write(rcylmin);
   file.createAttribute<double>("rcylmax", HighFive::DataSpace::From(rcylmax)).write(rcylmax);
   file.createAttribute<double>("acyl", HighFive::DataSpace::From(acyl)).write(acyl);
-  file.createAttribute<double>("afac", HighFive::DataSpace::From(afac)).write(afac);
+  file.createAttribute<double>("bias", HighFive::DataSpace::From(bias)).write(bias);
   file.createAttribute<double>("hcyl", HighFive::DataSpace::From(hcyl)).write(hcyl);
 }