Merge pull request #359 from dsavransky/fixrollup

fixes to 3 bugs
dsavransky · Aug 7, 2023 · fd6f1d2 · fd6f1d2
2 parents 0e375dd + e262706
commit fd6f1d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/EXOSIMS/Prototypes/Observatory.py b/EXOSIMS/Prototypes/Observatory.py
@@ -1788,8 +1788,8 @@ def refuel_tank(self, TK, tank=None):
                 tank_capacity = self.slewMaxFuelMass
                 tank_name = "slew"
         else:
-            tank_mass = self.scMass - self.dryMass
-            tank_capacity = self.maxFuelMass
+            tank_mass = self.scMass
+            tank_capacity = self.maxFuelMass + self.dryMass
             tank_name = ""
 
         # Add as much fuel as can fit in the tank (plus any currently carried negative

diff --git a/EXOSIMS/SurveySimulation/tieredScheduler.py b/EXOSIMS/SurveySimulation/tieredScheduler.py
@@ -282,8 +282,11 @@ def __init__(
             )
             self.t_char_earths[~np.isfinite(self.t_char_earths)] = 0 * u.d
             # occ_sInds = occ_sInds[(occ_intTimes[occ_sInds] > 0.0*u.d)]
-            sInds = sInds[(self.t_char_earths > 0)]
-            sInds = sInds[(self.t_char_earths <= self.OpticalSystem.intCutoff)]
+            sInds = sInds[
+                (self.t_char_earths > 0)
+                & (self.t_char_earths <= self.OpticalSystem.intCutoff)
+            ]
+            # sInds = sInds[(self.t_char_earths <= self.OpticalSystem.intCutoff)]
             self.occ_intTimeFilterInds = np.intersect1d(sInds, np.arange(TL.nStars))
 
     def run_sim(self):

diff --git a/EXOSIMS/ZodiacalLight/Mennesson.py b/EXOSIMS/ZodiacalLight/Mennesson.py
@@ -19,6 +19,8 @@ def __init__(self, EZ_distribution="nominal_maxL_distribution.fits", **specs):
             self.EZ_distribution = os.path.join(
                 os.path.dirname(os.path.abspath(__file__)), EZ_distribution
             )
+        else:
+            raise ValueError(f"Could not locate EZ_distribution file {EZ_distribution}")
         self.fitsdata = fits.open(self.EZ_distribution)[0].data
         self._outspec["EZ_distribution"] = EZ_distribution
 

diff --git a/EXOSIMS/__init__.py b/EXOSIMS/__init__.py
@@ -1,7 +1,7 @@
 import logging
 
 name = "EXOSIMS"
-__version__ = "3.1.5"
+__version__ = "3.1.6"
 
 # Set up a default logging handler to avoid "No handler found" warnings.
 # Other handlers can add to this one.