Merge remote-tracking branch 'origin/dev/dc' into dev/dc

Author: jirhiker

pychron/dvc/dvc.py

@@ -1438,6 +1438,15 @@ def git_session_ctx(self, repository_identifier, message):
     def clear_pull_cache(self):
         self._pull_cache = {}
 
+    def is_clean(self, name):
+        try:
+            repo = self._get_repository(name)
+            ahead, behind = repo.ahead_behind()
+            return ahead == 0 and behind == 0
+        except BaseException as e:
+            self.debug("is clean exception {}".format(e))
+            return False
+
     def sync_repo(self, name, use_progress=True, pull_frequency=None):
         """
         pull or clone an repo

pychron/entry/tray_maker.py

@@ -32,7 +32,7 @@ class Position(HasTraits):
     radius = Float(0.1)
 
     def totuple(self):
-        return self.x, self.y, self.radius, str(self.id)
+        return self.x, self.y, self.radius * 2, str(self.id)
 
     def dump(self, inches=False):
         x, y = self.x, self.y
@@ -53,39 +53,50 @@ class TrayMaker(Loggable):
     save_button = Button
 
     def gen(self):
+        # rows = [
+        #     (5, -2),
+        #     (9, -4),
+        #     (13, -6),
+        #     (15, -7),
+        #     (17, -8),
+        #     (19, -9),
+        #     (19, -9),
+        #     (21, -10),
+        #     (21, -10),
+        #     (23, -11),
+        #     (23, -11),
+        #     (23, -11),
+        #     (23, -11),
+        #     (23, -11),
+        #     (21, -10),
+        #     (21, -10),
+        #     (19, -9),
+        #     (19, -9),
+        #     (17, -8),
+        #     (15, -7),
+        #     (13, -6),
+        #     (9, -4),
+        #     (5, -2),
+        # ]
+
         rows = [
+            (3, -1),
             (5, -2),
-            (9, -4),
-            (13, -6),
-            (15, -7),
-            (17, -8),
-            (19, -9),
-            (19, -9),
-            (21, -10),
-            (21, -10),
-            (23, -11),
-            (23, -11),
-            (23, -11),
-            (23, -11),
-            (23, -11),
-            (21, -10),
-            (21, -10),
-            (19, -9),
-            (19, -9),
-            (17, -8),
-            (15, -7),
-            (13, -6),
-            (9, -4),
+            (7, -3),
+            (7, -3),
+            (7, -3),
             (5, -2),
+            (3, -1),
         ]
-        space = 2
-        oy = 24
+
+        space = 6.75
+        oy = 20.25
         ps = []
         for ri, (rc, ox) in enumerate(rows):
             y = oy - ri * space
             for ji in range(rc):
                 x = (ox * space) + ji * space
-                p = Position(x=x, y=y, radius=1)
+                p = Position(x=x, y=y, radius=2.25)
                 ps.append(p)
                 print(x, y)
 

pychron/experiment/automated_run/factory.py

@@ -182,7 +182,10 @@ class AutomatedRunFactory(DVCAble, PersistenceLoggable):
     display_labnumbers = Property(depends_on="project, selected_level, _identifiers")
     _identifiers = List
 
-    use_project_based_repository_identifier = Bool(True)
+    # use_project_based_repository_identifier = Bool(True)
+    # use_load_based_repository_identifier = Bool(False)
+
+    repository_identifier_model = Enum(("Project", ("None", "Project", "Load")))
     repository_identifier = Str
     repository_identifiers = Property(
         depends_on="repository_identifier_dirty, db_refresh_needed"
@@ -339,6 +342,7 @@ class AutomatedRunFactory(DVCAble, PersistenceLoggable):
     extract_device = Str
     username = Str
     laboratory = Str
+    load_name = Str
 
     persistence_name = "run_factory"
     pattributes = (
@@ -363,7 +367,9 @@ class AutomatedRunFactory(DVCAble, PersistenceLoggable):
         TEMPLATE,
         "use_simple_truncation",
         "conditionals_path",
-        "use_project_based_repository_identifier",
+        "repository_identifier_model",
+        # "use_project_based_repository_identifier",
+        # "use_load_based_repository_identifier",
         "delay_after",
         DISABLE_BETWEEN_POSITIONS,
     )
@@ -1117,16 +1123,21 @@ def _load_labnumber_meta(self, labnumber):
                 self.irrad_hole = d["irradiation_position"]
                 self._no_clear_labnumber = False
 
-            if self.use_project_based_repository_identifier:
-                ipp = self.irradiation_project_prefix
-                project_name = d["project"]
-                if ipp and project_name.startswith(ipp):
-                    repo = project_name
-                    if repo == "REFERENCES":
-                        repo = ""
-                else:
-                    repo = camel_case(project_name)
-                self.repository_identifier = repo
+            if self.repository_identifier_model in ["Load", "Project"]:
+                self.repository_identifier = d["repository_identifier"]
+
+            # if self.use_project_based_repository_identifier:
+            #     ipp = self.irradiation_project_prefix
+            #     project_name = d["project"]
+            #     if ipp and project_name.startswith(ipp):
+            #         repo = project_name
+            #         if repo == "REFERENCES":
+            #             repo = ""
+            #     else:
+            #         repo = camel_case(project_name)
+            #     self.repository_identifier = repo
+            # elif self.use_load_based_repository_identifier:
+            #     self.repository_identifier = d['load_name']
 
             return True
         else:
@@ -1171,12 +1182,17 @@ def _load_labnumber_meta(self, labnumber):
                 #     irrad = ip.level.irradiation.name
                 #     self.repository_identifier = '{}{}'.format(ipp, irrad)
                 if project_name != "REFERENCES":
-                    if self.use_project_based_repository_identifier:
+                    repo = None
+                    if self.repository_identifier_model == "Project":
                         if ipp and project_name.startswith(ipp):
                             repo = project_name
                         else:
                             repo = camel_case(project_name)
 
+                    elif self.repository_identifier_model == "Load":
+                        repo = self.load_name
+
+                    if repo:
                         self.debug("unprepped repo={}".format(repo))
                         repo = prep_repo_name(repo)
                         self.debug("setting repository to {}".format(repo))
@@ -1199,9 +1215,10 @@ def _load_labnumber_meta(self, labnumber):
                                         "Failed to add {}."
                                         "\nResolve issue before proceeding!!".format(m)
                                     )
+                                    return
 
                 d["repository_identifier"] = self.repository_identifier
-
+                d["load_name"] = self.load_name
                 if self.mode != SIMPLE:
                     self._make_irrad_level(ip)
                     d["irradiation"] = self.selected_irradiation

pychron/experiment/experiment_executor.py

@@ -2120,8 +2120,18 @@ def _pre_execute_check(self, prog=None, inform=True):
             (self._check_for_email_plugin, "Check For Email Plugin"),
             (self._check_for_massspec_db, "Check For Mass Spec Plugin"),
             (self._check_first_aliquot, "Setting Aliquot"),
-            (self._check_dated_repos, "Setup Dated Repositories"),
-            (self._check_repository_identifiers, "Check Repositories"),
+            (
+                self._check_dated_repos if self.use_dvc_persistence else None,
+                "Setup Dated Repositories",
+            ),
+            (
+                (
+                    self._check_repository_identifiers
+                    if self.use_dvc_persistence
+                    else None
+                ),
+                "Check Repositories",
+            ),
             (self._check_managers, "Check Managers"),
             (self._check_dashboard, "Check  Dashboard"),
             (self._check_memory, "Check Memory"),
@@ -2132,6 +2142,9 @@ def _pre_execute_check(self, prog=None, inform=True):
         )
 
         for func, msg in funcs:
+            if not func:
+                continue
+
             self.debug("checking: {}".format(msg))
             if prog:
                 prog.change_message(msg)
@@ -2293,6 +2306,12 @@ def _pre_run_check(self, spec, inform=False):
     #             db.add_repository_association(expid, c)
     #         self._cached_runs = []
 
+    def _check_repository_health(self, inform):
+        for ei in self.experiment_queues:
+            repos = {ai.repository_identifier for ai in ei.cleaned_automated_runs}
+            for ri in repos:
+                self.datahub.mainstore
+
     def _check_repository_identifiers(self, inform):
         db = self.datahub.mainstore.db
 
@@ -2359,6 +2378,8 @@ def _sync_repositories(self, prog):
                     prog.change_message("Syncing {}".format(e))
                     if not self.datahub.mainstore.sync_repo(e, use_progress=False):
                         return e
+                    if not self.datahub.mainstore.is_clean(e):
+                        return e
 
     def _post_run_check(self, run):
         """

