Merge pull request #51 from decarlof/master

added reference to LEAP and tomoCAM
tomopedia · Jan 10, 2024 · 4d8cb67 · 4d8cb67
2 parents 742828c + 1b4c49a
commit 4d8cb67
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 24 deletions.
diff --git a/main_pages/40_software.md b/main_pages/40_software.md
diff --git a/main_pages/50_data.md b/main_pages/50_data.md
@@ -6,6 +6,6 @@ include_in_menu: true
 ---
 
 {: .table .table-striped}
-|                   Name                   |                        Website                       | Description                                                                                                                                                                                           |
-|:----------------------------------------:|:----------------------------------------------------:|----------------------------------------------------------------------------|
-|     [TomoBank](/software/tomobank/)      |   [link](https://tomobank.readthedocs.io)            | Repository for tomographic datasets and synthetic imaging phantoms.        |
+|                   Name               |                        Website             | Description                                                         |
+|:------------------------------------:|:------------------------------------------:|---------------------------------------------------------------------|
+|     [TomoBank](/software/tomobank/)  |   [link](https://tomobank.readthedocs.io)  | Repository for tomographic datasets and synthetic imaging phantoms. |
diff --git a/main_pages/60_instruments.md b/main_pages/60_instruments.md
@@ -19,6 +19,6 @@ include_in_menu: true
 |     [ESRF ID16A](/instruments/esrf_id16a/)        |    [link](https://www.esrf.fr/UsersAndScience/Experiments/XNP/ID16A)                          | Nano-imaging at the European Synchrotron Radiation Facility.                                  |
 |     [ESRF ID16A](/instruments/esrf_id16b/)        |    [link](https://www.esrf.fr/UsersAndScience/Experiments/XNP/ID16B)                          | Nano-analysis at the European Synchrotron Radiation Facility.                                 |
 |     [ESRF ID19](/instruments/esrf_id19/)          |    [link](https://www.esrf.fr/home/UsersAndScience/Experiments/StructMaterials/ID19.html)     | Instrumentation Facility at the European Synchrotron Radiation Facility.                      |
-|     [DLS I12-JEEP](/instruments/dls_i12/)          |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/I12.html)     | Micro-CT imaging at Diamond Light Source.                      |
-|     [DLS K11-DIAD](/instruments/dls_k11/)          |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/DIAD.html)     | Micro-CT imaging, diffraction and scattering at Diamond Light Source.     
-|     [DLS I13-II](/instruments/dls_i13/)          |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/I13.html)     | Micro/Nano-CT imaging at Diamond Light Source.     
+|     [DLS I12-JEEP](/instruments/dls_i12/)         |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/I12.html)              | Micro-CT imaging at Diamond Light Source.                                                     |
+|     [DLS K11-DIAD](/instruments/dls_k11/)         |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/DIAD.html)             | Micro-CT imaging, diffraction and scattering at Diamond Light Source.                         |
+|     [DLS I13-II](/instruments/dls_i13/)           |    [link](https://www.diamond.ac.uk/Instruments/Imaging-and-Microscopy/I13.html)              | Micro/Nano-CT imaging at Diamond Light Source.                                                |
diff --git a/main_pages/70_questions.md b/main_pages/70_questions.md
@@ -34,6 +34,16 @@ Tomopedia runs on [GitHub pages](https://help.github.com/categories/github-pages
 and should not be difficult to edit. The main pages (those that show up in the menu)
 are located in `main_pages/`, while specific pages about algorithms or software
 packages are arranged by topic (e.g. TomoPy's page is located at `software/tomopy.md`).
+To clone your fork and verify the changes locally:
+
+{% highlight shell %}
+$ gem install bundler jekyll
+$ git clone https://github.com/tomopedia/tomopedia.github.io.git
+$ cd tomopedia.github.io.git
+$ bundle exec jekyll serve
+{% endhighlight %}
+
+then open your web browser entering the IP address provided by jekyll, typically this is http://127.0.0.1:4000/.
 
 #### Get direct access to git repository
 If you expect to make regular additions or modifications to Tomopedia, it is

diff --git a/software/leap.md b/software/leap.md
@@ -0,0 +1,14 @@
+---
+layout: page
+title: LEAP
+permalink: software/leap/
+---
+
+## Installation
+
+Installation and usage information is posted on the wiki page [here](https://github.com/LLNL/LEAP/wiki).
+
+
+## Benchmarks
+
+To be added...
diff --git a/software/tomocam.md b/software/tomocam.md
@@ -0,0 +1,15 @@
+---
+layout: page
+title: tomoCAM
+permalink: software/tomocam/
+---
+
+## Installation
+
+Installation and usage information is posted on the github [here](https://github.com/lbl-camera/tomocam).
+
+
+
+## Benchmarks
+
+To be added...