Skip to content

Commit

Permalink
Merge branch 'master' into add-2d-mb-pcasl
Browse files Browse the repository at this point in the history
  • Loading branch information
effigies authored Nov 5, 2024
2 parents 1784711 + 536de95 commit 6de210a
Show file tree
Hide file tree
Showing 567 changed files with 1,747 additions and 34 deletions.
57 changes: 23 additions & 34 deletions .github/workflows/validate_datasets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
bids-validator: [master, stable, master-deno]
bids-validator: [stable, dev, legacy]

runs-on: ${{ matrix.platform }}

Expand All @@ -33,53 +33,42 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Node.js
if: "matrix.bids-validator == 'stable' || matrix.bids-validator == 'master'"
if: matrix.bids-validator == 'legacy'
uses: actions/setup-node@v4
with:
node-version: 18

- name: Install BIDS validator (stable)
if: "matrix.bids-validator == 'stable'"
run: |
npm install -g bids-validator
- uses: denoland/setup-deno@v2
if: matrix.bids-validator != 'legacy'
with:
deno-version: v2.x

- name: Install BIDS validator (master)
if: "matrix.bids-validator == 'master'"
- name: Install BIDS validator (stable)
if: matrix.bids-validator == 'stable'
run: |
pushd ..
# Get npm 7+
npm install -g npm
git clone --depth 1 https://github.com/bids-standard/bids-validator
cd bids-validator
# Generate the full development node_modules
npm clean-install
# Build & bundle the bids-validator CLI package
npm -w bids-validator run build
# Generate a package to install globally
npm -w bids-validator pack
# Install the package globally
bash -c "npm install -g bids-validator-*.tgz"
popd
- uses: denoland/setup-deno@v1
if: "matrix.bids-validator == 'master-deno'"
with:
deno-version: v1.x
deno install -Agf -n bids-validator jsr:@bids/validator
shell: bash

- name: Install BIDS validator (master deno build)
if: "matrix.bids-validator == 'master-deno'"
- name: Install BIDS validator (dev)
if: matrix.bids-validator == 'dev'
run: |
# If unmerged validator PRs are needed for testing, you can use
# https://github.com/<FORK>/bids-validator/raw/<BRANCH>/bids-validator/src/bids-validator.ts
deno install -Agf https://github.com/bids-standard/bids-validator/raw/deno-build/bids-validator.js
shell: bash

- name: Install BIDS validator (legacy)
if: "matrix.bids-validator == 'legacy'"
run: |
npm install -g bids-validator
- name: Display versions and environment information
run: |
echo $TZ
date
echo "npm"; npm --version
echo "node"; node --version
which deno && echo "deno\n----" && deno --version || true
echo "node\n----"; node --version
echo "npm\n----"; npm --version
echo "bids-validator"; bids-validator --version
shell: bash

Expand All @@ -99,8 +88,8 @@ jobs:
shell: bash

- name: Skip MRS validation for legacy validator
run: for DS in mrs_*; do touch $DS/.SKIP_VALIDATION; done
if: "matrix.bids-validator != 'master-deno'"
run: for DS in mrs_* dwi_deriv; do touch $DS/.SKIP_VALIDATION; done
if: matrix.bids-validator == 'legacy'
shell: bash

