| Lines 4-7 were replaced by lines 4-6 |
| - to go also for a new sample environment framework Frappy. Frappy is a Python Framework developed by Enrico Faulhaber (MLZ) and Markus |
| - Zolliker (PSI), for creating servers to access mobile equipment like |
| - sample environment, using [SECoP|https://github.com/SampleEnvironment/SECoP] as communication |
| - protocol towards the experiment control software. |
| + to go also for a new sample environment framework Frappy. Frappy is a Python Framework developed at MLZ and PSI, |
| + for creating servers to access mobile equipment like sample environment, |
| + using [SECoP|https://github.com/SampleEnvironment/SECoP] as communication protocol towards the experiment control software. |
| Line 9 was replaced by line 8 |
| - For a transition period [SEA|Sea] is still used for all devices not yet migrated to Frappy. Today (spring 2022) still most |
| + For a transition period [SEA|Sea] is still used for all devices not yet migrated to Frappy. Today (spring 2025) still a lot |
| Removed lines 12-21 |
| - !! Instruments using NICOS and Sample Environment |
| - |
| - Currently (April 2022), the following instruments running NICOS are supported to access sample environment: |
| - |
| - * __HRPT, ZEBRA, TASP, EIGER, CAMEA, FOCUS, SANS-I, AMOR, BOA__ |
| - |
| - Some of the features described here might not yet be up to date on your instrument, |
| - please contact [Markus Zolliker], if you want to use sample environment with NICOS, and things are not working as expected. |
| - |
| - |
| Lines 27-32 were replaced by lines 16-21 |
| - frappy_main('<main cfg>') # change main SE configuration (e.g. cryostat) |
| - frappy_stick('<stick cfg>') # change sample-stick configuration |
| - frappy_stick('') # remove stick |
| - frappy_main('') # remove main SE apparatus |
| - frappy_main() # show the current SE configuration |
| - frappy_addons(...) # similar to above, for additional equipment not covered by main/stick |
| + frappy('<main cfg>') # change main SE configuration (e.g. cryostat) |
| + frappy('<main cfg>', '<stick cfg>') # change main and sample-stick configuration |
| + frappy(stick='<stick cfg>') # change stick only |
| + frappy('') # remove main SE apparatus including stick |
| + frappy.show() # show the current SE configuration |
| + frappy(addons=...) # similar to above, for additional equipment not covered by main/stick |
| Lines 38-39 were replaced by lines 27-28 |
| - |
| - !! Test integration of SE into NICOS |
| + There is some automatic detection of devices in SEA. You might get a message in NICOS |
| + to accept the detected devices. To confirm, execute simply {{frappy()}} |
| Removed lines 41-43 |
| - For testing there are 2 simulated main devices 'cryosim' and 'magsim' available. Please check with them if |
| - temperatures and magnetic field values are saved in your datafile, and other things like temperature or |
| - magnetic field scans. |
| Removed line 54 |
| - * __Tr__: the regulation temperature (e.g. VTI), readonly |
| Line 58 was replaced by line 43 |
| - Typically, either T and Tr or T and Ts point to the same real device. |
| + When the sample temperature is controlled, T and Ts point to the same real device. |
| Lines 65-66 were replaced by line 50 |
| - It might be that the SEA server is not yet running. On the instruments mentioned above, the SEA server is no longer |
| - controlled by monit. Controlling the SEA and Frappy servers: |
| + It might be that the SEA server is not yet running. Controlling the SEA and Frappy servers: |
| Line 81 was replaced by line 65 |
| - ! How to Restart a Frappy server |
| + ! How to Restart a Frappy server(s) |
| Line 84 was replaced by line 68 |
| - problems, it might be helpful to stop and restart the frappy server: |
| + problems, it might be helpful to restart the frappy server(s): |
| Lines 86-87 were replaced by line 70 |
| - frappy_main('') # stop the main frappy server |
| - frappy_main('<main cfg>') # start the main frappy server |
| + frappy('restart') # stop and start main and stick frappy servers |
| Line 90 was replaced by line 73 |
| - If the problem is related to a device on the stick or addons, you will need the commands frappy_stick or frappy_addons. |
| + If the problem is related to a device on the stick or addons, you can restart them individually with {{frappy(stick=...)}} or {{frappy(addons=...)}}. |
| Line 95 was replaced by line 78 |
| - standard sample table for omega. In this case (currently configured on ZEBRA and TASP), |
| + standard sample table for omega. In this case (configured on TASP, EIGER, CAMEA, ZEBRA and DMC), |
| Removed line 100 |
| - |ZEBRA | om | om_raw |
| At line 101 added 3 lines. |
| + |EIGER | a3 | a3_raw |
| + |ZEBRA | om | om_raw |
| + |DMC | a3 | a3s |
| Line 104 was replaced by line 89 |
| - On horizontal field magnets, the stick rotation is called __om_stick__, and is |
| + On horizontal field magnets, the stick rotation is called __om_stickrot__, and is |
LIN