Merge branch 'master' into exozodi_fix

EXOSIMS/OpticalSystem/Nemati.py

@@ -502,8 +502,8 @@ def ddMag_dt(
 
         """
 
-        # cast sInds, WA, fZ, JEZ, and intTimes to arrays
-        sInds = np.array(sInds, ndmin=1, copy=False)
+        # cast sInds, WA, fZ, fEZ, and intTimes to arrays
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
         WA = np.array(WA.value, ndmin=1) * WA.unit
         fZ = np.array(fZ.value, ndmin=1) * fZ.unit
         JEZ = np.array(JEZ.value, ndmin=1) * JEZ.unit

EXOSIMS/PlanetPopulation/AlbedoByRadiusDulzPlavchan.py

@@ -47,8 +47,8 @@ def __init__(
         Rb=[1.4],
         **specs,
     ):
-        self.ps = np.array(ps, ndmin=1)
-        self.Rb = np.array(Rb, ndmin=1)
+        self.ps = np.array(ps, ndmin=1, copy=copy_if_needed)
+        self.Rb = np.array(Rb, ndmin=1, copy=copy_if_needed)
         specs["prange"] = [np.min(ps), np.max(ps)]
         DulzPlavchan.__init__(
             self, starMass=starMass, occDataPath=occDataPath, esigma=esigma, **specs

EXOSIMS/Prototypes/OpticalSystem.py

@@ -1953,7 +1953,7 @@ def Cp_Cb_Csp_helper(self, TL, sInds, fZ, JEZ, dMag, WA, mode):
                 )
 
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
 
         # Star fluxes (ph/m^2/s)
         flux_star = TL.starFlux(sInds, mode)

EXOSIMS/Prototypes/TargetList.py

@@ -1537,7 +1537,7 @@ def revise_lists(self, sInds):
         """
 
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
 
         if len(sInds) == 0:
             raise IndexError("Requested target revision would leave 0 stars.")
@@ -1736,7 +1736,7 @@ def starprop(self, sInds, currentTime, eclip=False):
                 currentTime = currentTime[0]
 
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
 
         # get all array sizes
         nStars = sInds.size
@@ -1926,7 +1926,8 @@ def starFlux(self, sInds, mode):
                 u.ph / u.s / u.m**2
             )
 
-        # Identify which star indices need new flux calculations
+        # figure out which target indices (if any) need new calculations to be done
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
         novals = np.isnan(self.star_fluxes[mode["hex"]][sInds])
         inds = np.unique(sInds[novals])
 
@@ -2061,7 +2062,7 @@ def calc_IWA_AU(self, sInds, **kwargs):
         """
 
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
         return (
             self.dist[sInds].to(u.parsec).value
             * self.OpticalSystem.IWA.to(u.arcsec).value
@@ -2093,7 +2094,7 @@ def calc_HZ(self, sInds, S, A, B, C, arcsec=False):
 
         """
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
 
         T_eff = self.Teff[sInds]
 
@@ -2126,7 +2127,7 @@ def calc_EEID(self, sInds, arcsec=False):
 
         """
         # cast sInds to array
-        sInds = np.array(sInds, ndmin=1)
+        sInds = np.array(sInds, ndmin=1, copy=copy_if_needed)
 
         d_EEID = (1 / ((1 * u.AU) ** 2 * (self.L[sInds]))) ** (-0.5)
         # ((L_sun/(1*AU^2)/(0.25*L_sun)))^(-0.5)