- name: Validate all BIDS datasets using bids-validator
Expand All @@ -111,4 +100,4 @@ jobs:
env:
# When proposing new features, schema changes may be necessary.
# Update this URL to the schema.json from PRs to the spec, when needed.
BIDS_SCHEMA: https://bids-specification.readthedocs.io/en/latest/schema.json
BIDS_SCHEMA: https://bids-specification--1864.org.readthedocs.build/en/1864/schema.json
1 change: 1 addition & 0 deletions dataset_listing.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ mrs_2dmrsi 2D sLASER MRSI data from 8 subjects [link](https://zenodo.org/records
mrs_biggaba MEGA-PRESS and PRESS MRS data from 12 subjects from one site from the Big GABA project [link](https://www.nitrc.org/projects/biggaba) [@markmikkelsen](https://github.com/markmikkelsen) anat, mrs T1w, mrsref, svs
mrs_fmrs Functional MRS data involving a pain stimulus task from 15 subjects [link](https://www.nitrc.org/projects/fmrs_2020) [@markmikkelsen](https://github.com/markmikkelsen) anat, mrs T1w, events, mrsref, svs
2d_mb_pcasl Siemens 2D MultiBand Multi-delay PCASL (m0 and noRF included within timeseries) [link](https://osf.io/xrkc4/) [@aptinis](https://github.com/aptinis) anat, fmap, perf T1w, asl, aslcontext, epi
xeeg_hed_score EEG and iEEG data with annotations of artifacts, seizures and modulators using HED-SCORE [@dorahermes](https://github.com/dorahermes) eeg, anat, ieeg channels, coordsystem, electrodes, events, ieeg, eeg, T1w
13 changes: 13 additions & 0 deletions dwi_deriv/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Scanner-generated Diffusion MRI derivatives

This single-subject dataset exemplifies the storage of diffusion MRI derivates
that may be generated on the Siemens XA platform.

Author: Robert E. Smith <[email protected]>.

This dataset is made available under the Public Domain Dedication and License v1.0,
whose full text can be found at http://www.opendatacommons.org/licenses/pddl/1.0/.

The author acknowledges the facilities and scientific and technical assistance of the National Imaging Facility,
a National Collaborative Research Infrastructure Strategy (NCRIS) capability,
at the Melbourne Brain Centre (Austin), Florey Institute, Heidelberg, Victoria, Australia.
8 changes: 8 additions & 0 deletions dwi_deriv/dataset_description.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Name": "Scanner-denerated Diffusion MRI derivatives",
"DatasetType": "raw",
"BIDSVersion": "1.10.0",
"License": "This dataset is made available under the Public Domain Dedication and License v1.0, whose full text can be found at http://www.opendatacommons.org/licenses/pddl/1.0/.",
"Authors": ["Robert E. Smith"],
"Acknowledgements": "The author acknowledges the facilities and scientific and technical assistance of the National Imaging Facility, a National Collaborative Research Infrastructure Strategy (NCRIS) capability, at the Melbourne Brain Centre (Austin), Florey Institute, Heidelberg, Victoria, Australia."
}
137 changes: 137 additions & 0 deletions dwi_deriv/sub-01/dwi/sub-01_ADC.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
{
"Modality": "MR",
"MagneticFieldStrength": 3,
"ImagingFrequency": 123.213411,
"Manufacturer": "Siemens",
"ManufacturersModelName": "MAGNETOM Vida",
"InstitutionName": "REDACTED",
"BodyPartExamined": "BRAIN",
"PatientPosition": "HFS",
"SoftwareVersions": "syngo MR XA50",
"MRAcquisitionType": "2D",
"SeriesDescription": "DWI_2p5mm_AllDerivatives_Free_ADC",
"ProtocolName": "DWI_2p5mm_AllDerivatives_Free",
"ScanningSequence": "EP",
"SequenceVariant": "SK\\SP",
"ScanOptions": "FS",
"PulseSequenceName": "*epse2d1_96",
"ImageType": ["DERIVED", "PRIMARY", "DIFFUSION", "ADC"],
"ImageTypeText": ["DERIVED", "PRIMARY", "DIFFUSION", "ADC", "ND", "NORM"],
"NonlinearGradientCorrection": false,
"RawImage": false,
"SeriesNumber": 137,
"AcquisitionTime": "16:28:5.352500",
"SliceThickness": 2.5,
"SpacingBetweenSlices": 2.5,
"EchoTime": 0.085,
"RepetitionTime": 4.5,
"MTState": false,
"FlipAngle": 90,
"PartialFourier": 1,
"BaseResolution": 96,
"ShimSetting": [
2161,
-4596,
-2252,
507,
29,
-351,
-55,
-7 ],
"TxRefAmp": 333.194,
"PhaseResolution": 1,
"ReceiveCoilName": "HeadNeck_64_CS",
"ReceiveCoilActiveElements": "HC1-7",
"CoilString": "HeadNeck_64_CS",
"PulseSequenceDetails": "%SiemensSeq%\\ep2d_diff",
"RefLinesPE": 24,
"CoilCombinationMethod": "Adaptive Combine",
"MultibandAccelerationFactor": 2,
"PercentPhaseFOV": 100,
"PercentSampling": 100,
"EchoTrainLength": 47,
"PhaseEncodingSteps": 96,
"FrequencyEncodingSteps": 96,
"AcquisitionMatrixPE": 96,
"ReconMatrixPE": 96,
"BandwidthPerPixelPhaseEncode": 35.92,
"ParallelReductionFactorInPlane": 2,
"ParallelAcquisitionTechnique": "SMS",
"EffectiveEchoSpacing": 0.000289996,
"DerivedVendorReportedEchoSpacing": 0.000579993,
"TotalReadoutTime": 0.0275496,
"PixelBandwidth": 2003,
"DwellTime": 2.6e-06,
"PhaseEncodingDirection": "j-",
"SliceTiming": [
3.4525,
0,
3.5675,
0.115,
3.6825,
0.23,
3.7975,
0.345,
3.9125,
0.46,
4.0275,
0.575,
4.1425,
0.69,
4.26,
0.805,
4.375,
0.92,
4.49,
1.035,
4.605,
1.15,
4.72,
1.265,
4.835,
1.3825,
4.95,
1.4975,
5.065,
1.6125,
5.18,
1.7275,
5.295,
1.8425,
5.41,
1.9575,
5.525,
2.0725,
5.64,
2.1875,
5.755,
2.3025,
5.87,
2.4175,
5.985,
2.5325,
6.1,
2.6475,
6.215,
2.7625,
6.33,
2.8775,
6.445,
2.9925,
6.56,
3.1075,
6.675,
3.2225,
6.79,
3.3375 ],
"ImageOrientationPatientDICOM": [
0.999631,
-0.000740811,
-0.0271479,
-6.72663e-09,
0.999628,
-0.0272781 ],
"InPlanePhaseEncodingDirectionDICOM": "COL",
"ConversionSoftware": "dcm2niix",
"ConversionSoftwareVersion": "v1.0.20230411"
}
Empty file.
Loading

0 comments on commit 6de210a

Please sign in to comment.