bliss-tomo merge requestshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests2024-03-07T13:48:54+01:00https://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/182Cleanup pcotomo/multitomo sequences2024-03-07T13:48:54+01:00Clemence MuzelleCleanup pcotomo/multitomo sequencesClemence MuzelleClemence Muzellehttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/218Update .gitlab-ci.yml2024-03-06T16:32:05+01:00Valentin VallsUpdate .gitlab-ci.ymlhttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/144Improve icat testability2023-10-23T14:16:35+02:00Valentin VallsImprove icat testabilityThis PR split the cooking of the icat metadata and the way to push the result.
This improve the readability and will allow to check the result in the future without triggering icat.
- `_send_icat_metadata` is not supposed to be overwri...This PR split the cooking of the icat metadata and the way to push the result.
This improve the readability and will allow to check the result in the future without triggering icat.
- `_send_icat_metadata` is not supposed to be overwritten
- `_get_icat_metadata` can be overrided and returns an intermediate dict containing the whole icat metadata
!142 have to be merged first.Valentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/196Fix tomosynch with BLISS 1.112023-10-23T14:15:08+02:00Valentin VallsFix tomosynch with BLISS 1.11Closes #89
info["state"] is an enum name (a string) in BLISS 1.11
This PR make sure the state comparison are still working.
FYI @paynoCloses #89
info["state"] is an enum name (a string) in BLISS 1.11
This PR make sure the state comparison are still working.
FYI @paynoValentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/178Reset reference parameters when number of motors changes2023-05-03T11:04:40+02:00Clemence MuzelleReset reference parameters when number of motors changesParameters are now reinitialized when number of motors changes in reference configParameters are now reinitialized when number of motors changes in reference configClemence MuzelleClemence Muzellehttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/166Fix normalized user_meta2023-04-25T09:27:03+02:00Valentin VallsFix normalized user_metaThe `user_meta` was normalized, but the result (`scan_info`) was not used.
`scan_info` was an unused var.The `user_meta` was normalized, but the result (`scan_info`) was not used.
`scan_info` was an unused var.Valentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/135Draft: Test robustness2022-11-09T18:13:31+01:00Valentin VallsDraft: Test robustnessTry to have a CI a bit more robust.Try to have a CI a bit more robust.Valentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/104last improvements done and tested on bm05 during shutdown2022-08-08T15:52:23+02:00Clemence Muzellelast improvements done and tested on bm05 during shutdownClemence MuzelleClemence Muzellehttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/98Merge updates from master in bm182022-07-29T16:54:45+02:00Jibril MammeriMerge updates from master in bm18(cherry picked from commit 077b1dfafa8180b12f9c01cdef071d81211e6c8c)(cherry picked from commit 077b1dfafa8180b12f9c01cdef071d81211e6c8c)Jibril MammeriJibril Mammerihttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/99Draft: Bm182022-07-21T17:21:57+02:00Jibril MammeriDraft: Bm18Jibril MammeriJibril Mammerihttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/79Fix typo2022-04-29T08:37:54+02:00Valentin VallsFix typo- Use `float32` instead of `numpy.float` (they prefer to specify the size, else to use python `float`)
- Fix actual detector size to return python int instead of numpy data- Use `float32` instead of `numpy.float` (they prefer to specify the size, else to use python `float`)
- Fix actual detector size to return python int instead of numpy dataValentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/66Fix tiling2022-04-06T16:10:00+02:00Valentin VallsFix tilingSmall fixes on the tiling scripts.Small fixes on the tiling scripts.Valentin VallsValentin Vallshttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/65Merge bm18-tomo into master2022-03-29T12:17:14+02:00Jibril MammeriMerge bm18-tomo into masterhttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/56Draft: Remove old version of tomo2022-01-24T14:56:45+01:00Jibril MammeriDraft: Remove old version of tomohttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/50Draft: zseries restructuration2021-12-16T16:46:55+01:00Clemence MuzelleDraft: zseries restructurationAdapted full_turn_scan, half_turn_scan and basic_turn_scan methods to zseries and fastzseries sequencesAdapted full_turn_scan, half_turn_scan and basic_turn_scan methods to zseries and fastzseries sequencesClemence MuzelleClemence Muzellehttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/6Draft: Resolve "Code refactoring to integrate fscans"2021-12-07T09:10:12+01:00Clemence MuzelleDraft: Resolve "Code refactoring to integrate fscans"Closes #16Closes #16https://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/30Draft: Grow up tomo config with extra stuffs2021-11-05T14:33:07+01:00Valentin VallsDraft: Grow up tomo config with extra stuffs
The `DarkShutterPreset` was replaced with a BLISS shutter. To connect it back to Tango shutter you still can configure the shutters this way (from BLISS doc)
```
- name: safshut
class: TangoShutter
shutter_type: SafetyShutter
uri:...
The `DarkShutterPreset` was replaced with a BLISS shutter. To connect it back to Tango shutter you still can configure the shutters this way (from BLISS doc)
```
- name: safshut
class: TangoShutter
shutter_type: SafetyShutter
uri: id42/bsh/1
- name: frontend
class: TangoShutter
shutter_type: FrontEnd # shutter_type is optionnal
uri: acs.esrf.fr:10000/fe/master/id42
```https://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/18Draft: Provides a tomo demo session2021-11-02T14:31:50+01:00Valentin VallsDraft: Provides a tomo demo sessionThis MR creates a demo session in order to launch and play with BLISS tomo tools.
It is intended to be use as basis for Daiquiri tomo GUI, but could be also useful in other context.
It depends on Lima simulmator supporting external tri...This MR creates a demo session in order to launch and play with BLISS tomo tools.
It is intended to be use as basis for Daiquiri tomo GUI, but could be also useful in other context.
It depends on Lima simulmator supporting external triggers: https://gitlab.esrf.fr/limagroup/Lima-camera-simulator/-/merge_requests/20
The demo can be launched like that
```
# starts everything including BEACON, LIMA SIMULATOR, WRITER...
./demo/start_demo_servers.py
```
A basic scan can be launched the following way:
```
hrtomo.parameters.sinogram_active = False
hrtomo.parameters.tomo_n = 50
hrtomo.run()
```
## Changelog
- Added a demo session
- Optics: `useroptic`, `tripleoptic`
- Detector: `tomocam`
- Tomo: `hrtomo`
- Axes: `srot`, `sx`, `sy`
- Added Lima simulator readout computation
- Added simulated musst
- Only `soft_trig.mprg` is supported
## Todo
- [x] Provides few kind of optics
- [ ] Including a working `UserOptic` (it looks to be not working)
- [x] Provides a working scans
- [ ] Including sinogram
- [ ] Integrating simulated lima from DAU tomo acquisition
- [x] Take a look at commits disabling features
- [x] Musst
- [x] Presets
- [x] Shuttershttps://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/22Draft: tomodemo rebased on top of tomo 2.12021-11-02T14:30:33+01:00Valentin VallsDraft: tomodemo rebased on top of tomo 2.1https://gitlab.esrf.fr/tomo/bliss-tomo/-/merge_requests/21Sequence improvements2021-10-21T14:19:29+02:00Jibril MammeriSequence improvements