Merge branch 'funding' into master

content/_index.md

@@ -7,6 +7,8 @@ Experiment control
  - ARTIQ
  - Sinara core
  - Control loops
+ - Funding
+ - Publications
  - Resources
 
 Gateware

content/experiment-control/artiq.md

@@ -57,32 +57,17 @@ Technologies employed include <a href="http://python.org/" target="_blank" rel="
 
 
 
-{{ layout_separator(separator_title="Partners", separator_bg="true") }}
+{{ layout_separator(separator_title="Ecosystem", separator_bg="true") }}
 
 
 
 {% layout_centered_content() %}
 
-ARTIQ was initiated by the Ion Storage Group at NIST, and other partners have contributed to major features and developments related to ARTIQ and/or Sinara. Please get in touch if you would like to help move ARTIQ forward!
+ARTIQ was initiated by the Ion Storage Group at NIST, and other partners have contributed to major features and developments related to ARTIQ and/or Sinara. See [Funding and licensing model](../funding) for more details.
 
 {% end %}
 
 
-
-{% layout_logos() %}
-
-[![log nist](/images/logo_nist.png)](https://www.nist.gov/pml/time-and-frequency-division/ion-storage)
-[![logo oxford](/images/logo_oxford.png)](https://www2.physics.ox.ac.uk/)
-[![logo jqi](/images/logo_jqi.png)](http://jqi.umd.edu/)
-[![logo duke](/images/logo_duke.png)](http://www.duke.edu)
-[![logo ptb](/images/logo_ptb.png)](http://ptb.de)
-[![logo bmbf](/images/logo_bmbf.png)](https://bmbf.de)
-[![logo ise](/images/logo_ise.png)](http://www.ise.pw.edu.pl)
-
-{% end %}
-
-
-
 {% layout_text_img(src="images/open-source-min.png", popup="images/origin/gui_screenshot_allcock.jpg", alt="gui screenshot allcock small", textleft=true) %}
 
 ##### Open source
@@ -107,16 +92,3 @@ The first ARTIQ core devices used hardware built in-house by physicists. To impr
 
 
 {{ layout_centered_img(title="Grafana linked to ARTIQ, monitoring an Opticlock ion trap", src='images/grafana@2x.png', popup='images/origin/grafana.png', alt='grafana', shadow=true) }}
-
-
-{% layout_logos(title="Other users and contributors") %}
-
-[![](/images/logo_freiburg.png)](https://www.qsim.uni-freiburg.de/)
-[![](/images/logo_uh.png)](https://www.lnqe.uni-hannover.de)
-[![](/images/logo_hu.png)](https://www.physics.hu-berlin.de/en/qom)
-[![](/images/logo_sysu.png)](http://spa.sysu.edu.cn/en)
-[![](/images/logo_wipm.jpg)](http://www.wipm.cas.cn/)
-[![](/images/logo_ustc.png)](http://en.ustc.edu.cn/)
-[![](/images/logo_tsinghua.png)](http://www.tsinghua.edu.cn/)
-
-{% end %}

content/experiment-control/funding.md

@@ -0,0 +1,76 @@
++++
+title = "Funding"
+weight = 4
+template = "page.html"
+
+[extra]
++++
+
+The free and open dissemination of methods and results is central to scientific progress.
+
+The ARTIQ authors, contributors, and supporters consider the free and open exchange of scientific tools to be equally important and have chosen the licensing terms of ARTIQ accordingly. ARTIQ, including its gateware, the firmware, and the ARTIQ tools and libraries are licensed as LGPLv3+. The Sinara hardware designs are licensed under CERN OHL.
+This ensures that a user of ARTIQ or Sinara hardware designs obtains broad rights to use, redistribute, study, and modify them.
+
+ARTIQ and the related components that we are developing ([Migen/MiSoC](/gateware/migen), [nMigen](/gateware/nmigen), [smoltcp](/software/smoltcp), [minimq](https://github.com/quartiq/minimq), [zynq-rs](https://git.m-labs.hk/m-labs/zynq-rs), [SiPyCo](https://github.com/m-labs/sipyco), [RayOpt](https://github.com/quartiq/rayopt), [WFVM](https://git.m-labs.hk/m-labs/wfvm), ...) need to be kept on a sound financial basis. We have been relying on a combination of [hardware sales](../place-order), sponsorships, and grants.
+
+##### Sponsors
+
+We acknowledge support from our partners below. Please get in touch (sales@m-\*\*\*.hk) if you also want to move ARTIQ forward!
+
+###### Platinum level
+
+[![log nist](/images/logo_nist.png)](https://www.nist.gov/pml/time-and-frequency-division/ion-storage)
+
+ARTIQ was initiated by the [Ion Storage Group](https://www.nist.gov/pml/time-and-frequency-division/ion-storage) at NIST, who provided valuable technical insight as well as financial support to develop the first version of the ARTIQ software and gateware targeting the KC705 development kit. This included some FPGA SoC libraries such as a SDRAM controller and PHYs, the first two iterations of the ARTIQ runtime including the development of [smoltcp](/software/smoltcp), the RTIO infrastructure and PHYs, the ARTIQ-Python LLVM-based compiler, RTIO DMA, the ARTIQ dashboard and browser, the ARTIQ master, and several controllers. They also supported the more recent ARTIQ port to Zynq, targeting the ZC706 development kit, and enabling ARTIQ-Python kernels to take advantage of the 1GHz CPU in the core device; as well as matrix and trigonometric function support in ARTIQ-Python kernels.
+<small>*Disclaimer: NIST and the United States government are not providing an endorsement of ARTIQ.*</small>
+
+[![logo oxford](/images/logo_oxford.png)](https://www2.physics.ox.ac.uk/research/ion-trap-quantum-computing-group)
+
+The [University of Oxford](https://www2.physics.ox.ac.uk/research/ion-trap-quantum-computing-group) funded major improvements to the RTIO infrastructure: the Distributed RTIO (DRTIO) system that allows clock synchronization and RTIO command transfer between FPGAs using cost-effective high-speed serial links (e.g. over fiber optics), and changes to the RTIO architecture to improve scalability. They also funded the Sinara Sampler hardware and software, the [SU-Servo](https://m-labs.hk/artiq/manual-beta/core_drivers_reference.html?highlight=suservo#artiq.coredevice.suservo.SUServo) integrated laser intensity servo, parts of Urukul and Zotino, firmware development on the Sinara Thermostat, the Kasli v2.0 ARTIQ support, the Fastino ARTIQ support, parts of the Sinara Phaser gateware and software development, and significant parts of the Booster RF amplifier.
+
+[![logo ise](/images/logo_ise.png)](http://www.ise.pw.edu.pl)
+
+[Warsaw University of Technology](http://www.ise.pw.edu.pl) contributed most of the hardware designs and prototypes for the Sinara ecosystem.
+
+###### Gold level
+
+[![logo oregon](/images/logo_oregon.png)](https://ions.uoregon.edu/)
+
+The [University of Oregon](https://ions.uoregon.edu/) funded a large part of the Sinara Phaser gateware and software development, as well as firmware for the Pounder PDH/phase lock signal generator for Stabilizer.
+
+[![logo arl](/images/logo_arl_devcom.png)](http://brittonlab.umd.edu/)
+
+The [Army Research Lab](http://brittonlab.umd.edu/) funded the SAWG high-throughput digital waveform generator, as well as ARTIQ support for the Sayma and Metlino boards.
+
+
+###### Silver level
+
+[![logo quest](/images/logo_luh.png)](https://www.quest-lfs.uni-hannover.de/)
+
+[QUEST/Uni Hannover](https://www.quest-lfs.uni-hannover.de/) funded gateware and software support for the Grabber EEM, partial Mirny support, part of the Fastino development, and part of Urukul synchronization support.
+
+[![logo ptb](/images/logo_ptb.png)](http://ptb.de)
+
+PTB funded the development of lock-in amplifier support for the Sinara Stabilizer, as well as part of Urukul synchronization support.
+
+[![logo uwisc](/images/logo_uwisc.png)](http://hexagon.physics.wisc.edu/)
+
+The [University of Wisconsin-Madison](http://hexagon.physics.wisc.edu/) funded the development of Urukul RAM mode support.
+
+[MIT](http://web.mit.edu/~cua/www/quanta/) funded parts of the Sinara Phaser gateware and software development.
+
+[![logo hu](/images/logo_hu.png)](https://www.physik.hu-berlin.de/en/qom/people/qom-group/markus/view)
+
+[Humboldt University of Berlin](https://www.physik.hu-berlin.de/en/qom/people/qom-group/markus/view) funded [prototype digital spectroscopy modulation/demodulation firmware](https://github.com/quartiq/queenmod), which is part of the "Optical quantum technologies on nanosatellites" (QUEEN) project.
+
+##### Grants
+
+Parts of ARTIQ and Sinara have been developed through the participation of our sister company QUARTIQ GmbH in European research grant programmes.
+
+[![logo opticlock](/images/logo_opticlock.png)](https://www.opticlock.de/)
+
+The BMBF project [Opticlock](https://www.opticlock.de/) developed an optical clock as a replacement for a hydrogen maser, based on a single ytterbium ion captured and laser-cooled in an ion trap. It helped fund the development of the Kasli, Urukul, Zotino and Sampler modules.
+
+![logo aiartiq](/images/logo_aiartiq.png)
+
+AI-ARTIQ develops a control platform for laser sources and atom interferometer-based quantum sensors.

sass/css/_layout.scss

@@ -95,21 +95,6 @@ h3, h2, h1 {
   background: #fff;
 }
 
-.logos-centered {
-  p {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-content: center;
-    align-items: center;
-    flex-wrap: wrap;
-    img {
-      width: 150px;
-      padding: .8rem;
-    }
-  }
-}
-
 .card-img-top {
   padding: .4rem; }
 
@@ -228,14 +213,6 @@ img.kf25 {
     background: #fff url("../images/jobs-min@2x.png") no-repeat top right;
   }
 
-  .logos-centered {
-    p {
-      img {
-        width: 200px;
-      }
-    }
-  }
-
   .dropdown-menu {
     padding-top: .5rem;
     margin-top: 12px;

templates/shortcodes/layout_logos.html

@@ -1,7 +0,0 @@
-<div class="logos-centered mt-5 mb-5 text-center">
-
-  {% if title %}<h5>{{ title}}</h5>{% endif %}
-
-  {{ body | markdown | safe }}
-
-</div>