diff --git a/pages/merlin7/02-How-To-Use-Merlin/transfer-data.md b/pages/merlin7/02-How-To-Use-Merlin/transfer-data.md index f15a64f..392e7da 100644 --- a/pages/merlin7/02-How-To-Use-Merlin/transfer-data.md +++ b/pages/merlin7/02-How-To-Use-Merlin/transfer-data.md @@ -24,18 +24,18 @@ Most data transfer methods support both sending and receiving, so you may initia ### Choosing the best transfer method -| **Scenario** | **Recommended Method** | **Reason** | -| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | -------------------------------------------------------- | -| Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH | -| Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools | -| Large dataset, high speed needed (not sensitive) | FTP via `login002` | Fastest transfer speed (unencrypted data channel) | -| Large dataset, high speed needed (sensitive data) | FTP via `login001` | Encrypted control & data channels for security | -| Windows interactive GUI transfer | WinSCP | User-friendly interface, supports drag-and-drop | -| Cross-platform interactive GUI transfer | FileZilla | Works on Linux/macOS/Windows, supports both SSH and FTP | -| From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus | -| Need for sharing large files | [SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload) | Supports sharing large file and expiration date | -| PSI -> Merlin7 over FTP (port 21) | Any FTP-based client | Port 21 allowed from PSI to Merlin7 | -| PSI -> Merlin7 over SSH (port 22) | Any SSH-based method | Port 22 allowed from PSI to Merlin7 | +| **Scenario** | **Recommended Method** | **Reason** | +| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | +| Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH | +| Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools | +| Large dataset, high speed needed (not sensitive) | FTP via `login002` | Fastest transfer speed (unencrypted data channel) | +| Large dataset, high speed needed (sensitive data) | FTP via `login001` | Encrypted control & data channels for security, but slower than `login002` | +| Windows interactive GUI transfer | WinSCP | User-friendly interface, PSI Software Kiosk, supports drag-and-drop | +| Cross-platform interactive GUI transfer | FileZilla | User-friendly interface, works on Linux/macOS/Windows, supports drag-and-drop | +| From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus | +| Need for sharing large files | [SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload) | Supports sharing large file and expiration date | +| PSI -> Merlin7 over FTP | Any FTP-based client | Port 21 allowed from PSI to Merlin7 | +| PSI -> Merlin7 over SSH | Any SSH-based method | Port 22 allowed from PSI to Merlin7 | The next chapters contain detailed information about the different transfer methods available on Merlin7.