added median

logan-pearce · Feb 10, 2020 · 6fe6c26 · 6fe6c26
1 parent addbe94
commit 6fe6c26
Show file tree

Hide file tree

Showing 13 changed files with 1,981 additions and 120 deletions.
diff --git a/DSTucAB/accepted b/DSTucAB/accepted
diff --git a/DSTucAB/accepted_0 b/DSTucAB/accepted_0
diff --git a/DSTucAB/constraints.pkl b/DSTucAB/constraints.pkl
diff --git a/DSTucAB/constraints.txt b/DSTucAB/constraints.txt
@@ -1,12 +1,12 @@
-DeltaRA: [-1146.6528524509017, 0.015827247295542777]
-DeltaDEC: [5240.634554228641, 0.03133316628399804]
-pmRA_kms: [-0.30173712008430653, 0.02054223955150166]
-pmDEC_kms: [0.3543703626789322, 0.012264894193656586]
-deltaRV: [1.8793611665844168, 0.73265849451859]
+DeltaRA: [-1146.6530190762494, 0.015999945377204325]
+DeltaDEC: [5240.634013431348, 0.031659134351276624]
+pmRA_kms: [-0.30173712008430653, 0.020664398782278517]
+pmDEC_kms: [0.3543703626789322, 0.012293244419431618]
+deltaRV: [1.8793611665844168, 0.7118971395727024]
 Total_Plane_Of_Sky_Vel: [2.2246301214145014, 0.11376315413334326]
-Total_Velocity_kms: [1.9361358521672773, 1.8795134491939431]
-Separation_mas: [5364.612129063033, 0.030818374293303554]
-PA_deg: [347.6581577933723, 0.0001795110335253964]
+Total_Velocity_kms: [1.9361358521672773, 1.8795149735240018]
+Separation_mas: [5364.611636379505, 0.03113233506300629]
+PA_deg: [347.6581548203167, 0.00018158959419182027]
 delta_mag: -1.0800505
 Distance_pc: [44.1340385429632, 0.06336868730526682]
 
diff --git a/LOFTI_Tutorial.ipynb b/LOFTI_Tutorial.ipynb
@@ -197,7 +197,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "massA = (0.97,0.04)\n",
+    "massA = (0.97, 0.04)\n",
     "massB = (0.87, 0.04)"
    ]
   },
@@ -3885,7 +3885,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.0"
   }
  },
  "nbformat": 4,

diff --git a/dist/lofti_gaia-0.3-py3-none-any.whl b/dist/lofti_gaia-0.3-py3-none-any.whl
diff --git a/dist/lofti_gaia-0.3.tar.gz b/dist/lofti_gaia-0.3.tar.gz
diff --git a/dist/lofti_gaia-0.4.tar.gz b/dist/lofti_gaia-0.4.tar.gz
diff --git a/dist/lofti_gaia-0.5.tar.gz b/dist/lofti_gaia-0.5.tar.gz
diff --git a/lofti_gaia.egg-info/PKG-INFO b/lofti_gaia.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: lofti-gaia
-Version: 0.4
+Version: 0.5
 Summary: Orbit fitting with Gaia astrometry
 Home-page: https://github.com/logan-pearce/lofti_gaia
 Author: Logan Pearce

diff --git a/lofti_gaia/.DS_Store b/lofti_gaia/.DS_Store
diff --git a/lofti_gaia/lofti.py b/lofti_gaia/lofti.py
@@ -165,7 +165,7 @@ def fitorbit(source_id1, source_id2,
         if set to True, script will print constraints to screen, ask for confrimation before proceeding,
         and print regular updates on number of accepted orbits.  If set to False, script will print a progress bar 
         to screen.  Default = False.
-    output_name : str
+    output_directory : str
         directory to write output files to.  If verbose = True, script will prompt for directory, if 
         verbose = False it will write files to current directly unless the name argument is specified.
     rank : int

diff --git a/lofti_gaia/loftiplots.py b/lofti_gaia/loftiplots.py
@@ -53,7 +53,7 @@ def write_stats(params,params_names,filename):
     import numpy as np
     from lofti_gaia.loftiplots import calc_min_interval
     k = open(filename, 'w')
-    string = 'Parameter    Mean    Std    Mode    68% Min Cred Int    95% Min Cred Int'
+    string = 'Parameter    Mean    Median    Std    Mode    68% Min Cred Int    95% Min Cred Int'
     k.write(string + "\n")
     k.close()
     for i in range(len(params)):
@@ -68,8 +68,8 @@ def write_stats(params,params_names,filename):
         m = mode(params[i])
         # Write it out:
         k = open(filename, 'a')
-        string = params_names[i] + '    ' + str(np.mean(params[i])) + '    ' + str(np.std(params[i])) + '    ' +\
-          str(m) + '    ' + str(ci68) + '    ' + str(ci95)
+        string = params_names[i] + '    ' + str(np.mean(params[i])) + '    ' + str(np.median(params[i])) + '    ' +\
+          str(np.std(params[i])) + '    ' + str(m) + '    ' + str(ci68) + '    ' + str(ci95)
         k.write(string + "\n")
         k.close()