Skip to content

Commit

Permalink
Merge branch 'develop' into norm-corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
IshaanDesai committed Aug 14, 2024
2 parents 5a51826 + 9c16bfb commit 2f1c940
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ To install using `pip`, go to the directory `micro-manager/` and run
pip install --user .
```

To install using Python, go to the project directory `micro-manager/` and run

```bash
python setup.py install --user
```
Adding optional dependencies works as above by adding them after the dot, e.g. `.[sklearn]`.

## Get the latest development version

Expand Down
4 changes: 2 additions & 2 deletions micro_manager/micro_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,9 @@ def _solve_micro_simulations(self, micro_sims_input: list, dt: float) -> list:
# If simulation crashes, log the error and keep the output constant at the previous iteration's output
except Exception as error_message:
self._logger.error(
"Micro simulation at macro coordinates {} has experienced an error. "
"Micro simulation at macro coordinates {} with input {} has experienced an error. "
"See next entry on this rank for error message.".format(
self._mesh_vertex_coords[count]
self._mesh_vertex_coords[count], micro_sims_input[count]
)
)
self._logger.error(error_message)
Expand Down

0 comments on commit 2f1c940

Please sign in to comment.