Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

datamodel
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

be75e035

Commit be75e035 authored 7 months ago by Anjali Aggarwal

Downloads
- Plain Diff

Merge branch '16-xas-catalysis' into 'main'

Resolve "XAS catalysis"

Closes #16

See merge request !16

parents b3210da5 0ecd5423

No related branches found

No related tags found

1 merge request!16Resolve "XAS catalysis"

Pipeline #130086 passed 7 months ago

Stage: lint

Stage: validate

Stage: build-derivatives

Stage: build-docs

Stage: deploy

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 17 additions, 8 deletions

.gitlab-ci.yml
Dataset/p65_example_data.yaml 61 additions, 31 deletions

Dataset/p65_example_data.yaml
schema/base_sample.yaml 45 additions, 4 deletions

schema/base_sample.yaml
schema/base_scicat_dataset.yaml 14 additions, 12 deletions

schema/base_scicat_dataset.yaml
schema/beamline_p65_xas.yaml 12 additions, 8 deletions

schema/beamline_p65_xas.yaml
schema/rockit.yaml 2 additions, 2 deletions

schema/rockit.yaml
schema/technique_xas_catalysis.yaml 32 additions, 37 deletions

schema/technique_xas_catalysis.yaml
scripts/gen_allformat.py 78 additions, 0 deletions

scripts/gen_allformat.py
scripts/validate_p65_data.sh 2 additions, 0 deletions

scripts/validate_p65_data.sh

with 263 additions and 102 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

imprint | privacy | Conditions of Use