Commit Graph

Select branches

Hide Pull Requests

andrea

develop

dilsc

dilsc_feb2023

flame

flowsas

hot_lakeshore

mirror

paul

sinqtmp

tmp

tnmr

trinamic

trinamic_persistent

ultrasound

uniax

uniax_may2021

wip

work

v0.20.1-7

Mono Color

• 6caf4fc993 uniax stick sans 2022-09-08 08:27:17 +02:00
• 95eb4e969a change safe current to 0.3, set offset to 15 Markus Zolliker 2022-09-07 13:13:59 +02:00
• ada4c43ebf change max force to 190 N Markus Zolliker 2022-09-07 13:11:42 +02:00
• 9a40d27354 fix bug in ls340res Markus Zolliker 2022-09-07 13:10:37 +02:00
• 6929422b94 fox update of param2path dict Markus Zolliker 2022-08-24 17:02:21 +02:00
• 2cd66c2e08 sea: allow multiple parameters being updated with one hdb path l_samenv 2022-08-24 16:57:27 +02:00
• 268ebbe00e Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-08-23 17:21:21 +02:00
• ea960f2250 fix ln2fill enum l_samenv 2022-08-23 17:21:01 +02:00
• 9673f7b242 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip dmc 2022-08-22 15:56:48 +02:00
• 292d028fe6 add ill5 p sample stick dmc 2022-08-22 15:55:58 +02:00
• aa0c0421c3 add Be-Filter addon for boa boa 2022-08-19 12:43:36 +02:00
• db43a77614 remove some log.debug statements Markus Zolliker 2022-08-16 17:17:54 +02:00
• 21bcc7ce98 an enum with value 0 should be interpreted as False Markus Zolliker 2022-06-01 16:19:27 +02:00
• 7b9c099321 default unit to UTF8 Enrico Faulhaber 2022-08-01 16:40:45 +02:00
• 33a7c56fa2 allow to convert numpy arrays to ArrayOf Markus Zolliker 2022-05-25 09:23:16 +02:00
• ab2fe6200a reintroduced individual init of generalConfig.defaults Markus Zolliker 2022-03-23 13:53:46 +01:00
• d5d04dc82f add simple interactive python client Markus Zolliker 2022-08-09 15:29:12 +02:00
• f23e42de1f fix bugs with persistent_limit parameter camea 2022-08-16 16:54:30 +02:00
• 2f6954c4f3 magfield: add persistent_limit parameter Markus Zolliker 2022-08-16 10:02:57 +02:00
• b81fc7b122 remove tm from ill5.cfg dmc 2022-08-15 16:22:02 +02:00
• 704bba292a add mb11 stick camea 2022-08-12 15:13:07 +02:00
• f1e642b1b0 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-08-12 15:12:23 +02:00
• 8e3cdc80e4 improvements in magfiels/ips_mercury camea 2022-08-12 15:10:23 +02:00
• 43880346d6 add simple interactive python client Markus Zolliker 2022-08-09 15:29:12 +02:00
• d0794a7803 [deb] Release v0.13.1 Jenkins system 2022-08-02 15:31:52 +02:00
• dc76ac92de secop_mlz: minor rework entangle client Enrico Faulhaber 2022-08-02 11:54:53 +02:00
• 8579368259 make startup faster in case of errors Markus Zolliker 2022-06-02 10:03:38 +02:00
• cd90385e6c an enum with value 0 should be interpreted as False Markus Zolliker 2022-06-01 16:19:27 +02:00
• 3496e391f6 check for last_target in conditions for redo camea 2022-08-02 11:19:30 +02:00
• 3acea5f7c7 [deb] Release v0.13.0 Jenkins system 2022-08-02 09:47:07 +02:00
• c564ae392c default unit to UTF8 Enrico Faulhaber 2022-08-01 16:40:45 +02:00
• bb40a0820c use flag instead tolerance for redo check camea 2022-07-29 15:12:44 +02:00
• 8f739b11dc ILL1 .cfg created and ILL1stick l_samenv 2022-07-06 16:14:16 +02:00
• 7ef386424c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-07-06 11:24:56 +02:00
• 53b3dd2fad fix stick motor port number on ma02-ts l_samenv 2022-07-06 11:24:27 +02:00
• 6554e5de47 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip focus 2022-07-05 11:02:15 +02:00
• 60ec1edb32 fix He-fill enum focus 2022-07-05 11:00:35 +02:00
• 131082313d added stick-motor addon focus 2022-07-05 10:57:43 +02:00
• f12b0b3da0 add ill5 gas pressure stick tasp 2022-07-04 14:23:51 +02:00
• 5ecd9557a3 add lev to ill5 cfg tasp 2022-07-04 14:23:08 +02:00
• 3769ddca75 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-06-29 11:51:01 +02:00
• a4dec7b832 fix ill5 cfg l_samenv 2022-06-29 11:49:51 +02:00
• 390af7eff7 improve general config Markus Zolliker 2022-06-29 11:40:17 +02:00
• f495313018 dil2/3/4: added more temperatures, added dil3 focus 2022-06-28 08:22:13 +02:00
• 18ded2159c changed mf from Readable to Drivable zebra 2022-06-28 08:09:00 +02:00
• 760fc9eb40 added jtccr sea cfg zebra 2022-06-27 11:06:45 +02:00
• 5d348eb7b1 fix ma6 stick motor port zebra 2022-06-27 11:06:00 +02:00
• 86767e2fa1 add still and sorb heaters to dil5 camea 2022-06-21 15:32:15 +02:00
• 8a995aafed fix issue with non matching persistent field camea 2022-06-21 15:31:44 +02:00
• 7379ea91e5 fix issue sending numbers in exp. format camea 2022-06-21 15:30:20 +02:00
• cf42119f85 fix handling of persistent_field parameter Markus Zolliker 2022-06-17 08:22:58 +02:00
• 80d9a790ec fixed proper parameter inheritance zebra 2022-06-15 16:02:38 +02:00
• 5951312d40 fixes to make pylint happy Markus Zolliker 2022-06-14 15:24:27 +02:00
• 778ac17172 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-06-14 15:08:35 +02:00
• dfbc1c757a fixes in mercury an triton camea 2022-06-14 15:07:17 +02:00
• 54b58f2188 step_size instead of speed_factor camea 2022-06-14 15:03:53 +02:00
• f855b9db40 fixes in convergence and statemachine camea 2022-06-14 14:07:24 +02:00
• 6fd365197a sea driver: no events for unexported params Markus Zolliker 2022-06-13 14:08:26 +02:00
• 8b2abf7044 fix iodev to io in ill4stick.cfg focus 2022-06-10 14:31:44 +02:00
• 182a8c7e49 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip zebra 2022-06-10 13:22:04 +02:00
• 6da1a89459 add dil4/variox, fix ma10 in cfg zebra 2022-06-10 13:21:20 +02:00
• f1d5e82bb4 remove unneccessary fiels in cfg/sea zebra 2022-06-10 13:20:12 +02:00
• e6fdd79df4 start SEA server if not running Markus Zolliker 2022-06-08 16:28:39 +02:00
• a35231f5bd fixes in mb11/dil5 Markus Zolliker 2022-06-07 14:26:30 +02:00
• 9c7b6aeb94 various fixes on mb11/dil5 zebra 2022-06-07 11:45:25 +02:00
• 68e2e06905 fixes in convergence, mercury, phytron, triton zebra 2022-06-01 09:21:47 +02:00
• 3563a0db16 fix ill4 l_samenv 2022-05-31 16:44:53 +02:00
• 4cb0031302 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip zebra 2022-05-30 12:10:51 +02:00
• 4bfb76ca82 IPS mercury zebra 2022-05-30 12:09:57 +02:00
• 3e6f1bebf7 added features zebra 2022-05-30 12:07:33 +02:00
• 1357ead435 remove IOHandler stuff Markus Zolliker 2022-05-25 14:38:06 +02:00
• 6a0261c728 allow to convert numpy arrays to ArrayOf Markus Zolliker 2022-05-25 09:23:16 +02:00
• d717a481d7 feature implementation Markus Zolliker 2022-05-20 15:22:17 +02:00
• 4c94580cb9 channel switcher for Lakeshore 370 with scanner Markus Zolliker 2022-05-24 16:34:10 +02:00
• efca358c72 add adq_mr and iqplot Ultrasound PC 2022-05-23 15:30:23 -04:00
• 319f3b4649 upgrade upltrasound to newer version of frappy Ultrasound PC 2022-05-23 15:25:41 -04:00
• 7fc030191d Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-05-19 18:10:14 +02:00
• 3959da6847 stick rotatation is either om or stickrot l_samenv 2022-05-19 18:09:18 +02:00
• 39171fe06e add limits to phytron Markus Zolliker 2022-05-19 18:05:52 +02:00
• 0972e8c7e8 add sign to phytron motor zebra 2022-05-19 17:58:54 +02:00
• 7b9d2d1701 allow quiet SEA requests Markus Zolliker 2022-05-16 17:04:47 +02:00
• f276b973f5 add variox l_samenv 2022-05-16 15:28:30 +02:00
• 8739ef04d7 add ori3 l_samenv 2022-05-12 16:36:44 +02:00
• aea73d976c add ori6 eiger 2022-05-12 16:23:58 +02:00
• 4c98a4c706 add sticks and cfg l_samenv 2022-05-12 16:16:26 +02:00
• 62146aa477 add heliox stick l_samenv 2022-05-05 10:31:50 +02:00
• 2bdfcf10a3 fix triton Markus Zolliker 2022-05-03 16:48:33 +02:00
• f9db90d89b update secop_psi/sea.py tasp 2022-04-29 16:30:19 +02:00
• 1ded96abba fix keithley 2601b after tests Markus Zolliker 2022-04-27 14:05:02 +02:00
• cb170bd73b allow a configfile path as single argument to secop-server Markus Zolliker 2022-04-22 16:10:29 +02:00
• a379805e43 add 'ts' to the ppms simulation Markus Zolliker 2022-04-22 16:14:26 +02:00
• 9ff8c3ba54 add ma10, add stick motors l_samenv 2022-04-29 11:08:04 +02:00
• 1d7351ba4f Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-04-29 08:47:39 +02:00
• 3ac8876b37 cti5, cti7, ma10 l_samenv 2022-04-29 08:47:11 +02:00
• 9fa5aba052 add dom motor to MA7 Markus Zolliker 2022-04-28 17:21:28 +02:00
• bc13a912b4 change descr of ccr3 (ZEBRA) zebra 2022-04-28 16:32:38 +02:00
• 33ba9ca946 add ccr3 l_samenv 2022-04-28 16:31:20 +02:00
• 7d43f1cd58 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip tasp 2022-04-28 13:43:46 +02:00
• 21a3865c5d general ini files for main, stick and addons tasp 2022-04-28 13:43:09 +02:00
• f1a639bc3c add secop_psi/triton.py Markus Zolliker 2022-04-28 12:56:42 +02:00