pychron/experiment/factory.py

@@ -232,6 +232,10 @@ def _update_queue(self, name, new):
         elif name == "extract_device":
             self._set_extract_device(new)
 
+        elif name == "load_name":
+            # used by run factory to set repository_identifier by load_name
+            self.run_factory.load_name = new
+
         self._auto_save()
 
     def _auto_save(self):

pychron/experiment/tasks/experiment_panes.py

@@ -345,9 +345,14 @@ def _get_info_group(self):
                     run_factory_name("clear_repository_identifier_button"), "clear"
                 ),
                 UItem(
-                    run_factory_name("use_project_based_repository_identifier"),
-                    tooltip="Use repository identifier based on project name",
-                ),
+                    run_factory_name("repository_identifier_model"),
+                    tooltip='None: You must specify repository\nLoad: repository based on "load" name\nProject: '
+                    'repository based on "project" name',
+                ),
+                # UItem(
+                #     run_factory_name("use_project_based_repository_identifier"),
+                #     tooltip="Use repository identifier based on project name",
+                # )
             ),
             HGroup(
                 run_factory_item(

pychron/furnace/base_furnace_manager.py

@@ -17,11 +17,13 @@
 import time
 
 from traits.api import Instance, Float, Bool, Any
+from traits.has_traits import on_trait_change
 from traits.trait_errors import TraitError
 
 from pychron.extraction_line.switch_manager import SwitchManager
 from pychron.furnace.base_stage_manager import BaseFurnaceStageManager
 from pychron.graph.time_series_graph import TimeSeriesStreamStackedGraph
+from pychron.hardware.eurotherm.base import pid_parameters_path
 from pychron.managers.stream_graph_manager import StreamGraphManager
 from pychron.paths import paths
 from pychron.response_recorder import ResponseRecorder
@@ -36,6 +38,7 @@ class BaseFurnaceManager(StreamGraphManager):
     temperature_readback = Float
     output_percent_readback = Float
 
+    use_full_power = Bool(False)
     response_recorder = Instance(ResponseRecorder)
 
     use_network = False
@@ -78,11 +81,18 @@ def _response_recorder_default(self):
     def _handle_state(self, new):
         pass
 
+    def extract(self, v, **kw):
+        self.debug("extract")
+        # self.response_recorder.start()
+        self.debug("set setpoint to {}".format(v))
+        self.setpoint = v
+
     def test_furnace_api(self):
         self.info("testing furnace api")
         ret, err = False, ""
         if self.controller:
             ret, err = self.controller.test_connection()
+        self.debug(f"testing result {ret} {err}")
         return ret, err
 
     def test_connection(self):
@@ -130,6 +140,12 @@ def get_active_pid_parameters(self):
         return result
 
     def set_pid_parameters(self, v):
+        p, exists = pid_parameters_path()
+        if not exists:
+            self.unique_warning(
+                f"No PID parameters file at {p}. Cannot set PID parameters"
+            )
+
         self.debug("setting pid parameters for {}".format(v))
         from pychron.hardware.eurotherm.base import (
             get_pid_parameters,
@@ -144,6 +160,7 @@ def set_pid_parameters(self, v):
             self._pid_str = param_str
             self.controller.set_pid(param_str)
 
+    @on_trait_change("setpoint")
     def set_setpoint(self, v):
         self.debug("set setpoint={}".format(v))
         self.set_pid_parameters(v)
@@ -210,9 +227,9 @@ def _update_scan(self):
         self.output_percent_readback = output or 0
 
         setpoint = self.controller.get_setpoint(verbose=False)
-        self._update_scan_graph(response, output, setpoint or 0)
+        self._set_scan_graph_values(response, output, setpoint or 0)
 
-    def _update_scan_graph(self, response, output, setpoint):
+    def _set_scan_graph_values(self, response, output, setpoint):
         x = None
         update = False
         if response is not None:

pychron/furnace/ifurnace_controller.py

@@ -31,5 +31,23 @@ def read_setpoint(self):
     def set_setpoint(self, v):
         pass
 
+    def test_connection(self):
+        pass
+
+    def get_process_value(self):
+        pass
+
+    def get_output(self):
+        pass
+
+    def set_pid(self, param_str):
+        pass
+
+    # def read_temperature(self, force=False, verbose=False):
+    #     pass
+    #
+    # def read_output_percent(self, force=False, verbose=False):
+    #     pass
+
 
 # ============= EOF =============================================

pychron/furnace/ldeo/furnace_manager.py

@@ -182,7 +182,7 @@ def _update_scan(self):
                     output1 * 10
                 )  # this is a voltage on a 0-10 scale
 
-            self._update_scan_graph(
+            self._set_scan_graph_values(
                 output1, temp1, 0
             )  # not writing setpoint at moment since not implemented