diff --git a/graphs/data/fitHeat/getter.py b/graphs/data/fitHeat/getter.py index 2bfef449e..7d68ff6d4 100644 --- a/graphs/data/fitHeat/getter.py +++ b/graphs/data/fitHeat/getter.py @@ -57,8 +57,15 @@ class _BaseTime2BurnoutCdfGetter(SmoothPointGetter): fit = src.item # Fixed simulation horizon so CDF does not depend on view range max_sim_time = self.graph._limiters["time"](src, tgt)[1] + iterations = miscParams.get("iterations", self._iterations) + try: + iterations = int(iterations) + except (TypeError, ValueError): + iterations = self._iterations + if iterations <= 0: + iterations = self._iterations samples = get_first_burnout_samples( - fit=fit, rack_slot=self.rack_slot, max_time_s=max_sim_time, iterations=self._iterations + fit=fit, rack_slot=self.rack_slot, max_time_s=max_sim_time, iterations=iterations ) xs = [] ys = [] @@ -83,8 +90,15 @@ class _BaseTime2BurnoutCdfGetter(SmoothPointGetter): def getPoint(self, x, miscParams, src, tgt): fit = src.item max_sim_time = self.graph._limiters["time"](src, tgt)[1] + iterations = miscParams.get("iterations", self._iterations) + try: + iterations = int(iterations) + except (TypeError, ValueError): + iterations = self._iterations + if iterations <= 0: + iterations = self._iterations samples = get_first_burnout_samples( - fit=fit, rack_slot=self.rack_slot, max_time_s=max_sim_time, iterations=self._iterations + fit=fit, rack_slot=self.rack_slot, max_time_s=max_sim_time, iterations=iterations ) if not samples: return 0.0 diff --git a/graphs/data/fitHeat/graph.py b/graphs/data/fitHeat/graph.py index c9e376065..c5c08da25 100644 --- a/graphs/data/fitHeat/graph.py +++ b/graphs/data/fitHeat/graph.py @@ -57,12 +57,12 @@ class FitHeatGraph(FitGraph): XDef(handle="time", unit="s", label=_t("Time"), mainInput=("time", "s")), ] yDefs = [ - YDef(handle="rackHeatHi", unit="%", label=_t("High rack heat")), - YDef(handle="rackHeatMed", unit="%", label=_t("Mid rack heat")), - YDef(handle="rackHeatLow", unit="%", label=_t("Low rack heat")), YDef(handle="burnoutCdfHi", unit=None, label=_t("High rack first-burnout CDF")), YDef(handle="burnoutCdfMed", unit=None, label=_t("Mid rack first-burnout CDF")), YDef(handle="burnoutCdfLow", unit=None, label=_t("Low rack first-burnout CDF")), + YDef(handle="rackHeatHi", unit="%", label=_t("High rack heat")), + YDef(handle="rackHeatMed", unit="%", label=_t("Mid rack heat")), + YDef(handle="rackHeatLow", unit="%", label=_t("Low rack heat")), ] inputs = [ Input( @@ -72,7 +72,15 @@ class FitHeatGraph(FitGraph): iconID=1392, defaultValue=300, defaultRange=(0, 120), - ) + ), + Input( + handle="iterations", + unit=None, + label=_t("Iterations"), + iconID=1392, + defaultValue=10000, + defaultRange=(100, 50000), + ), ] srcExtraCols = ()